nick/WickedEngine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

uwp fixes and content packaging project

Browse Source
This commit is contained in:
Turanszki Janos
2020-05-13 22:42:57 +01:00
parent b687645407
commit aa69b18e04
8 changed files with 1279 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Content.vcxitems
+655
View File
File diff suppressed because it is too large Load Diff
Content.vcxitems.filters
+496
View File
@@ -0,0 +1,496 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="images">
<UniqueIdentifier>{341af3e7-9353-4ed5-9a03-c6dc8d522336}</UniqueIdentifier>
</Filter>
<Filter Include="models">
<UniqueIdentifier>{1e52ef96-0bb7-4391-a08b-70de0073ef4b}</UniqueIdentifier>
</Filter>
<Filter Include="scripts">
<UniqueIdentifier>{3dd2f7b1-11bc-47f3-84b7-6a0b1430069c}</UniqueIdentifier>
</Filter>
<Filter Include="models\Sponza">
<UniqueIdentifier>{79c15acb-1f18-400c-82b4-846dfdd4ab85}</UniqueIdentifier>
</Filter>
<Filter Include="models\Sponza\textures">
<UniqueIdentifier>{313c5c5a-2029-43a8-99ca-cc56f435121c}</UniqueIdentifier>
</Filter>
<Filter Include="models\Havoc">
<UniqueIdentifier>{6f72400d-8b00-4dc0-8015-f88dd5d4c11b}</UniqueIdentifier>
</Filter>
<Filter Include="models\dungeon">
<UniqueIdentifier>{2ba616fc-e2c9-4af4-9099-948f45e2dd80}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)scripts\camera_animation_clamped.lua">
<Filter>scripts</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)scripts\camera_animation_repeat.lua">
<Filter>scripts</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)scripts\character_controller_tps.lua">
<Filter>scripts</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)scripts\debug_draw.lua">
<Filter>scripts</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)scripts\dungeon_generator.lua">
<Filter>scripts</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)scripts\emitter_burst.lua">
<Filter>scripts</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)scripts\fighting_game.lua">
<Filter>scripts</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)scripts\move_object.lua">
<Filter>scripts</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)scripts\pick.lua">
<Filter>scripts</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)scripts\rotate_model.lua">
<Filter>scripts</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)scripts\set_material_color.lua">
<Filter>scripts</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)scripts\set_material_emissive.lua">
<Filter>scripts</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\Sponza\sponza.wiscene">
<Filter>models\Sponza</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\Havoc\havoc.wiscene">
<Filter>models\Havoc</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\dungeon\block.wiscene">
<Filter>models\dungeon</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\dungeon\corridor.wiscene">
<Filter>models\dungeon</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\dungeon\crossjunction.wiscene">
<Filter>models\dungeon</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\dungeon\end.wiscene">
<Filter>models\dungeon</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\dungeon\oddcorridor.wiscene">
<Filter>models\dungeon</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\dungeon\room.wiscene">
<Filter>models\dungeon</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\dungeon\smallroomleft.wiscene">
<Filter>models\dungeon</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\dungeon\start.wiscene">
<Filter>models\dungeon</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\dungeon\tjunction.wiscene">
<Filter>models\dungeon</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\dungeon\turnleft.wiscene">
<Filter>models\dungeon</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\dungeon\turnright.wiscene">
<Filter>models\dungeon</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\dungeon\upcorridor.wiscene">
<Filter>models\dungeon</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\cameras.wiscene">
<Filter>models</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\CesiumMan.glb">
<Filter>models</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\cloth_test.wiscene">
<Filter>models</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\DamagedHelmet.glb">
<Filter>models</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\dojo.wiscene">
<Filter>models</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\emitter_distortion.wiscene">
<Filter>models</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\emitter_dust.wiscene">
<Filter>models</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\emitter_fireball.wiscene">
<Filter>models</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\emitter_fluid_50k.wiscene">
<Filter>models</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\emitter_guardeffect.wiscene">
<Filter>models</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\emitter_hiteffect.wiscene">
<Filter>models</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\emitter_skinned.wiscene">
<Filter>models</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\emitter_smoke.wiscene">
<Filter>models</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\emitter_spark.wiscene">
<Filter>models</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\girl.wiscene">
<Filter>models</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\hairparticle_torus.wiscene">
<Filter>models</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\lensflare_light.wiscene">
<Filter>models</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\lightmap_bake_test.wiscene">
<Filter>models</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\physics_test.wiscene">
<Filter>models</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\playground.wiscene">
<Filter>models</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\shadows_test.wiscene">
<Filter>models</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\sound3D_test.wiscene">
<Filter>models</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\suzanne.wiscene">
<Filter>models</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\teapot.wiscene">
<Filter>models</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\volumetric_test.wiscene">
<Filter>models</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\water_plane.wiscene">
<Filter>models</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)models\water_test.wiscene">
<Filter>models</Filter>
</None>
</ItemGroup>
<ItemGroup>
<Image Include="$(MSBuildThisFileDirectory)images\hp_bar.png">
<Filter>images</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)images\logo_small.png">
<Filter>images</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)images\waterripple.png">
<Filter>images</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\background.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\background_bump.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\background_ddn.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\backgroundBGR.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\chain_texture.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\chain_texture_bump.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\chain_texture_ddn.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\chain_texture_mask.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\gi_flag.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\lion.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\lion_bump.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\lion_ddn.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\lion2_bump.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\lion2_ddn.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\particle_dust.dds">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\spnza_bricks_a_bump.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\spnza_bricks_a_ddn.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\spnza_bricks_a_diff.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\spnza_bricks_a_spec.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_arch_bump.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_arch_ddn.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_arch_diff.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_arch_diff_NRM.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_arch_spec.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_ceiling_a_diff.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_ceiling_a_diff_NRM.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_ceiling_a_spec.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_column_a_bump.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_column_a_ddn.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_column_a_diff.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_column_a_spec.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_column_b_bump.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_column_b_ddn.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_column_b_diff.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_column_b_spec.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_column_c_bump.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_column_c_ddn.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_column_c_diff.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_column_c_spec.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_curtain_blue_diff.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_curtain_blue_diff_NRM.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_curtain_diff.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_curtain_green_diff.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_details_diff.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_details_diff_NRM.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_details_spec.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_fabric_blue_diff.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_fabric_blue_diff_NRM.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_fabric_diff.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_fabric_green_diff.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_fabric_spec.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_flagpole_diff.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_flagpole_diff_NRM.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_flagpole_spec.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_floor_a_diff.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_floor_a_diff_NRM.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_floor_a_spec.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_roof_diff.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_roof_diff_NRM.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_thorn_bump.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_thorn_ddn.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_thorn_diff.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_thorn_mask.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\sponza_thorn_spec.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\vase_bump.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\vase_ddn.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\vase_dif.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\vase_hanging.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\vase_hanging_NRM.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\vase_plant.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\vase_plant_mask.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\vase_plant_NRM.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\vase_plant_spec.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\vase_round.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\vase_round_bump.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\vase_round_ddn.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\vase_round_spec.png">
<Filter>models\Sponza\textures</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Havoc\baseColor.png">
<Filter>models\Havoc</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Havoc\normalMap.png">
<Filter>models\Havoc</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\billboardredflowers.png">
<Filter>models</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\fire.jpg">
<Filter>models</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\flare0.jpg">
<Filter>models</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\flare1.jpg">
<Filter>models</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\flare2.jpg">
<Filter>models</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\flare3.jpg">
<Filter>models</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\flare4.jpg">
<Filter>models</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\flare5.jpg">
<Filter>models</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\flare6.jpg">
<Filter>models</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\grassbb.png">
<Filter>models</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\grid.dds">
<Filter>models</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\orb.dds">
<Filter>models</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\repack.png">
<Filter>models</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\sky.dds">
<Filter>models</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\smoke0.png">
<Filter>models</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\waterNormalMap.jpg">
<Filter>models</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\ripple.png">
<Filter>models</Filter>
</Image>
</ItemGroup>
<ItemGroup>
<Media Include="$(MSBuildThisFileDirectory)models\water.wav">
<Filter>models</Filter>
</Media>
</ItemGroup>
<ItemGroup>
<Text Include="$(MSBuildThisFileDirectory)models\Sponza\copyright.txt">
<Filter>models\Sponza</Filter>
</Text>
</ItemGroup>
</Project>
Editor/Editor.cpp
+94
View File
@@ -28,6 +28,44 @@
#include <sstream>
#ifdef PLATFORM_UWP
#include <collection.h>
#include <ppltasks.h>
using namespace concurrency;
using namespace Platform;
using namespace Windows::Storage;
using namespace Windows::Storage::Pickers;
using namespace Windows::Storage::AccessCache;
using namespace Windows::Foundation::Collections;
void copy_folder(StorageFolder^ src, StorageFolder^ dst) {
create_task(src->GetItemsAsync()).then([=](IVectorView<IStorageItem^>^ items) {
for (IStorageItem^ item : items)
{
if (item->IsOfType(StorageItemTypes::File))
{
StorageFile^ file = (StorageFile^)item;
try {
file->CopyAsync(dst);
}
catch (...) {
// file already exists, we don't want to overwrite
}
}
else if (item->IsOfType(StorageItemTypes::Folder))
{
StorageFolder^ src_child = (StorageFolder^)item;
create_task(dst->CreateFolderAsync(item->Name, CreationCollisionOption::OpenIfExists)).then([=](StorageFolder^ dst_child) {
if (dst_child)
{
copy_folder(src_child, dst_child);
}
});
}
}
});
};
#endif // PLATFORM_UWP
using namespace std;
using namespace wiGraphics;
using namespace wiRectPacker;
@@ -349,6 +387,62 @@ void EditorComponent::Load()
{
__super::Load();
#ifdef PLATFORM_UWP
// On UWP we will copy the base content from application folder to 3D Objects directory
// for easy access to the user:
StorageFolder^ location = KnownFolders::Objects3D;
// Objects3D/WickedEngine
create_task(location->CreateFolderAsync("WickedEngine", CreationCollisionOption::OpenIfExists)).then([=](StorageFolder^ destfolder) {
string rootdir = wiHelper::ExpandPath(wiHelper::GetOriginalWorkingDirectory());
wstring wstr;
// images:
wiHelper::StringConvert(rootdir + "images\\", wstr);
create_task(StorageFolder::GetFolderFromPathAsync(ref new String(wstr.c_str()))).then([=](StorageFolder^ src) {
if (src)
{
create_task(destfolder->CreateFolderAsync("images", CreationCollisionOption::OpenIfExists)).then([=](StorageFolder^ dst) {
if (dst)
{
copy_folder(src, dst);
}
});
}
});
// scripts:
wiHelper::StringConvert(rootdir + "scripts\\", wstr);
create_task(StorageFolder::GetFolderFromPathAsync(ref new String(wstr.c_str()))).then([=](StorageFolder^ src) {
if (src)
{
create_task(destfolder->CreateFolderAsync("scripts", CreationCollisionOption::OpenIfExists)).then([=](StorageFolder^ dst) {
if (dst)
{
copy_folder(src, dst);
}
});
}
});
// models:
wiHelper::StringConvert(rootdir + "models\\", wstr);
create_task(StorageFolder::GetFolderFromPathAsync(ref new String(wstr.c_str()))).then([=](StorageFolder^ src) {
if (src)
{
create_task(destfolder->CreateFolderAsync("models", CreationCollisionOption::OpenIfExists)).then([=](StorageFolder^ dst) {
if (dst)
{
copy_folder(src, dst);
}
});
}
});
});
#endif // PLATFORM_UWP
wiJobSystem::context ctx;
wiJobSystem::Execute(ctx, [this] { pointLightTex = wiResourceManager::Load("images/pointlight.dds"); });
wiJobSystem::Execute(ctx, [this] { spotLightTex = wiResourceManager::Load("images/spotlight.dds"); });
Editor/Editor_UWP.vcxproj
+1
View File
@@ -106,6 +106,7 @@
<ImportGroup Label="Shared">
<Import Project="Editor_SOURCE.vcxitems" Label="Shared" />
<Import Project="..\WickedEngine\WickedEngine_SHADERS.vcxitems" Label="Shared" />
<Import Project="..\Content.vcxitems" Label="Shared" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
WickedEngine.sln
+4
View File
@@ -29,6 +29,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WickedEngine_UWP", "WickedE
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WickedEngine_SHADERS", "WickedEngine\WickedEngine_SHADERS.vcxitems", "{92E86448-0724-4387-ABAC-96E63EDF4190}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Content", "Content.vcxitems", "{C48F6BFF-F91B-4DB5-98B5-15287DFB7C95}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
WickedEngine\WickedEngine_SHADERS.vcxitems*{06163dcb-b183-4ed9-9c62-13ef1658e049}*SharedItemsImports = 4
@@ -39,6 +41,8 @@ Global
Editor\Editor_SOURCE.vcxitems*{867febca-09c4-4fe7-8a4c-4d9b1c27e7d0}*SharedItemsImports = 9
WickedEngine\WickedEngine_SHADERS.vcxitems*{92e86448-0724-4387-abac-96e63edf4190}*SharedItemsImports = 9
WickedEngine\WickedEngine_SHADERS.vcxitems*{c222218b-b6d1-406b-b2c0-8c1ced4a8d19}*SharedItemsImports = 4
Content.vcxitems*{c48f6bff-f91b-4db5-98b5-15287dfb7c95}*SharedItemsImports = 9
Content.vcxitems*{fa78bfad-4b23-4a6b-92fa-a48ce56bed03}*SharedItemsImports = 4
Editor\Editor_SOURCE.vcxitems*{fa78bfad-4b23-4a6b-92fa-a48ce56bed03}*SharedItemsImports = 4
WickedEngine\WickedEngine_SHADERS.vcxitems*{fa78bfad-4b23-4a6b-92fa-a48ce56bed03}*SharedItemsImports = 4
EndGlobalSection
WickedEngine/wiHelper.cpp
+3 -3
View File
@@ -203,13 +203,13 @@ namespace wiHelper
return appDir;
}
std::string workingdir = std::string(_getcwd(NULL, 0)) + "/";
const std::string __originalWorkingDir = workingdir;
string GetOriginalWorkingDirectory()
{
static const string __originalWorkingDir = GetWorkingDirectory();
return __originalWorkingDir;
}
std::string workingdir = std::string(_getcwd(NULL, 0)) + "/";
string GetWorkingDirectory()
{
return workingdir;
@@ -699,7 +699,7 @@ namespace wiHelper
case FileDialogParams::SAVE:
{
FileSavePicker^ picker = ref new FileSavePicker();
picker->SuggestedStartLocation = PickerLocationId::ComputerFolder;
picker->SuggestedStartLocation = PickerLocationId::Objects3D;
for (auto& x : params.extensions)
{
WickedEngine/wiVersion.cpp
+1 -1
View File
@@ -9,7 +9,7 @@ namespace wiVersion
// minor features, major updates
const int minor = 42;
// minor bug fixes, alterations, refactors, updates
const int revision = 1;
const int revision = 2;
const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);
models/Sponza/copyright.txt
+25
View File
@@ -0,0 +1,25 @@
July 14, 2011 Morgan McGuire modified the model from Crytek's OBJ
export to correct some small errors. He computed bump maps from the
normal maps using <a
href="http://cs.williams.edu/~morgan/code/">normal2bump.cpp</a> (since
MTL files expect height bumps, not normals), put the "mask" textures
into the alpha channel of the associated diffuse texture, cleaned up
noise in the masks, created the missing gi_flag.tga texture, and
removed the long untextured banner floating in the middle of the
atrium that appears in the file but in none of the published images of
the model. The banner is in banner.obj.
http://www.crytek.com/cryengine/cryengine3/downloads
Sponza Model
August 19, 2010
The Atrium Sponza Palace, Dubrovnik, is an elegant and improved model created by Frank Meinl. The original Sponza model was created by Marko Dabrovic in early 2002. Over the years, the Sponza Atrium scene has become one of the most popular 3D scenes for testing global illumination and radiosity due to it's specific architectural structure which is particularly complex for global illumination light.
However, nowadays it is considered as a simple model, thus it was decided to crate a new model with highly improved appearance and scene complexity. It is donated to the public for radiosity and is represented in several different formats (3ds, Obj) for use with various commercial 3D applications and renderers.
Screenshot from the I3D paper
http://crytek.com/sites/default/files/20100301_lpv.pdf