diff --git a/WickedEngine/AnimationWindow.cpp b/Editor/AnimationWindow.cpp similarity index 100% rename from WickedEngine/AnimationWindow.cpp rename to Editor/AnimationWindow.cpp diff --git a/WickedEngine/AnimationWindow.h b/Editor/AnimationWindow.h similarity index 100% rename from WickedEngine/AnimationWindow.h rename to Editor/AnimationWindow.h diff --git a/WickedEngine/CameraWindow.cpp b/Editor/CameraWindow.cpp similarity index 100% rename from WickedEngine/CameraWindow.cpp rename to Editor/CameraWindow.cpp diff --git a/WickedEngine/CameraWindow.h b/Editor/CameraWindow.h similarity index 100% rename from WickedEngine/CameraWindow.h rename to Editor/CameraWindow.h diff --git a/WickedEngine/DecalWindow.cpp b/Editor/DecalWindow.cpp similarity index 100% rename from WickedEngine/DecalWindow.cpp rename to Editor/DecalWindow.cpp diff --git a/WickedEngine/DecalWindow.h b/Editor/DecalWindow.h similarity index 100% rename from WickedEngine/DecalWindow.h rename to Editor/DecalWindow.h diff --git a/WickedEngine/Editor.cpp b/Editor/Editor.cpp similarity index 99% rename from WickedEngine/Editor.cpp rename to Editor/Editor.cpp index 5363c7669..e8cde3546 100644 --- a/WickedEngine/Editor.cpp +++ b/Editor/Editor.cpp @@ -48,6 +48,8 @@ void Editor::Initialize() infoDisplay.cpuinfo = false; infoDisplay.resolution = true; + wiRenderer::SHADERPATH = "../WickedEngine/shaders/"; + wiInitializer::InitializeComponents( wiInitializer::WICKEDENGINE_INITIALIZE_RENDERER | wiInitializer::WICKEDENGINE_INITIALIZE_IMAGE diff --git a/WickedEngine/Editor.h b/Editor/Editor.h similarity index 100% rename from WickedEngine/Editor.h rename to Editor/Editor.h diff --git a/WickedEngine/WickedEngineEditor.ico b/Editor/Editor.ico similarity index 100% rename from WickedEngine/WickedEngineEditor.ico rename to Editor/Editor.ico diff --git a/WickedEngine/WickedEngineEditor.rc b/Editor/Editor.rc similarity index 83% rename from WickedEngine/WickedEngineEditor.rc rename to Editor/Editor.rc index 0f02dd3fc..d84a71f94 100644 Binary files a/WickedEngine/WickedEngineEditor.rc and b/Editor/Editor.rc differ diff --git a/WickedEngine/WickedEngineEditor.vcxproj b/Editor/Editor.vcxproj similarity index 55% rename from WickedEngine/WickedEngineEditor.vcxproj rename to Editor/Editor.vcxproj index 63526a3e9..d7fcda774 100644 --- a/WickedEngine/WickedEngineEditor.vcxproj +++ b/Editor/Editor.vcxproj @@ -21,9 +21,9 @@ {5FE97B9B-A445-4EEA-A42D-9DE60B891D48} Win32Proj - WickedEngineGame + Editor 10.0.15063.0 - WickedEngineEditor + Editor @@ -74,19 +74,23 @@ true $(SolutionDir)$(Platform)\$(Configuration)\ $(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName) true $(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName) false $(SolutionDir)$(Platform)\$(Configuration)\ $(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName) false $(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName) @@ -94,8 +98,7 @@ Level3 Disabled WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - - + ../WickedEngine Windows @@ -109,8 +112,7 @@ Level3 Disabled _DEBUG;_WINDOWS;%(PreprocessorDefinitions) - - + ../WickedEngine Windows @@ -126,8 +128,7 @@ true true WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - - + ../WickedEngine MultiThreaded StreamingSIMDExtensions2 Fast @@ -151,8 +152,7 @@ true true NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - - + ../WickedEngine true MultiThreaded @@ -171,6 +171,7 @@ + @@ -179,7 +180,6 @@ - @@ -189,6 +189,7 @@ + @@ -200,11 +201,10 @@ Create Create - - + @@ -216,134 +216,25 @@ true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + - - - - - + + + + {8c15dc72-70c8-4212-b046-0b166a688a7c} + + + {06163dcb-b183-4ed9-9c62-13ef1658e049} + + diff --git a/Editor/Editor.vcxproj.filters b/Editor/Editor.vcxproj.filters new file mode 100644 index 000000000..936de1864 --- /dev/null +++ b/Editor/Editor.vcxproj.filters @@ -0,0 +1,156 @@ + + + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {e1f824f0-bb57-4a4d-af91-24cafaef11df} + + + {314039e9-0e24-4816-b0cf-d87020800f22} + + + {f08bcf7d-cb6a-426e-9615-b648dbad219a} + + + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + + + Resource Files + + + images + + + images + + + images + + + images + + + images + + + images + + + images + + + fonts + + + Resource Files + + + + + + + fonts + + + + + Resource Files + + + \ No newline at end of file diff --git a/WickedEngine/EnvProbeWindow.cpp b/Editor/EnvProbeWindow.cpp similarity index 100% rename from WickedEngine/EnvProbeWindow.cpp rename to Editor/EnvProbeWindow.cpp diff --git a/WickedEngine/EnvProbeWindow.h b/Editor/EnvProbeWindow.h similarity index 100% rename from WickedEngine/EnvProbeWindow.h rename to Editor/EnvProbeWindow.h diff --git a/WickedEngine/LightWindow.cpp b/Editor/LightWindow.cpp similarity index 100% rename from WickedEngine/LightWindow.cpp rename to Editor/LightWindow.cpp diff --git a/WickedEngine/LightWindow.h b/Editor/LightWindow.h similarity index 100% rename from WickedEngine/LightWindow.h rename to Editor/LightWindow.h diff --git a/WickedEngine/MaterialWindow.cpp b/Editor/MaterialWindow.cpp similarity index 100% rename from WickedEngine/MaterialWindow.cpp rename to Editor/MaterialWindow.cpp diff --git a/WickedEngine/MaterialWindow.h b/Editor/MaterialWindow.h similarity index 100% rename from WickedEngine/MaterialWindow.h rename to Editor/MaterialWindow.h diff --git a/WickedEngine/MeshWindow.cpp b/Editor/MeshWindow.cpp similarity index 100% rename from WickedEngine/MeshWindow.cpp rename to Editor/MeshWindow.cpp diff --git a/WickedEngine/MeshWindow.h b/Editor/MeshWindow.h similarity index 100% rename from WickedEngine/MeshWindow.h rename to Editor/MeshWindow.h diff --git a/WickedEngine/ObjectWindow.cpp b/Editor/ObjectWindow.cpp similarity index 100% rename from WickedEngine/ObjectWindow.cpp rename to Editor/ObjectWindow.cpp diff --git a/WickedEngine/ObjectWindow.h b/Editor/ObjectWindow.h similarity index 100% rename from WickedEngine/ObjectWindow.h rename to Editor/ObjectWindow.h diff --git a/WickedEngine/PostprocessWindow.cpp b/Editor/PostprocessWindow.cpp similarity index 100% rename from WickedEngine/PostprocessWindow.cpp rename to Editor/PostprocessWindow.cpp diff --git a/WickedEngine/PostprocessWindow.h b/Editor/PostprocessWindow.h similarity index 100% rename from WickedEngine/PostprocessWindow.h rename to Editor/PostprocessWindow.h diff --git a/WickedEngine/RendererWindow.cpp b/Editor/RendererWindow.cpp similarity index 100% rename from WickedEngine/RendererWindow.cpp rename to Editor/RendererWindow.cpp diff --git a/WickedEngine/RendererWindow.h b/Editor/RendererWindow.h similarity index 100% rename from WickedEngine/RendererWindow.h rename to Editor/RendererWindow.h diff --git a/WickedEngine/WorldWindow.cpp b/Editor/WorldWindow.cpp similarity index 100% rename from WickedEngine/WorldWindow.cpp rename to Editor/WorldWindow.cpp diff --git a/WickedEngine/WorldWindow.h b/Editor/WorldWindow.h similarity index 100% rename from WickedEngine/WorldWindow.h rename to Editor/WorldWindow.h diff --git a/WickedEngine/config.ini b/Editor/config.ini similarity index 100% rename from WickedEngine/config.ini rename to Editor/config.ini diff --git a/WickedEngineTests/fonts/default_font.dds b/Editor/fonts/default_font.dds similarity index 100% rename from WickedEngineTests/fonts/default_font.dds rename to Editor/fonts/default_font.dds diff --git a/WickedEngineTests/fonts/default_font.wifont b/Editor/fonts/default_font.wifont similarity index 100% rename from WickedEngineTests/fonts/default_font.wifont rename to Editor/fonts/default_font.wifont diff --git a/WickedEngine/images/arealight.dds b/Editor/images/arealight.dds similarity index 100% rename from WickedEngine/images/arealight.dds rename to Editor/images/arealight.dds diff --git a/WickedEngine/images/blood1.png b/Editor/images/blood1.png similarity index 100% rename from WickedEngine/images/blood1.png rename to Editor/images/blood1.png diff --git a/WickedEngine/images/directional_light.dds b/Editor/images/directional_light.dds similarity index 100% rename from WickedEngine/images/directional_light.dds rename to Editor/images/directional_light.dds diff --git a/WickedEngine/images/leaf.png b/Editor/images/leaf.png similarity index 100% rename from WickedEngine/images/leaf.png rename to Editor/images/leaf.png diff --git a/WickedEngine/images/pointlight.dds b/Editor/images/pointlight.dds similarity index 100% rename from WickedEngine/images/pointlight.dds rename to Editor/images/pointlight.dds diff --git a/WickedEngine/images/ripple.png b/Editor/images/ripple.png similarity index 100% rename from WickedEngine/images/ripple.png rename to Editor/images/ripple.png diff --git a/WickedEngine/images/spotlight.dds b/Editor/images/spotlight.dds similarity index 100% rename from WickedEngine/images/spotlight.dds rename to Editor/images/spotlight.dds diff --git a/WickedEngine/WickedEngineEditor.cpp b/Editor/main.cpp similarity index 99% rename from WickedEngine/WickedEngineEditor.cpp rename to Editor/main.cpp index 65ec0985c..8ea63155e 100644 --- a/WickedEngine/WickedEngineEditor.cpp +++ b/Editor/main.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "WickedEngineEditor.h" +#include "main.h" #include "Editor.h" #include diff --git a/WickedEngine/WickedEngineEditor.h b/Editor/main.h similarity index 100% rename from WickedEngine/WickedEngineEditor.h rename to Editor/main.h diff --git a/Editor/resource.h b/Editor/resource.h new file mode 100644 index 000000000..c3a3a30cc --- /dev/null +++ b/Editor/resource.h @@ -0,0 +1,27 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Editor.rc +// +#define IDC_MYICON 2 +#define IDD_WICKEDENGINEGAME_DIALOG 102 +#define IDS_APP_TITLE 103 +#define IDD_ABOUTBOX 103 +#define IDM_ABOUT 104 +#define IDM_EXIT 105 +#define IDI_WICKEDENGINEGAME 107 +#define IDI_SMALL 108 +#define IDC_WICKEDENGINEGAME 109 +#define IDR_MAINFRAME 128 +#define IDC_STATIC -1 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NO_MFC 1 +#define _APS_NEXT_RESOURCE_VALUE 129 +#define _APS_NEXT_COMMAND_VALUE 32771 +#define _APS_NEXT_CONTROL_VALUE 1000 +#define _APS_NEXT_SYMED_VALUE 110 +#endif +#endif diff --git a/WickedEngine/small.ico b/Editor/small.ico similarity index 100% rename from WickedEngine/small.ico rename to Editor/small.ico diff --git a/WickedEngine/startup.lua b/Editor/startup.lua similarity index 100% rename from WickedEngine/startup.lua rename to Editor/startup.lua diff --git a/WickedEngine/stdafx.cpp b/Editor/stdafx.cpp similarity index 100% rename from WickedEngine/stdafx.cpp rename to Editor/stdafx.cpp diff --git a/WickedEngine/stdafx.h b/Editor/stdafx.h similarity index 100% rename from WickedEngine/stdafx.h rename to Editor/stdafx.h diff --git a/WickedEngine/targetver.h b/Editor/targetver.h similarity index 100% rename from WickedEngine/targetver.h rename to Editor/targetver.h diff --git a/README.md b/README.md index 188769546..842b1cdf9 100644 --- a/README.md +++ b/README.md @@ -63,15 +63,14 @@ UWP support: define WINSTORE_SUPPORT preprocessor for the whole project ### Contents: -- ./WickedEngine.sln - Visual Studio Solution; -- ./WickedEngine/WickedEngine.vcxproj - Visual Studio Project; -- ./WickedEngine/BULLET/ - Bullet 2.82 Source files; -- ./WickedEngine/LUA/ - Lua 5.3.3 Source files; -- ./WickedEngine/shaders/ - Binary shaders output; -- ./WickedEngine/models - Sample model files -- ./WickedEngine/ - C++ and shader source files; -- ./WickedEngine/Utility - C++ source files for utility helpers; -- ./io_export_wicked_wi_bin.py - Blender 2.72+ script to export scene; +- ./Documentation/ - Documentation files +- ./logo/ - Logo artwork images +- ./models/ - Sample model files +- ./WickedEngine/ - Wicked Engine Library project +- ./Editor/ - Editor project +- ./Tests/ - Testing framework project +- ./WickedEngine.sln - Visual Studio Solution +- ./io_export_wicked_wi_bin.py - Blender 2.72+ script to export scene ### Scripting API: diff --git a/WickedEngineTests/HelloWorld.png b/Tests/HelloWorld.png similarity index 100% rename from WickedEngineTests/HelloWorld.png rename to Tests/HelloWorld.png diff --git a/WickedEngineTests/Tests.cpp b/Tests/Tests.cpp similarity index 96% rename from WickedEngineTests/Tests.cpp rename to Tests/Tests.cpp index d4666bbf1..34565f173 100644 --- a/WickedEngineTests/Tests.cpp +++ b/Tests/Tests.cpp @@ -78,7 +78,7 @@ TestsRenderer::TestsRenderer() break; } case 1: - wiRenderer::LoadModel("../WickedEngine/models/Stormtrooper/", "Stormtrooper"); + wiRenderer::LoadModel("../models/Stormtrooper/", "Stormtrooper"); break; case 2: wiLua::GetGlobal()->RunFile("test_script.lua"); diff --git a/WickedEngineTests/Tests.h b/Tests/Tests.h similarity index 100% rename from WickedEngineTests/Tests.h rename to Tests/Tests.h diff --git a/WickedEngineTests/WickedEngineTests.ico b/Tests/Tests.ico similarity index 100% rename from WickedEngineTests/WickedEngineTests.ico rename to Tests/Tests.ico diff --git a/WickedEngineTests/WickedEngineTests.rc b/Tests/Tests.rc similarity index 80% rename from WickedEngineTests/WickedEngineTests.rc rename to Tests/Tests.rc index 825aa4608..1f8625aec 100644 --- a/WickedEngineTests/WickedEngineTests.rc +++ b/Tests/Tests.rc @@ -1,4 +1,4 @@ -//Microsoft Visual C++ generated resource script. +// Microsoft Visual C++ generated resource script. // #include "resource.h" @@ -13,11 +13,16 @@ #define APSTUDIO_HIDDEN_SYMBOLS #include "windows.h" #undef APSTUDIO_HIDDEN_SYMBOLS + ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -LANGUAGE 9, 1 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) ///////////////////////////////////////////////////////////////////////////// // @@ -26,9 +31,10 @@ LANGUAGE 9, 1 // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. +IDI_WICKEDENGINETESTS ICON "Tests.ico" + +IDI_SMALL ICON "small.ico" -IDI_WICKEDENGINETESTS ICON "WickedEngineTests.ico" -IDI_SMALL ICON "small.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -39,11 +45,11 @@ IDC_WICKEDENGINETESTS MENU BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit", IDM_EXIT + MENUITEM "E&xit", IDM_EXIT END POPUP "&Help" BEGIN - MENUITEM "&About ...", IDM_ABOUT + MENUITEM "&About ...", IDM_ABOUT END END @@ -68,7 +74,7 @@ END IDD_ABOUTBOX DIALOGEX 0, 0, 170, 62 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "About WickedEngineTests" -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN ICON IDR_MAINFRAME,IDC_STATIC,14,14,21,20 LTEXT "WickedEngineTests, Version 1.0",IDC_STATIC,42,14,114,8,SS_NOPREFIX @@ -76,6 +82,7 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,113,41,50,14,WS_GROUP END + ///////////////////////////////////////////////////////////////////////////// // // DESIGNINFO @@ -94,17 +101,19 @@ BEGIN END #endif // APSTUDIO_INVOKED + #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // // TEXTINCLUDE // -1 TEXTINCLUDE + +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE +2 TEXTINCLUDE BEGIN "#ifndef APSTUDIO_INVOKED\r\n" "#include ""targetver.h""\r\n" @@ -115,7 +124,7 @@ BEGIN "\0" END -3 TEXTINCLUDE +3 TEXTINCLUDE BEGIN "\r\n" "\0" @@ -123,6 +132,7 @@ END #endif // APSTUDIO_INVOKED + ///////////////////////////////////////////////////////////////////////////// // // String Table @@ -130,11 +140,11 @@ END STRINGTABLE BEGIN - IDC_WICKEDENGINETESTS "WICKEDENGINETESTS" - IDS_APP_TITLE "WickedEngineTests" + IDS_APP_TITLE "Wicked Engine Tests" + IDC_WICKEDENGINETESTS "WICKEDENGINETESTS" END -#endif +#endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// @@ -145,5 +155,7 @@ END // Generated from the TEXTINCLUDE 3 resource. // + ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + diff --git a/WickedEngineTests/WickedEngineTests.vcxproj b/Tests/Tests.vcxproj similarity index 90% rename from WickedEngineTests/WickedEngineTests.vcxproj rename to Tests/Tests.vcxproj index 6a782b0f6..909ce5cbf 100644 --- a/WickedEngineTests/WickedEngineTests.vcxproj +++ b/Tests/Tests.vcxproj @@ -22,8 +22,9 @@ 15.0 {3A9EA3D0-A795-46ED-A737-7164E90DC309} Win32Proj - WickedEngineTests + Tests 10.0.15063.0 + Tests @@ -72,15 +73,25 @@ false + $(ProjectName) + $(ProjectName)\$(Platform)\$(Configuration)\ true + $(ProjectName) + $(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ true + $(ProjectName) + $(ProjectName)\$(Platform)\$(Configuration)\ false + $(ProjectName) + $(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ @@ -155,16 +166,14 @@ - - - + - + Create Create @@ -172,14 +181,14 @@ Create - - + + - + @@ -189,6 +198,10 @@ {06163dcb-b183-4ed9-9c62-13ef1658e049} + + + + diff --git a/WickedEngineTests/WickedEngineTests.vcxproj.filters b/Tests/Tests.vcxproj.filters similarity index 57% rename from WickedEngineTests/WickedEngineTests.vcxproj.filters rename to Tests/Tests.vcxproj.filters index af1f42255..857bab1af 100644 --- a/WickedEngineTests/WickedEngineTests.vcxproj.filters +++ b/Tests/Tests.vcxproj.filters @@ -1,61 +1,65 @@  - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + {c2ccbb94-b23f-4b37-94f4-56bae2be0128} + + + {71eaf3c0-2e45-4073-b714-cb4f7576c99f} + - - - + + Code + - Header Files + Code - Header Files - - - Header Files - - - Header Files + Code - Header Files + Code + + + Code - Source Files - - - Source Files + Code - Source Files + Code + + + Code - - - - Resource Files - Resource Files - + + fonts + + Resource Files + + + + fonts + + + + + Resource Files + + \ No newline at end of file diff --git a/Tests/fonts/default_font.dds b/Tests/fonts/default_font.dds new file mode 100644 index 000000000..ab4ebdc9e Binary files /dev/null and b/Tests/fonts/default_font.dds differ diff --git a/Tests/fonts/default_font.wifont b/Tests/fonts/default_font.wifont new file mode 100644 index 000000000..e228f084f --- /dev/null +++ b/Tests/fonts/default_font.wifont @@ -0,0 +1,95 @@ +lineHeight= 16 +33 ! 0.0 0.000976563 1 +34 " 0.00195313 0.00488281 3 +35 # 0.00585938 0.0136719 8 +36 $ 0.0146484 0.0195313 5 +37 % 0.0205078 0.0302734 10 +38 & 0.03125 0.0390625 8 +39 ' 0.0400391 0.0410156 1 +40 ( 0.0419922 0.0449219 3 +41 ) 0.0458984 0.0488281 3 +42 * 0.0498047 0.0546875 5 +43 + 0.0556641 0.0625 7 +44 , 0.0634766 0.0644531 1 +45 - 0.0654297 0.0683594 3 +46 . 0.0693359 0.0703125 1 +47 / 0.0712891 0.0751953 4 +48 0 0.0761719 0.0820313 6 +49 1 0.0830078 0.0859375 3 +50 2 0.0869141 0.0927734 6 +51 3 0.09375 0.0996094 6 +52 4 0.100586 0.106445 6 +53 5 0.107422 0.113281 6 +54 6 0.114258 0.120117 6 +55 7 0.121094 0.126953 6 +56 8 0.12793 0.133789 6 +57 9 0.134766 0.140625 6 +58 : 0.141602 0.142578 1 +59 ; 0.143555 0.144531 1 +60 < 0.145508 0.151367 6 +61 = 0.152344 0.15918 7 +62 > 0.160156 0.166016 6 +63 ? 0.166992 0.171875 5 +64 @ 0.172852 0.18457 12 +65 A 0.185547 0.194336 9 +66 B 0.195313 0.202148 7 +67 C 0.203125 0.209961 7 +68 D 0.210938 0.217773 7 +69 E 0.21875 0.225586 7 +70 F 0.226563 0.232422 6 +71 G 0.233398 0.241211 8 +72 H 0.242188 0.249023 7 +73 I 0.25 0.250977 1 +74 J 0.251953 0.256836 5 +75 K 0.257813 0.265625 8 +76 L 0.266602 0.272461 6 +77 M 0.273438 0.282227 9 +78 N 0.283203 0.290039 7 +79 O 0.291016 0.298828 8 +80 P 0.299805 0.306641 7 +81 Q 0.307617 0.31543 8 +82 R 0.316406 0.323242 7 +83 S 0.324219 0.331055 7 +84 T 0.332031 0.338867 7 +85 U 0.339844 0.34668 7 +86 V 0.347656 0.356445 9 +87 W 0.357422 0.370117 13 +88 X 0.371094 0.37793 7 +89 Y 0.378906 0.385742 7 +90 Z 0.386719 0.393555 7 +91 [ 0.394531 0.396484 2 +92 \ 0.397461 0.401367 4 +93 ] 0.402344 0.404297 2 +94 ^ 0.405273 0.410156 5 +95 _ 0.411133 0.417969 7 +96 ` 0.418945 0.420898 2 +97 a 0.421875 0.426758 5 +98 b 0.427734 0.432617 5 +99 c 0.433594 0.438477 5 +100 d 0.439453 0.444336 5 +101 e 0.445313 0.450195 5 +102 f 0.451172 0.455078 4 +103 g 0.456055 0.460938 5 +104 h 0.461914 0.466797 5 +105 i 0.467773 0.46875 1 +106 j 0.469727 0.472656 3 +107 k 0.473633 0.478516 5 +108 l 0.479492 0.480469 1 +109 m 0.481445 0.490234 9 +110 n 0.491211 0.496094 5 +111 o 0.49707 0.501953 5 +112 p 0.50293 0.507813 5 +113 q 0.508789 0.513672 5 +114 r 0.514648 0.517578 3 +115 s 0.518555 0.523438 5 +116 t 0.524414 0.527344 3 +117 u 0.52832 0.533203 5 +118 v 0.53418 0.539063 5 +119 w 0.540039 0.548828 9 +120 x 0.549805 0.554688 5 +121 y 0.555664 0.560547 5 +122 z 0.561523 0.566406 5 +123 { 0.567383 0.570313 3 +124 | 0.571289 0.572266 1 +125 } 0.573242 0.576172 3 +126 ~ 0.577148 0.583984 7 \ No newline at end of file diff --git a/WickedEngineTests/WickedEngineTests.cpp b/Tests/main.cpp similarity index 98% rename from WickedEngineTests/WickedEngineTests.cpp rename to Tests/main.cpp index 615abb5c1..d41fad425 100644 --- a/WickedEngineTests/WickedEngineTests.cpp +++ b/Tests/main.cpp @@ -2,10 +2,14 @@ // #include "stdafx.h" -#include "WickedEngineTests.h" +#include "main.h" #define MAX_LOADSTRING 100 +extern "C" { + _declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001; +} + // Global Variables: HINSTANCE hInst; // current instance WCHAR szTitle[MAX_LOADSTRING]; // The title bar text diff --git a/WickedEngineTests/WickedEngineTests.h b/Tests/main.h similarity index 100% rename from WickedEngineTests/WickedEngineTests.h rename to Tests/main.h diff --git a/Tests/resource.h b/Tests/resource.h new file mode 100644 index 000000000..4a8b8b105 --- /dev/null +++ b/Tests/resource.h @@ -0,0 +1,27 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Tests.rc +// +#define IDC_MYICON 2 +#define IDD_WICKEDENGINETESTS_DIALOG 102 +#define IDS_APP_TITLE 103 +#define IDD_ABOUTBOX 103 +#define IDM_ABOUT 104 +#define IDM_EXIT 105 +#define IDI_WICKEDENGINETESTS 107 +#define IDI_SMALL 108 +#define IDC_WICKEDENGINETESTS 109 +#define IDR_MAINFRAME 128 +#define IDC_STATIC -1 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NO_MFC 1 +#define _APS_NEXT_RESOURCE_VALUE 129 +#define _APS_NEXT_COMMAND_VALUE 32771 +#define _APS_NEXT_CONTROL_VALUE 1000 +#define _APS_NEXT_SYMED_VALUE 110 +#endif +#endif diff --git a/WickedEngineTests/small.ico b/Tests/small.ico similarity index 100% rename from WickedEngineTests/small.ico rename to Tests/small.ico diff --git a/WickedEngineTests/stdafx.cpp b/Tests/stdafx.cpp similarity index 100% rename from WickedEngineTests/stdafx.cpp rename to Tests/stdafx.cpp diff --git a/WickedEngineTests/stdafx.h b/Tests/stdafx.h similarity index 100% rename from WickedEngineTests/stdafx.h rename to Tests/stdafx.h diff --git a/WickedEngineTests/targetver.h b/Tests/targetver.h similarity index 100% rename from WickedEngineTests/targetver.h rename to Tests/targetver.h diff --git a/WickedEngineTests/test_script.lua b/Tests/test_script.lua similarity index 94% rename from WickedEngineTests/test_script.lua rename to Tests/test_script.lua index 50c372ec1..ff9fbc30e 100644 --- a/WickedEngineTests/test_script.lua +++ b/Tests/test_script.lua @@ -4,7 +4,7 @@ debugout("Begin script: test_script.lua"); -- Load a model: -local model = LoadModel("../WickedEngine/models/Stormtrooper/", "Stormtrooper"); +local model = LoadModel("../models/Stormtrooper/", "Stormtrooper"); -- Load an image: local sprite = Sprite("HelloWorld.png"); diff --git a/WickedEngine.sln b/WickedEngine.sln index b3202b1cb..2449f056e 100644 --- a/WickedEngine.sln +++ b/WickedEngine.sln @@ -11,13 +11,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WickedEngine_UWP", "WickedE EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WickedEngine_SHADERS", "WickedEngine\WickedEngine_SHADERS.vcxproj", "{8C15DC72-70C8-4212-B046-0B166A688A7C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WickedEngineEditor", "WickedEngine\WickedEngineEditor.vcxproj", "{5FE97B9B-A445-4EEA-A42D-9DE60B891D48}" - ProjectSection(ProjectDependencies) = postProject - {8C15DC72-70C8-4212-B046-0B166A688A7C} = {8C15DC72-70C8-4212-B046-0B166A688A7C} - {06163DCB-B183-4ED9-9C62-13EF1658E049} = {06163DCB-B183-4ED9-9C62-13EF1658E049} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Editor", "Editor\Editor.vcxproj", "{5FE97B9B-A445-4EEA-A42D-9DE60B891D48}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WickedEngineTests", "WickedEngineTests\WickedEngineTests.vcxproj", "{3A9EA3D0-A795-46ED-A737-7164E90DC309}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tests", "Tests\Tests.vcxproj", "{3A9EA3D0-A795-46ED-A737-7164E90DC309}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution @@ -68,12 +64,12 @@ Global {8C15DC72-70C8-4212-B046-0B166A688A7C}.Release|Win32.Build.0 = Release|Win32 {8C15DC72-70C8-4212-B046-0B166A688A7C}.Release|x64.ActiveCfg = Release|Win32 {8C15DC72-70C8-4212-B046-0B166A688A7C}.Release|x64.Build.0 = Release|Win32 - {5FE97B9B-A445-4EEA-A42D-9DE60B891D48}.Debug|ARM.ActiveCfg = Debug|x64 + {5FE97B9B-A445-4EEA-A42D-9DE60B891D48}.Debug|ARM.ActiveCfg = Debug|Win32 {5FE97B9B-A445-4EEA-A42D-9DE60B891D48}.Debug|Win32.ActiveCfg = Debug|Win32 {5FE97B9B-A445-4EEA-A42D-9DE60B891D48}.Debug|Win32.Build.0 = Debug|Win32 {5FE97B9B-A445-4EEA-A42D-9DE60B891D48}.Debug|x64.ActiveCfg = Debug|x64 {5FE97B9B-A445-4EEA-A42D-9DE60B891D48}.Debug|x64.Build.0 = Debug|x64 - {5FE97B9B-A445-4EEA-A42D-9DE60B891D48}.Release|ARM.ActiveCfg = Release|x64 + {5FE97B9B-A445-4EEA-A42D-9DE60B891D48}.Release|ARM.ActiveCfg = Release|Win32 {5FE97B9B-A445-4EEA-A42D-9DE60B891D48}.Release|Win32.ActiveCfg = Release|Win32 {5FE97B9B-A445-4EEA-A42D-9DE60B891D48}.Release|Win32.Build.0 = Release|Win32 {5FE97B9B-A445-4EEA-A42D-9DE60B891D48}.Release|x64.ActiveCfg = Release|x64 diff --git a/WickedEngine/PhysicsWindow.cpp b/WickedEngine/PhysicsWindow.cpp deleted file mode 100644 index fcdfd28e3..000000000 --- a/WickedEngine/PhysicsWindow.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include "stdafx.h" -#include "PhysicsWindow.h" - - -PhysicsWindow::PhysicsWindow(wiGUI* gui) : GUI(gui) -{ - float screenW = (float)wiRenderer::GetDevice()->GetScreenWidth(); - float screenH = (float)wiRenderer::GetDevice()->GetScreenHeight(); - - physicsWindow = new wiWindow(GUI, "Physics Window"); - physicsWindow->SetSize(XMFLOAT2(400, 400)); - physicsWindow->SetEnabled(true); - GUI->AddWidget(physicsWindow); - - float x = 250, y = 0, step = 30; - - physicsWindow->Translate(XMFLOAT3(1300, 150, 0)); -} - - -PhysicsWindow::~PhysicsWindow() -{ -} diff --git a/WickedEngine/PhysicsWindow.h b/WickedEngine/PhysicsWindow.h deleted file mode 100644 index ac800fe81..000000000 --- a/WickedEngine/PhysicsWindow.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -struct Material; -class wiGUI; -class wiWindow; -class wiLabel; -class wiCheckBox; -class wiSlider; -class wiComboBox; - -class PhysicsWindow -{ -public: - PhysicsWindow(wiGUI* gui); - ~PhysicsWindow(); - - wiGUI* GUI; - - wiWindow* physicsWindow; -}; - diff --git a/WickedEngine/Resource.h b/WickedEngine/Resource.h deleted file mode 100644 index d39c4269f..000000000 --- a/WickedEngine/Resource.h +++ /dev/null @@ -1,31 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by WickedEngineGame.rc -// - -#define IDS_APP_TITLE 103 - -#define IDR_MAINFRAME 128 -#define IDD_WICKEDENGINEGAME_DIALOG 102 -#define IDD_ABOUTBOX 103 -#define IDM_ABOUT 104 -#define IDM_EXIT 105 -#define IDI_WICKEDENGINEGAME 107 -#define IDI_SMALL 108 -#define IDC_WICKEDENGINEGAME 109 -#define IDC_MYICON 2 -#ifndef IDC_STATIC -#define IDC_STATIC -1 -#endif -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS - -#define _APS_NO_MFC 130 -#define _APS_NEXT_RESOURCE_VALUE 129 -#define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 110 -#endif -#endif diff --git a/WickedEngine/WickedEngineEditor.vcxproj.filters b/WickedEngine/WickedEngineEditor.vcxproj.filters deleted file mode 100644 index ba7df8d9e..000000000 --- a/WickedEngine/WickedEngineEditor.vcxproj.filters +++ /dev/null @@ -1,527 +0,0 @@ - - - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {f93c7868-4453-4ef8-94c9-db6da54fddd8} - - - {e1f824f0-bb57-4a4d-af91-24cafaef11df} - - - {314039e9-0e24-4816-b0cf-d87020800f22} - - - {9ed46f7f-9752-48cf-a429-a5c71dae06fa} - - - {e9544f30-0dff-453c-b67d-49a2b3209435} - - - {a929ae57-6b3d-4170-92f6-b0d605ac5945} - - - {af5c3812-93e4-47d3-a497-df070a3721e1} - - - {6af841a7-1d79-4608-96f7-3f98d6035b57} - - - {d7dccdcf-d445-4a20-a0a1-05c40dcaf81f} - - - {55529f69-7c03-4056-8d7d-7ddd8af6ed9a} - - - {5031c3b6-c9c4-4062-afdf-f5ac7a10c124} - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - - Resource Files - - - Resource Files - - - fonts - - - images - - - images - - - images - - - images - - - images - - - images - - - images - - - models\Stormtrooper\textures - - - models\Stormtrooper\textures - - - models\Stormtrooper\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza\textures - - - models\Sponza - - - models\Sample\rims - - - models\Sample\rims - - - models\Sample\rims - - - models\Sample\rims - - - models\Sample\rims - - - models\Sample\rims - - - models\Sample\rims - - - models\Sample\textures - - - models\Sample\textures - - - models\Sample\textures - - - models\Sample\textures - - - models\Sample\textures - - - models\Sample\textures - - - models\Sample\textures - - - models\Sample\textures - - - models\Sample\textures - - - models\Sample\textures - - - models\Sample\textures - - - models\Sample\textures - - - models\Sample\textures - - - models\Sample\textures - - - models\Sample\textures - - - models\Sample\textures - - - models\Sample\textures - - - models\Sample\textures - - - models\Sample\textures - - - models\Sample\textures - - - models\Sample - - - models\Sample - - - models\Sample - - - - - Resource Files - - - - - fonts - - - - - - - models\Sponza - - - models\Sponza - - - models\Sample - - - models\Sample - - - models\Stormtrooper - - - \ No newline at end of file diff --git a/WickedEngineTests/ReadMe.txt b/WickedEngineTests/ReadMe.txt deleted file mode 100644 index 73d70ab2f..000000000 --- a/WickedEngineTests/ReadMe.txt +++ /dev/null @@ -1,57 +0,0 @@ -======================================================================== - WIN32 APPLICATION : [!output PROJECT_NAME] Project Overview -======================================================================== - -AppWizard has created this [!output PROJECT_NAME] application for you. - -This file contains a summary of what you will find in each of the files that -make up your [!output PROJECT_NAME] application. - - - This is the main project file for VC++ projects generated using an Application Wizard. - It contains information about the version of Visual C++ that generated the file, and - information about the platforms, configurations, and project features selected with the - Application Wizard. - - This is the filters file for VC++ projects generated using an Application Wizard. - It contains information about the association between the files in your project - and the filters. This association is used in the IDE to show grouping of files with - similar extensions under a specific node (for e.g. ".cpp" files are associated with the - "Source Files" filter). - - This is the main application source file. - -///////////////////////////////////////////////////////////////////////////// -AppWizard has created the following resources: - - This is a listing of all of the Microsoft Windows resources that the - program uses. It includes the icons, bitmaps, and cursors that are stored - in the RES subdirectory. This file can be directly edited in Microsoft - Visual C++. - -Resource.h - This is the standard header file, which defines new resource IDs. - Microsoft Visual C++ reads and updates this file. - - This is an icon file, which is used as the application's icon (32x32). - This icon is included by the main resource file [!output RC_FILE_NAME]. - -small.ico - This is an icon file, which contains a smaller version (16x16) - of the application's icon. This icon is included by the main resource - file [!output RC_FILE_NAME]. - -///////////////////////////////////////////////////////////////////////////// -Other standard files: - -StdAfx.h, StdAfx.cpp - These files are used to build a precompiled header (PCH) file - named [!output PROJECT_NAME].pch and a precompiled types file named StdAfx.obj. - -///////////////////////////////////////////////////////////////////////////// -Other notes: - -AppWizard uses "TODO:" comments to indicate parts of the source code you -should add to or customize. - -///////////////////////////////////////////////////////////////////////////// diff --git a/WickedEngineTests/resource.h b/WickedEngineTests/resource.h deleted file mode 100644 index de3a32e69..000000000 --- a/WickedEngineTests/resource.h +++ /dev/null @@ -1,31 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by WickedEngineTests.rc -// - -#define IDS_APP_TITLE 103 - -#define IDR_MAINFRAME 128 -#define IDD_WICKEDENGINETESTS_DIALOG 102 -#define IDD_ABOUTBOX 103 -#define IDM_ABOUT 104 -#define IDM_EXIT 105 -#define IDI_WICKEDENGINETESTS 107 -#define IDI_SMALL 108 -#define IDC_WICKEDENGINETESTS 109 -#define IDC_MYICON 2 -#ifndef IDC_STATIC -#define IDC_STATIC -1 -#endif -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS - -#define _APS_NO_MFC 130 -#define _APS_NEXT_RESOURCE_VALUE 129 -#define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 110 -#endif -#endif diff --git a/WickedEngine/models/Sample/colorGrading.dds b/models/Sample/colorGrading.dds similarity index 100% rename from WickedEngine/models/Sample/colorGrading.dds rename to models/Sample/colorGrading.dds diff --git a/WickedEngine/models/Sample/rims/flare0.jpg b/models/Sample/rims/flare0.jpg similarity index 100% rename from WickedEngine/models/Sample/rims/flare0.jpg rename to models/Sample/rims/flare0.jpg diff --git a/WickedEngine/models/Sample/rims/flare1.jpg b/models/Sample/rims/flare1.jpg similarity index 100% rename from WickedEngine/models/Sample/rims/flare1.jpg rename to models/Sample/rims/flare1.jpg diff --git a/WickedEngine/models/Sample/rims/flare2.jpg b/models/Sample/rims/flare2.jpg similarity index 100% rename from WickedEngine/models/Sample/rims/flare2.jpg rename to models/Sample/rims/flare2.jpg diff --git a/WickedEngine/models/Sample/rims/flare3.jpg b/models/Sample/rims/flare3.jpg similarity index 100% rename from WickedEngine/models/Sample/rims/flare3.jpg rename to models/Sample/rims/flare3.jpg diff --git a/WickedEngine/models/Sample/rims/flare4.jpg b/models/Sample/rims/flare4.jpg similarity index 100% rename from WickedEngine/models/Sample/rims/flare4.jpg rename to models/Sample/rims/flare4.jpg diff --git a/WickedEngine/models/Sample/rims/flare5.jpg b/models/Sample/rims/flare5.jpg similarity index 100% rename from WickedEngine/models/Sample/rims/flare5.jpg rename to models/Sample/rims/flare5.jpg diff --git a/WickedEngine/models/Sample/rims/flare6.jpg b/models/Sample/rims/flare6.jpg similarity index 100% rename from WickedEngine/models/Sample/rims/flare6.jpg rename to models/Sample/rims/flare6.jpg diff --git a/WickedEngine/models/Sample/scene.wimf b/models/Sample/scene.wimf similarity index 100% rename from WickedEngine/models/Sample/scene.wimf rename to models/Sample/scene.wimf diff --git a/WickedEngine/models/Sample/scene.wiw b/models/Sample/scene.wiw similarity index 100% rename from WickedEngine/models/Sample/scene.wiw rename to models/Sample/scene.wiw diff --git a/WickedEngine/models/Sample/sky.dds b/models/Sample/sky.dds similarity index 100% rename from WickedEngine/models/Sample/sky.dds rename to models/Sample/sky.dds diff --git a/WickedEngine/models/Sample/sky_night.dds b/models/Sample/sky_night.dds similarity index 100% rename from WickedEngine/models/Sample/sky_night.dds rename to models/Sample/sky_night.dds diff --git a/models/Sample/temp/clipboard b/models/Sample/temp/clipboard new file mode 100644 index 000000000..eb68b3ab8 Binary files /dev/null and b/models/Sample/temp/clipboard differ diff --git a/models/Sample/temp/history0 b/models/Sample/temp/history0 new file mode 100644 index 000000000..38dd415f2 Binary files /dev/null and b/models/Sample/temp/history0 differ diff --git a/models/Sample/temp/history1 b/models/Sample/temp/history1 new file mode 100644 index 000000000..4be89ad0f Binary files /dev/null and b/models/Sample/temp/history1 differ diff --git a/WickedEngine/models/Sample/textures/Bricks_01_Diffuse.png b/models/Sample/textures/Bricks_01_Diffuse.png similarity index 100% rename from WickedEngine/models/Sample/textures/Bricks_01_Diffuse.png rename to models/Sample/textures/Bricks_01_Diffuse.png diff --git a/WickedEngine/models/Sample/textures/Clay_01_Diffuse.png b/models/Sample/textures/Clay_01_Diffuse.png similarity index 100% rename from WickedEngine/models/Sample/textures/Clay_01_Diffuse.png rename to models/Sample/textures/Clay_01_Diffuse.png diff --git a/WickedEngine/models/Sample/textures/Foliage_Bark_01_Diffuse_01.png b/models/Sample/textures/Foliage_Bark_01_Diffuse_01.png similarity index 100% rename from WickedEngine/models/Sample/textures/Foliage_Bark_01_Diffuse_01.png rename to models/Sample/textures/Foliage_Bark_01_Diffuse_01.png diff --git a/WickedEngine/models/Sample/textures/Foliage_Bark_01_Normal_01.png b/models/Sample/textures/Foliage_Bark_01_Normal_01.png similarity index 100% rename from WickedEngine/models/Sample/textures/Foliage_Bark_01_Normal_01.png rename to models/Sample/textures/Foliage_Bark_01_Normal_01.png diff --git a/WickedEngine/models/Sample/textures/Foliage_Leaves_01_DiffuseMask_01.png b/models/Sample/textures/Foliage_Leaves_01_DiffuseMask_01.png similarity index 100% rename from WickedEngine/models/Sample/textures/Foliage_Leaves_01_DiffuseMask_01.png rename to models/Sample/textures/Foliage_Leaves_01_DiffuseMask_01.png diff --git a/WickedEngine/models/Sample/textures/Rocks02_DiffuseAtlas_01.png b/models/Sample/textures/Rocks02_DiffuseAtlas_01.png similarity index 100% rename from WickedEngine/models/Sample/textures/Rocks02_DiffuseAtlas_01.png rename to models/Sample/textures/Rocks02_DiffuseAtlas_01.png diff --git a/WickedEngine/models/Sample/textures/Rocks02_NormalAtlas_01.png b/models/Sample/textures/Rocks02_NormalAtlas_01.png similarity index 100% rename from WickedEngine/models/Sample/textures/Rocks02_NormalAtlas_01.png rename to models/Sample/textures/Rocks02_NormalAtlas_01.png diff --git a/WickedEngine/models/Sample/textures/RoofTiles_01_Diffuse.png b/models/Sample/textures/RoofTiles_01_Diffuse.png similarity index 100% rename from WickedEngine/models/Sample/textures/RoofTiles_01_Diffuse.png rename to models/Sample/textures/RoofTiles_01_Diffuse.png diff --git a/WickedEngine/models/Sample/textures/WoodenPlain_01_Diffuse.png b/models/Sample/textures/WoodenPlain_01_Diffuse.png similarity index 100% rename from WickedEngine/models/Sample/textures/WoodenPlain_01_Diffuse.png rename to models/Sample/textures/WoodenPlain_01_Diffuse.png diff --git a/WickedEngine/models/Sample/textures/WoodenPlanks_01_Diffuse_01.png b/models/Sample/textures/WoodenPlanks_01_Diffuse_01.png similarity index 100% rename from WickedEngine/models/Sample/textures/WoodenPlanks_01_Diffuse_01.png rename to models/Sample/textures/WoodenPlanks_01_Diffuse_01.png diff --git a/WickedEngine/models/Sample/textures/billboardredflowers.png b/models/Sample/textures/billboardredflowers.png similarity index 100% rename from WickedEngine/models/Sample/textures/billboardredflowers.png rename to models/Sample/textures/billboardredflowers.png diff --git a/WickedEngine/models/Sample/textures/flame.png b/models/Sample/textures/flame.png similarity index 100% rename from WickedEngine/models/Sample/textures/flame.png rename to models/Sample/textures/flame.png diff --git a/WickedEngine/models/Sample/textures/grass-texture-2.jpg b/models/Sample/textures/grass-texture-2.jpg similarity index 100% rename from WickedEngine/models/Sample/textures/grass-texture-2.jpg rename to models/Sample/textures/grass-texture-2.jpg diff --git a/WickedEngine/models/Sample/textures/grassbb.png b/models/Sample/textures/grassbb.png similarity index 100% rename from WickedEngine/models/Sample/textures/grassbb.png rename to models/Sample/textures/grassbb.png diff --git a/WickedEngine/models/Sample/textures/waterNor.jpg b/models/Sample/textures/waterNor.jpg similarity index 100% rename from WickedEngine/models/Sample/textures/waterNor.jpg rename to models/Sample/textures/waterNor.jpg diff --git a/WickedEngine/models/Sample/textures/windmill_001_base_COL.jpg b/models/Sample/textures/windmill_001_base_COL.jpg similarity index 100% rename from WickedEngine/models/Sample/textures/windmill_001_base_COL.jpg rename to models/Sample/textures/windmill_001_base_COL.jpg diff --git a/WickedEngine/models/Sample/textures/windmill_001_base_NOR.jpg b/models/Sample/textures/windmill_001_base_NOR.jpg similarity index 100% rename from WickedEngine/models/Sample/textures/windmill_001_base_NOR.jpg rename to models/Sample/textures/windmill_001_base_NOR.jpg diff --git a/WickedEngine/models/Sample/textures/windmill_001_base_SPEC.jpg b/models/Sample/textures/windmill_001_base_SPEC.jpg similarity index 100% rename from WickedEngine/models/Sample/textures/windmill_001_base_SPEC.jpg rename to models/Sample/textures/windmill_001_base_SPEC.jpg diff --git a/WickedEngine/models/Sample/textures/windmill_001_lopatky_COL.jpg b/models/Sample/textures/windmill_001_lopatky_COL.jpg similarity index 100% rename from WickedEngine/models/Sample/textures/windmill_001_lopatky_COL.jpg rename to models/Sample/textures/windmill_001_lopatky_COL.jpg diff --git a/WickedEngine/models/Sample/textures/windmill_001_lopatky_NOR.jpg b/models/Sample/textures/windmill_001_lopatky_NOR.jpg similarity index 100% rename from WickedEngine/models/Sample/textures/windmill_001_lopatky_NOR.jpg rename to models/Sample/textures/windmill_001_lopatky_NOR.jpg diff --git a/WickedEngine/models/Sponza/sky.dds b/models/Sponza/sky.dds similarity index 100% rename from WickedEngine/models/Sponza/sky.dds rename to models/Sponza/sky.dds diff --git a/WickedEngine/models/Sponza/sponza.wimf b/models/Sponza/sponza.wimf similarity index 100% rename from WickedEngine/models/Sponza/sponza.wimf rename to models/Sponza/sponza.wimf diff --git a/WickedEngine/models/Sponza/sponza.wiw b/models/Sponza/sponza.wiw similarity index 100% rename from WickedEngine/models/Sponza/sponza.wiw rename to models/Sponza/sponza.wiw diff --git a/models/Sponza/temp/history0 b/models/Sponza/temp/history0 new file mode 100644 index 000000000..b66bf2513 Binary files /dev/null and b/models/Sponza/temp/history0 differ diff --git a/models/Sponza/temp/history1 b/models/Sponza/temp/history1 new file mode 100644 index 000000000..89fb01b11 Binary files /dev/null and b/models/Sponza/temp/history1 differ diff --git a/models/Sponza/temp/history2 b/models/Sponza/temp/history2 new file mode 100644 index 000000000..ef03cc421 Binary files /dev/null and b/models/Sponza/temp/history2 differ diff --git a/models/Sponza/temp/history3 b/models/Sponza/temp/history3 new file mode 100644 index 000000000..26b3ef723 Binary files /dev/null and b/models/Sponza/temp/history3 differ diff --git a/models/Sponza/temp/history4 b/models/Sponza/temp/history4 new file mode 100644 index 000000000..155b6ecb7 Binary files /dev/null and b/models/Sponza/temp/history4 differ diff --git a/models/Sponza/temp/history5 b/models/Sponza/temp/history5 new file mode 100644 index 000000000..31d72735c Binary files /dev/null and b/models/Sponza/temp/history5 differ diff --git a/WickedEngine/models/Sponza/textures/background.png b/models/Sponza/textures/background.png similarity index 100% rename from WickedEngine/models/Sponza/textures/background.png rename to models/Sponza/textures/background.png diff --git a/WickedEngine/models/Sponza/textures/backgroundBGR.png b/models/Sponza/textures/backgroundBGR.png similarity index 100% rename from WickedEngine/models/Sponza/textures/backgroundBGR.png rename to models/Sponza/textures/backgroundBGR.png diff --git a/WickedEngine/models/Sponza/textures/background_bump.png b/models/Sponza/textures/background_bump.png similarity index 100% rename from WickedEngine/models/Sponza/textures/background_bump.png rename to models/Sponza/textures/background_bump.png diff --git a/WickedEngine/models/Sponza/textures/background_ddn.png b/models/Sponza/textures/background_ddn.png similarity index 100% rename from WickedEngine/models/Sponza/textures/background_ddn.png rename to models/Sponza/textures/background_ddn.png diff --git a/WickedEngine/models/Sponza/textures/chain_texture.png b/models/Sponza/textures/chain_texture.png similarity index 100% rename from WickedEngine/models/Sponza/textures/chain_texture.png rename to models/Sponza/textures/chain_texture.png diff --git a/WickedEngine/models/Sponza/textures/chain_texture_bump.png b/models/Sponza/textures/chain_texture_bump.png similarity index 100% rename from WickedEngine/models/Sponza/textures/chain_texture_bump.png rename to models/Sponza/textures/chain_texture_bump.png diff --git a/WickedEngine/models/Sponza/textures/chain_texture_ddn.png b/models/Sponza/textures/chain_texture_ddn.png similarity index 100% rename from WickedEngine/models/Sponza/textures/chain_texture_ddn.png rename to models/Sponza/textures/chain_texture_ddn.png diff --git a/WickedEngine/models/Sponza/textures/chain_texture_mask.png b/models/Sponza/textures/chain_texture_mask.png similarity index 100% rename from WickedEngine/models/Sponza/textures/chain_texture_mask.png rename to models/Sponza/textures/chain_texture_mask.png diff --git a/WickedEngine/models/Sponza/textures/gi_flag.png b/models/Sponza/textures/gi_flag.png similarity index 100% rename from WickedEngine/models/Sponza/textures/gi_flag.png rename to models/Sponza/textures/gi_flag.png diff --git a/WickedEngine/models/Sponza/textures/lion.png b/models/Sponza/textures/lion.png similarity index 100% rename from WickedEngine/models/Sponza/textures/lion.png rename to models/Sponza/textures/lion.png diff --git a/WickedEngine/models/Sponza/textures/lion2_bump.png b/models/Sponza/textures/lion2_bump.png similarity index 100% rename from WickedEngine/models/Sponza/textures/lion2_bump.png rename to models/Sponza/textures/lion2_bump.png diff --git a/WickedEngine/models/Sponza/textures/lion2_ddn.png b/models/Sponza/textures/lion2_ddn.png similarity index 100% rename from WickedEngine/models/Sponza/textures/lion2_ddn.png rename to models/Sponza/textures/lion2_ddn.png diff --git a/WickedEngine/models/Sponza/textures/lion_bump.png b/models/Sponza/textures/lion_bump.png similarity index 100% rename from WickedEngine/models/Sponza/textures/lion_bump.png rename to models/Sponza/textures/lion_bump.png diff --git a/WickedEngine/models/Sponza/textures/lion_ddn.png b/models/Sponza/textures/lion_ddn.png similarity index 100% rename from WickedEngine/models/Sponza/textures/lion_ddn.png rename to models/Sponza/textures/lion_ddn.png diff --git a/WickedEngine/models/Sponza/textures/spnza_bricks_a_bump.png b/models/Sponza/textures/spnza_bricks_a_bump.png similarity index 100% rename from WickedEngine/models/Sponza/textures/spnza_bricks_a_bump.png rename to models/Sponza/textures/spnza_bricks_a_bump.png diff --git a/WickedEngine/models/Sponza/textures/spnza_bricks_a_ddn.png b/models/Sponza/textures/spnza_bricks_a_ddn.png similarity index 100% rename from WickedEngine/models/Sponza/textures/spnza_bricks_a_ddn.png rename to models/Sponza/textures/spnza_bricks_a_ddn.png diff --git a/WickedEngine/models/Sponza/textures/spnza_bricks_a_diff.png b/models/Sponza/textures/spnza_bricks_a_diff.png similarity index 100% rename from WickedEngine/models/Sponza/textures/spnza_bricks_a_diff.png rename to models/Sponza/textures/spnza_bricks_a_diff.png diff --git a/WickedEngine/models/Sponza/textures/spnza_bricks_a_spec.png b/models/Sponza/textures/spnza_bricks_a_spec.png similarity index 100% rename from WickedEngine/models/Sponza/textures/spnza_bricks_a_spec.png rename to models/Sponza/textures/spnza_bricks_a_spec.png diff --git a/WickedEngine/models/Sponza/textures/sponza_arch_bump.png b/models/Sponza/textures/sponza_arch_bump.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_arch_bump.png rename to models/Sponza/textures/sponza_arch_bump.png diff --git a/WickedEngine/models/Sponza/textures/sponza_arch_ddn.png b/models/Sponza/textures/sponza_arch_ddn.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_arch_ddn.png rename to models/Sponza/textures/sponza_arch_ddn.png diff --git a/WickedEngine/models/Sponza/textures/sponza_arch_diff.png b/models/Sponza/textures/sponza_arch_diff.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_arch_diff.png rename to models/Sponza/textures/sponza_arch_diff.png diff --git a/WickedEngine/models/Sponza/textures/sponza_arch_diff_NRM.png b/models/Sponza/textures/sponza_arch_diff_NRM.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_arch_diff_NRM.png rename to models/Sponza/textures/sponza_arch_diff_NRM.png diff --git a/WickedEngine/models/Sponza/textures/sponza_arch_spec.png b/models/Sponza/textures/sponza_arch_spec.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_arch_spec.png rename to models/Sponza/textures/sponza_arch_spec.png diff --git a/WickedEngine/models/Sponza/textures/sponza_ceiling_a_diff.png b/models/Sponza/textures/sponza_ceiling_a_diff.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_ceiling_a_diff.png rename to models/Sponza/textures/sponza_ceiling_a_diff.png diff --git a/WickedEngine/models/Sponza/textures/sponza_ceiling_a_diff_NRM.png b/models/Sponza/textures/sponza_ceiling_a_diff_NRM.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_ceiling_a_diff_NRM.png rename to models/Sponza/textures/sponza_ceiling_a_diff_NRM.png diff --git a/WickedEngine/models/Sponza/textures/sponza_ceiling_a_spec.png b/models/Sponza/textures/sponza_ceiling_a_spec.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_ceiling_a_spec.png rename to models/Sponza/textures/sponza_ceiling_a_spec.png diff --git a/WickedEngine/models/Sponza/textures/sponza_column_a_bump.png b/models/Sponza/textures/sponza_column_a_bump.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_column_a_bump.png rename to models/Sponza/textures/sponza_column_a_bump.png diff --git a/WickedEngine/models/Sponza/textures/sponza_column_a_ddn.png b/models/Sponza/textures/sponza_column_a_ddn.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_column_a_ddn.png rename to models/Sponza/textures/sponza_column_a_ddn.png diff --git a/WickedEngine/models/Sponza/textures/sponza_column_a_diff.png b/models/Sponza/textures/sponza_column_a_diff.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_column_a_diff.png rename to models/Sponza/textures/sponza_column_a_diff.png diff --git a/WickedEngine/models/Sponza/textures/sponza_column_a_spec.png b/models/Sponza/textures/sponza_column_a_spec.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_column_a_spec.png rename to models/Sponza/textures/sponza_column_a_spec.png diff --git a/WickedEngine/models/Sponza/textures/sponza_column_b_bump.png b/models/Sponza/textures/sponza_column_b_bump.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_column_b_bump.png rename to models/Sponza/textures/sponza_column_b_bump.png diff --git a/WickedEngine/models/Sponza/textures/sponza_column_b_ddn.png b/models/Sponza/textures/sponza_column_b_ddn.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_column_b_ddn.png rename to models/Sponza/textures/sponza_column_b_ddn.png diff --git a/WickedEngine/models/Sponza/textures/sponza_column_b_diff.png b/models/Sponza/textures/sponza_column_b_diff.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_column_b_diff.png rename to models/Sponza/textures/sponza_column_b_diff.png diff --git a/WickedEngine/models/Sponza/textures/sponza_column_b_spec.png b/models/Sponza/textures/sponza_column_b_spec.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_column_b_spec.png rename to models/Sponza/textures/sponza_column_b_spec.png diff --git a/WickedEngine/models/Sponza/textures/sponza_column_c_bump.png b/models/Sponza/textures/sponza_column_c_bump.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_column_c_bump.png rename to models/Sponza/textures/sponza_column_c_bump.png diff --git a/WickedEngine/models/Sponza/textures/sponza_column_c_ddn.png b/models/Sponza/textures/sponza_column_c_ddn.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_column_c_ddn.png rename to models/Sponza/textures/sponza_column_c_ddn.png diff --git a/WickedEngine/models/Sponza/textures/sponza_column_c_diff.png b/models/Sponza/textures/sponza_column_c_diff.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_column_c_diff.png rename to models/Sponza/textures/sponza_column_c_diff.png diff --git a/WickedEngine/models/Sponza/textures/sponza_column_c_spec.png b/models/Sponza/textures/sponza_column_c_spec.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_column_c_spec.png rename to models/Sponza/textures/sponza_column_c_spec.png diff --git a/WickedEngine/models/Sponza/textures/sponza_curtain_blue_diff.png b/models/Sponza/textures/sponza_curtain_blue_diff.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_curtain_blue_diff.png rename to models/Sponza/textures/sponza_curtain_blue_diff.png diff --git a/WickedEngine/models/Sponza/textures/sponza_curtain_blue_diff_NRM.png b/models/Sponza/textures/sponza_curtain_blue_diff_NRM.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_curtain_blue_diff_NRM.png rename to models/Sponza/textures/sponza_curtain_blue_diff_NRM.png diff --git a/WickedEngine/models/Sponza/textures/sponza_curtain_diff.png b/models/Sponza/textures/sponza_curtain_diff.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_curtain_diff.png rename to models/Sponza/textures/sponza_curtain_diff.png diff --git a/WickedEngine/models/Sponza/textures/sponza_curtain_green_diff.png b/models/Sponza/textures/sponza_curtain_green_diff.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_curtain_green_diff.png rename to models/Sponza/textures/sponza_curtain_green_diff.png diff --git a/WickedEngine/models/Sponza/textures/sponza_details_diff.png b/models/Sponza/textures/sponza_details_diff.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_details_diff.png rename to models/Sponza/textures/sponza_details_diff.png diff --git a/WickedEngine/models/Sponza/textures/sponza_details_diff_NRM.png b/models/Sponza/textures/sponza_details_diff_NRM.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_details_diff_NRM.png rename to models/Sponza/textures/sponza_details_diff_NRM.png diff --git a/WickedEngine/models/Sponza/textures/sponza_details_spec.png b/models/Sponza/textures/sponza_details_spec.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_details_spec.png rename to models/Sponza/textures/sponza_details_spec.png diff --git a/WickedEngine/models/Sponza/textures/sponza_fabric_blue_diff.png b/models/Sponza/textures/sponza_fabric_blue_diff.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_fabric_blue_diff.png rename to models/Sponza/textures/sponza_fabric_blue_diff.png diff --git a/WickedEngine/models/Sponza/textures/sponza_fabric_blue_diff_NRM.png b/models/Sponza/textures/sponza_fabric_blue_diff_NRM.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_fabric_blue_diff_NRM.png rename to models/Sponza/textures/sponza_fabric_blue_diff_NRM.png diff --git a/WickedEngine/models/Sponza/textures/sponza_fabric_diff.png b/models/Sponza/textures/sponza_fabric_diff.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_fabric_diff.png rename to models/Sponza/textures/sponza_fabric_diff.png diff --git a/WickedEngine/models/Sponza/textures/sponza_fabric_green_diff.png b/models/Sponza/textures/sponza_fabric_green_diff.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_fabric_green_diff.png rename to models/Sponza/textures/sponza_fabric_green_diff.png diff --git a/WickedEngine/models/Sponza/textures/sponza_fabric_spec.png b/models/Sponza/textures/sponza_fabric_spec.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_fabric_spec.png rename to models/Sponza/textures/sponza_fabric_spec.png diff --git a/WickedEngine/models/Sponza/textures/sponza_flagpole_diff.png b/models/Sponza/textures/sponza_flagpole_diff.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_flagpole_diff.png rename to models/Sponza/textures/sponza_flagpole_diff.png diff --git a/WickedEngine/models/Sponza/textures/sponza_flagpole_diff_NRM.png b/models/Sponza/textures/sponza_flagpole_diff_NRM.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_flagpole_diff_NRM.png rename to models/Sponza/textures/sponza_flagpole_diff_NRM.png diff --git a/WickedEngine/models/Sponza/textures/sponza_flagpole_spec.png b/models/Sponza/textures/sponza_flagpole_spec.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_flagpole_spec.png rename to models/Sponza/textures/sponza_flagpole_spec.png diff --git a/WickedEngine/models/Sponza/textures/sponza_floor_a_diff.png b/models/Sponza/textures/sponza_floor_a_diff.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_floor_a_diff.png rename to models/Sponza/textures/sponza_floor_a_diff.png diff --git a/WickedEngine/models/Sponza/textures/sponza_floor_a_diff_NRM.png b/models/Sponza/textures/sponza_floor_a_diff_NRM.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_floor_a_diff_NRM.png rename to models/Sponza/textures/sponza_floor_a_diff_NRM.png diff --git a/WickedEngine/models/Sponza/textures/sponza_floor_a_spec.png b/models/Sponza/textures/sponza_floor_a_spec.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_floor_a_spec.png rename to models/Sponza/textures/sponza_floor_a_spec.png diff --git a/WickedEngine/models/Sponza/textures/sponza_roof_diff.png b/models/Sponza/textures/sponza_roof_diff.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_roof_diff.png rename to models/Sponza/textures/sponza_roof_diff.png diff --git a/WickedEngine/models/Sponza/textures/sponza_roof_diff_NRM.png b/models/Sponza/textures/sponza_roof_diff_NRM.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_roof_diff_NRM.png rename to models/Sponza/textures/sponza_roof_diff_NRM.png diff --git a/WickedEngine/models/Sponza/textures/sponza_thorn_bump.png b/models/Sponza/textures/sponza_thorn_bump.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_thorn_bump.png rename to models/Sponza/textures/sponza_thorn_bump.png diff --git a/WickedEngine/models/Sponza/textures/sponza_thorn_ddn.png b/models/Sponza/textures/sponza_thorn_ddn.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_thorn_ddn.png rename to models/Sponza/textures/sponza_thorn_ddn.png diff --git a/WickedEngine/models/Sponza/textures/sponza_thorn_diff.png b/models/Sponza/textures/sponza_thorn_diff.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_thorn_diff.png rename to models/Sponza/textures/sponza_thorn_diff.png diff --git a/WickedEngine/models/Sponza/textures/sponza_thorn_mask.png b/models/Sponza/textures/sponza_thorn_mask.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_thorn_mask.png rename to models/Sponza/textures/sponza_thorn_mask.png diff --git a/WickedEngine/models/Sponza/textures/sponza_thorn_spec.png b/models/Sponza/textures/sponza_thorn_spec.png similarity index 100% rename from WickedEngine/models/Sponza/textures/sponza_thorn_spec.png rename to models/Sponza/textures/sponza_thorn_spec.png diff --git a/WickedEngine/models/Sponza/textures/vase_bump.png b/models/Sponza/textures/vase_bump.png similarity index 100% rename from WickedEngine/models/Sponza/textures/vase_bump.png rename to models/Sponza/textures/vase_bump.png diff --git a/WickedEngine/models/Sponza/textures/vase_ddn.png b/models/Sponza/textures/vase_ddn.png similarity index 100% rename from WickedEngine/models/Sponza/textures/vase_ddn.png rename to models/Sponza/textures/vase_ddn.png diff --git a/WickedEngine/models/Sponza/textures/vase_dif.png b/models/Sponza/textures/vase_dif.png similarity index 100% rename from WickedEngine/models/Sponza/textures/vase_dif.png rename to models/Sponza/textures/vase_dif.png diff --git a/WickedEngine/models/Sponza/textures/vase_hanging.png b/models/Sponza/textures/vase_hanging.png similarity index 100% rename from WickedEngine/models/Sponza/textures/vase_hanging.png rename to models/Sponza/textures/vase_hanging.png diff --git a/WickedEngine/models/Sponza/textures/vase_hanging_NRM.png b/models/Sponza/textures/vase_hanging_NRM.png similarity index 100% rename from WickedEngine/models/Sponza/textures/vase_hanging_NRM.png rename to models/Sponza/textures/vase_hanging_NRM.png diff --git a/WickedEngine/models/Sponza/textures/vase_plant.png b/models/Sponza/textures/vase_plant.png similarity index 100% rename from WickedEngine/models/Sponza/textures/vase_plant.png rename to models/Sponza/textures/vase_plant.png diff --git a/WickedEngine/models/Sponza/textures/vase_plant_NRM.png b/models/Sponza/textures/vase_plant_NRM.png similarity index 100% rename from WickedEngine/models/Sponza/textures/vase_plant_NRM.png rename to models/Sponza/textures/vase_plant_NRM.png diff --git a/WickedEngine/models/Sponza/textures/vase_plant_mask.png b/models/Sponza/textures/vase_plant_mask.png similarity index 100% rename from WickedEngine/models/Sponza/textures/vase_plant_mask.png rename to models/Sponza/textures/vase_plant_mask.png diff --git a/WickedEngine/models/Sponza/textures/vase_plant_spec.png b/models/Sponza/textures/vase_plant_spec.png similarity index 100% rename from WickedEngine/models/Sponza/textures/vase_plant_spec.png rename to models/Sponza/textures/vase_plant_spec.png diff --git a/WickedEngine/models/Sponza/textures/vase_round.png b/models/Sponza/textures/vase_round.png similarity index 100% rename from WickedEngine/models/Sponza/textures/vase_round.png rename to models/Sponza/textures/vase_round.png diff --git a/WickedEngine/models/Sponza/textures/vase_round_bump.png b/models/Sponza/textures/vase_round_bump.png similarity index 100% rename from WickedEngine/models/Sponza/textures/vase_round_bump.png rename to models/Sponza/textures/vase_round_bump.png diff --git a/WickedEngine/models/Sponza/textures/vase_round_ddn.png b/models/Sponza/textures/vase_round_ddn.png similarity index 100% rename from WickedEngine/models/Sponza/textures/vase_round_ddn.png rename to models/Sponza/textures/vase_round_ddn.png diff --git a/WickedEngine/models/Sponza/textures/vase_round_spec.png b/models/Sponza/textures/vase_round_spec.png similarity index 100% rename from WickedEngine/models/Sponza/textures/vase_round_spec.png rename to models/Sponza/textures/vase_round_spec.png diff --git a/WickedEngine/models/Stormtrooper/Stormtrooper.wimf b/models/Stormtrooper/Stormtrooper.wimf similarity index 100% rename from WickedEngine/models/Stormtrooper/Stormtrooper.wimf rename to models/Stormtrooper/Stormtrooper.wimf diff --git a/models/Stormtrooper/temp/clipboard b/models/Stormtrooper/temp/clipboard new file mode 100644 index 000000000..6f636eb14 Binary files /dev/null and b/models/Stormtrooper/temp/clipboard differ diff --git a/models/Stormtrooper/temp/history0 b/models/Stormtrooper/temp/history0 new file mode 100644 index 000000000..7bec7b439 Binary files /dev/null and b/models/Stormtrooper/temp/history0 differ diff --git a/models/Stormtrooper/temp/history1 b/models/Stormtrooper/temp/history1 new file mode 100644 index 000000000..392456524 Binary files /dev/null and b/models/Stormtrooper/temp/history1 differ diff --git a/models/Stormtrooper/temp/history2 b/models/Stormtrooper/temp/history2 new file mode 100644 index 000000000..5a00f6ba9 Binary files /dev/null and b/models/Stormtrooper/temp/history2 differ diff --git a/WickedEngine/models/Stormtrooper/textures/Stormtrooper_D.dds b/models/Stormtrooper/textures/Stormtrooper_D.dds similarity index 100% rename from WickedEngine/models/Stormtrooper/textures/Stormtrooper_D.dds rename to models/Stormtrooper/textures/Stormtrooper_D.dds diff --git a/WickedEngine/models/Stormtrooper/textures/Stormtrooper_N.dds b/models/Stormtrooper/textures/Stormtrooper_N.dds similarity index 100% rename from WickedEngine/models/Stormtrooper/textures/Stormtrooper_N.dds rename to models/Stormtrooper/textures/Stormtrooper_N.dds diff --git a/WickedEngine/models/Stormtrooper/textures/Stormtrooper_S.dds b/models/Stormtrooper/textures/Stormtrooper_S.dds similarity index 100% rename from WickedEngine/models/Stormtrooper/textures/Stormtrooper_S.dds rename to models/Stormtrooper/textures/Stormtrooper_S.dds