From 5a8296a00109dc7fe82d3d1cb18b88caed78724c Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Sun, 3 Mar 2019 01:47:52 +0100
Subject: [PATCH] build: clean up lol-core vcxproj filters and improve DLL
 copying.

---
 build/msbuild/lol.rules.props                 |    4 +-
 build/msbuild/lol.vars.props                  |   11 +-
 src/Makefile.am                               |    2 +-
 src/lol-core.vcxproj                          |   48 +
 ...cxproj.filter => lol-core.vcxproj.filters} | 1073 ++++++++---------
 5 files changed, 580 insertions(+), 558 deletions(-)
 rename src/{lol-core.vcxproj.filter => lol-core.vcxproj.filters} (80%)
 mode change 100644 => 100755

diff --git a/build/msbuild/lol.rules.props b/build/msbuild/lol.rules.props
index 5f277e55..23e1d70c 100644
--- a/build/msbuild/lol.rules.props
+++ b/build/msbuild/lol.rules.props
@@ -109,8 +109,8 @@
         set A=$(SdlLibs)
         :again
         for /f "tokens=1* delims=;" %%I in ("%A%") do (
-          if not "%%I" == "" echo xcopy /y /c /d "%%I"\*.dll "$(TargetDir)"
-          if not "%%I" == "" xcopy /y /c /d "%%I"\*.dll "$(TargetDir)"
+          rem if not "%%I" == "" echo xcopy /y /c /d "%%I"\*.dll "$(TargetDir)"
+          rem if not "%%I" == "" xcopy /y /c /d "%%I"\*.dll "$(TargetDir)"
           if not "%%I" == "" set A=%%J
           if not "%%I" == "" goto again
         )
diff --git a/build/msbuild/lol.vars.props b/build/msbuild/lol.vars.props
index 45d34f79..ad2d43b4 100644
--- a/build/msbuild/lol.vars.props
+++ b/build/msbuild/lol.vars.props
@@ -73,11 +73,14 @@
     <SdlDir>$(ExternalDir)\sdl-2.0.9</SdlDir>
     <SdlImageDir>$(ExternalDir)\sdl-image-2.0.4</SdlImageDir>
     <SdlMixerDir>$(ExternalDir)\sdl-mixer-2.0.4</SdlMixerDir>
+    <SdlLibDir Condition="'$(Platform)'=='Win32'">$(SdlDir)\lib\i686-msvc</SdlLibDir>
+    <SdlLibDir Condition="'$(Platform)'=='x64'">$(SdlDir)\lib\x86_64-msvc</SdlLibDir>
+    <SdlImageLibDir Condition="'$(Platform)'=='Win32'">$(SdlImageDir)\lib\i686-msvc</SdlImageLibDir>
+    <SdlImageLibDir Condition="'$(Platform)'=='x64'">$(SdlImageDir)\lib\x86_64-msvc</SdlImageLibDir>
+    <SdlMixerLibDir Condition="'$(Platform)'=='Win32'">$(SdlMixerDir)\lib\i686-msvc</SdlMixerLibDir>
+    <SdlMixerLibDir Condition="'$(Platform)'=='x64'">$(SdlMixerDir)\lib\x86_64-msvc</SdlMixerLibDir>
     <SdlIncludes>$(SdlDir)\include;$(SdlImageDir)\include;$(SdlMixerDir)\include</SdlIncludes>
-    <SdlLibs Condition="'$(Platform)'=='Win32'">$(SdlDir)\lib\i686-msvc;$(SdlImageDir)\lib\i686-msvc;$(SdlMixerDir)\lib\i686-msvc</SdlLibs>
-    <SdlLibs Condition="'$(Platform)'=='x64'">$(SdlDir)\lib\x86_64-msvc;$(SdlImageDir)\lib\x86_64-msvc;$(SdlMixerDir)\lib\x86_64-msvc</SdlLibs>
-    <SdlDeps Condition="'$(Platform)'=='Win32'">SDL2.lib;SDL2main.lib;SDL2_image.lib;SDL2_mixer.lib</SdlDeps>
-    <SdlDeps Condition="'$(Platform)'=='x64'">SDL2.lib;SDL2main.lib;SDL2_image.lib;SDL2_mixer.lib</SdlDeps>
+    <SdlLibs>$(SdlLibDir);$(SdlImageLibDir);$(SdlMixerLibDir)</SdlLibs>
     <Win32Defines>HAVE_SDL_H;LOL_USE_SDL;$(Win32Defines)</Win32Defines>
     <Win32Defines>LOL_USE_SDL_MIXER;LOL_USE_SDL_IMAGE;$(Win32Defines)</Win32Defines>
   </PropertyGroup>
diff --git a/src/Makefile.am b/src/Makefile.am
index 75dc7f01..39339cca 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = 3rdparty data . t
 
 noinst_LIBRARIES = liblol-core.a
 
-EXTRA_DIST += lol-core.vcxproj lol-core.vcxproj.filter
+EXTRA_DIST += lol-core.vcxproj lol-core.vcxproj.filters
 
 liblol_core_a_SOURCES = \
     lolgl.h scene.cpp scene.h font.cpp font.h \
diff --git a/src/lol-core.vcxproj b/src/lol-core.vcxproj
index 9ffe1715..1a1b189b 100644
--- a/src/lol-core.vcxproj
+++ b/src/lol-core.vcxproj
@@ -317,6 +317,54 @@
     <LolFxCompile Include="gradient.lolfx" />
   </ItemGroup>
   <ItemGroup>
+    <CopyFileToFolders Include="$(SdlLibDir)\SDL2.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlImageLibDir)\libjpeg-9.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlImageLibDir)\libpng16-16.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlImageLibDir)\libtiff-5.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlImageLibDir)\libwebp-7.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlImageLibDir)\SDL2_image.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlImageLibDir)\zlib1.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlMixerLibDir)\libFLAC-8.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlMixerLibDir)\libmodplug-1.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlMixerLibDir)\libmpg123-0.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlMixerLibDir)\libogg-0.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlMixerLibDir)\libopus-0.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlMixerLibDir)\libopusfile-0.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlMixerLibDir)\libvorbis-0.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlMixerLibDir)\libvorbisfile-3.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlMixerLibDir)\SDL2_mixer.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
     <None Include="Makefile.am">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </None>
diff --git a/src/lol-core.vcxproj.filter b/src/lol-core.vcxproj.filters
old mode 100644
new mode 100755
similarity index 80%
rename from src/lol-core.vcxproj.filter
rename to src/lol-core.vcxproj.filters
index 60672514..34c5712c
--- a/src/lol-core.vcxproj.filter
+++ b/src/lol-core.vcxproj.filters
@@ -1,118 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="...">
-      <UniqueIdentifier>{3592ed6a-59d7-4a6d-be5a-c05cb5dab730}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="application">
-      <UniqueIdentifier>{459e2b92-4e46-4f07-89f7-62b55c7a2797}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="debug">
-      <UniqueIdentifier>{e056731c-5484-434a-965e-801c199c0366}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="easymesh">
-      <UniqueIdentifier>{07117029-d79d-4d59-beec-691b00a97c8f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="gpu">
-      <UniqueIdentifier>{ec9b94fc-c716-4ef2-9c3b-c7f3447574b0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="image">
-      <UniqueIdentifier>{940329fb-d054-433a-ae30-b7f409790554}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="image\codec">
-      <UniqueIdentifier>{123803f1-1722-4421-8245-098667654cda}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ui">
-      <UniqueIdentifier>{94992c0e-ebc5-4185-b766-323b06547dcf}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lol">
-      <UniqueIdentifier>{0edcf1a5-3c9c-4425-918c-aa2cbebc51c1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lol\algorithm">
-      <UniqueIdentifier>{39f6f872-186f-48af-8e87-bcceb06b1b21}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lol\engine">
-      <UniqueIdentifier>{a20b47c1-a0f8-4a02-a7a8-6da2ccd8bb02}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lol\image">
-      <UniqueIdentifier>{f25b3187-b24c-469a-b038-5a968eaa83f6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lol\math">
-      <UniqueIdentifier>{1e0b7a4c-425f-4d4f-945e-ba2ac9386ce0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lol\math\noise">
-      <UniqueIdentifier>{97d023b5-9715-4f30-bacb-846d89025f5b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="math">
-      <UniqueIdentifier>{2caadbda-b9f1-446d-bbd2-55c959db342c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="mesh">
-      <UniqueIdentifier>{1eaa8df5-7a31-4358-a1e9-0e265de6ed49}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lol\base">
-      <UniqueIdentifier>{e17b998c-d494-480b-ae29-5d1564f73327}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="base">
-      <UniqueIdentifier>{606ea817-db84-40fe-be2e-8e5c864e39b2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="image\color">
-      <UniqueIdentifier>{73e4bc38-19e4-41d2-82e9-ebf22fa65f77}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lol\sys">
-      <UniqueIdentifier>{647eb922-e722-418a-91e9-9e2d53ff5a85}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lol\gpu">
-      <UniqueIdentifier>{514846bc-650a-4423-b35a-6ccb9a1f0edd}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="sys">
-      <UniqueIdentifier>{1d945673-ee9a-48a7-9ee8-34338c5fefc1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lol\debug">
-      <UniqueIdentifier>{01285b11-c6c7-4a9e-8dee-daa2c63901e4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="platform">
-      <UniqueIdentifier>{a11c55f8-8e10-4270-be24-38e8d4fcf589}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="platform\sdl">
-      <UniqueIdentifier>{4089421f-2cc2-4036-a6b2-9df8a2f4efc8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="platform\xbox">
-      <UniqueIdentifier>{317cb5cc-5dcc-4e14-be90-40a125a2e2ec}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="image\dither">
-      <UniqueIdentifier>{63e63eea-c96e-4d37-81f6-f3f17e18b751}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="image\filter">
-      <UniqueIdentifier>{3f420a7d-0538-463a-925b-3f8968bf628e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lolua">
-      <UniqueIdentifier>{25cc0513-ad71-4fbe-bd24-acc88aa66833}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="tileset">
-      <UniqueIdentifier>{7fb4105d-4f17-4824-8d40-948553fdcde1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="engine">
-      <UniqueIdentifier>{3bd5fe6f-c9cd-45f3-98a9-958d86d415e8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="display">
-      <UniqueIdentifier>{869f0b25-469b-4b06-a2a2-325449fc868f}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="image\crop.cpp">
-      <Filter>image</Filter>
+    <ClCompile Include="application\application.cpp">
+      <Filter>application</Filter>
     </ClCompile>
-    <ClCompile Include="image\image.cpp">
-      <Filter>image</Filter>
+    <ClCompile Include="application\egl-app.cpp">
+      <Filter>application</Filter>
     </ClCompile>
-    <ClCompile Include="image\kernel.cpp">
-      <Filter>image</Filter>
+    <ClCompile Include="application\sdl-app.cpp">
+      <Filter>application</Filter>
+    </ClCompile>
+    <ClCompile Include="camera.cpp" />
+    <ClCompile Include="base\assert.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="base\log.cpp">
+      <Filter>base</Filter>
+    </ClCompile>
+    <ClCompile Include="base\string.cpp">
+      <Filter>base</Filter>
     </ClCompile>
     <ClCompile Include="debug\fps.cpp">
       <Filter>debug</Filter>
     </ClCompile>
-    <ClCompile Include="image\movie.cpp">
-      <Filter>image</Filter>
+    <ClCompile Include="debug\lines.cpp">
+      <Filter>debug</Filter>
     </ClCompile>
     <ClCompile Include="debug\record.cpp">
       <Filter>debug</Filter>
@@ -120,29 +32,61 @@
     <ClCompile Include="debug\stats.cpp">
       <Filter>debug</Filter>
     </ClCompile>
-    <ClCompile Include="application\sdl-app.cpp">
-      <Filter>application</Filter>
+    <ClCompile Include="easymesh\csgbsp.cpp">
+      <Filter>easymesh</Filter>
     </ClCompile>
-    <ClCompile Include="ui\sdl-input.cpp">
-      <Filter>ui</Filter>
+    <ClCompile Include="easymesh\easymesh.cpp">
+      <Filter>easymesh</Filter>
     </ClCompile>
-    <ClCompile Include="math\half.cpp">
-      <Filter>math</Filter>
+    <ClCompile Include="easymesh\easymeshbuild.cpp">
+      <Filter>easymesh</Filter>
     </ClCompile>
-    <ClCompile Include="math\matrix.cpp">
-      <Filter>math</Filter>
+    <ClCompile Include="easymesh\easymeshcsg.cpp">
+      <Filter>easymesh</Filter>
     </ClCompile>
-    <ClCompile Include="math\real.cpp">
-      <Filter>math</Filter>
+    <ClCompile Include="easymesh\easymeshcursor.cpp">
+      <Filter>easymesh</Filter>
     </ClCompile>
-    <ClCompile Include="math\transform.cpp">
-      <Filter>math</Filter>
+    <ClCompile Include="easymesh\easymeshinternal.cpp">
+      <Filter>easymesh</Filter>
     </ClCompile>
-    <ClCompile Include="math\vector.cpp">
-      <Filter>math</Filter>
+    <ClCompile Include="easymesh\easymeshlua.cpp">
+      <Filter>easymesh</Filter>
     </ClCompile>
-    <ClCompile Include="mesh\mesh.cpp">
-      <Filter>mesh</Filter>
+    <ClCompile Include="easymesh\easymeshprimitive.cpp">
+      <Filter>easymesh</Filter>
+    </ClCompile>
+    <ClCompile Include="easymesh\easymeshrender.cpp">
+      <Filter>easymesh</Filter>
+    </ClCompile>
+    <ClCompile Include="easymesh\easymeshtransform.cpp">
+      <Filter>easymesh</Filter>
+    </ClCompile>
+    <ClCompile Include="engine\entity.cpp">
+      <Filter>engine</Filter>
+    </ClCompile>
+    <ClCompile Include="engine\tickable.cpp">
+      <Filter>engine</Filter>
+    </ClCompile>
+    <ClCompile Include="engine\ticker.cpp">
+      <Filter>engine</Filter>
+    </ClCompile>
+    <ClCompile Include="engine\world.cpp">
+      <Filter>engine</Filter>
+    </ClCompile>
+    <ClCompile Include="engine\worldentity.cpp">
+      <Filter>engine</Filter>
+    </ClCompile>
+    <ClCompile Include="emitter.cpp" />
+    <ClCompile Include="font.cpp" />
+    <ClCompile Include="gpu\framebuffer.cpp">
+      <Filter>gpu</Filter>
+    </ClCompile>
+    <ClCompile Include="gpu\indexbuffer.cpp">
+      <Filter>gpu</Filter>
+    </ClCompile>
+    <ClCompile Include="gpu\lolfx.cpp">
+      <Filter>gpu</Filter>
     </ClCompile>
     <ClCompile Include="gpu\rendercontext.cpp">
       <Filter>gpu</Filter>
@@ -159,9 +103,7 @@
     <ClCompile Include="gpu\vertexbuffer.cpp">
       <Filter>gpu</Filter>
     </ClCompile>
-    <ClCompile Include="application\application.cpp">
-      <Filter>application</Filter>
-    </ClCompile>
+    <ClCompile Include="gradient.cpp" />
     <ClCompile Include="image\codec\android-image.cpp">
       <Filter>image\codec</Filter>
     </ClCompile>
@@ -180,218 +122,158 @@
     <ClCompile Include="image\codec\sdl-image.cpp">
       <Filter>image\codec</Filter>
     </ClCompile>
-    <ClCompile Include="platform\xbox\xboxapp.cpp">
-      <Filter>platform\xbox</Filter>
-    </ClCompile>
-    <ClCompile Include="platform\xbox\xboxinput.cpp">
-      <Filter>platform\xbox</Filter>
+    <ClCompile Include="image\codec\zed-image.cpp">
+      <Filter>image\codec</Filter>
     </ClCompile>
-    <ClCompile Include="gpu\indexbuffer.cpp">
-      <Filter>gpu</Filter>
+    <ClCompile Include="image\codec\zed-palette-image.cpp">
+      <Filter>image\codec</Filter>
     </ClCompile>
-    <ClCompile Include="ui\input.cpp">
-      <Filter>ui</Filter>
+    <ClCompile Include="image\color\cie1931.cpp">
+      <Filter>image\color</Filter>
     </ClCompile>
-    <ClCompile Include="ui\d3d9-input.cpp">
-      <Filter>ui</Filter>
+    <ClCompile Include="image\color\color.cpp">
+      <Filter>image\color</Filter>
     </ClCompile>
-    <ClCompile Include="audio\audio.cpp">
-      <Filter>audio</Filter>
+    <ClCompile Include="image\filter\colors.cpp">
+      <Filter>image\filter</Filter>
     </ClCompile>
-    <ClCompile Include="audio\sample.cpp">
-      <Filter>audio</Filter>
+    <ClCompile Include="image\filter\convolution.cpp">
+      <Filter>image\filter</Filter>
     </ClCompile>
-    <ClCompile Include="camera.cpp">
-      <Filter>...</Filter>
+    <ClCompile Include="image\filter\dilate.cpp">
+      <Filter>image\filter</Filter>
     </ClCompile>
-    <ClCompile Include="application\egl-app.cpp">
-      <Filter>application</Filter>
+    <ClCompile Include="image\filter\median.cpp">
+      <Filter>image\filter</Filter>
     </ClCompile>
-    <ClCompile Include="emitter.cpp">
-      <Filter>...</Filter>
+    <ClCompile Include="image\filter\yuv.cpp">
+      <Filter>image\filter</Filter>
     </ClCompile>
-    <ClCompile Include="font.cpp">
-      <Filter>...</Filter>
+    <ClCompile Include="image\dither\dbs.cpp">
+      <Filter>image\dither</Filter>
     </ClCompile>
-    <ClCompile Include="gradient.cpp">
-      <Filter>...</Filter>
+    <ClCompile Include="image\dither\ediff.cpp">
+      <Filter>image\dither</Filter>
     </ClCompile>
-    <ClCompile Include="light.cpp">
-      <Filter>...</Filter>
+    <ClCompile Include="image\dither\ordered.cpp">
+      <Filter>image\dither</Filter>
     </ClCompile>
-    <ClCompile Include="platform.cpp">
-      <Filter>...</Filter>
+    <ClCompile Include="image\dither\ostromoukhov.cpp">
+      <Filter>image\dither</Filter>
     </ClCompile>
-    <ClCompile Include="profiler.cpp">
-      <Filter>...</Filter>
+    <ClCompile Include="image\dither\random.cpp">
+      <Filter>image\dither</Filter>
     </ClCompile>
-    <ClCompile Include="sprite.cpp">
-      <Filter>...</Filter>
+    <ClCompile Include="image\crop.cpp">
+      <Filter>image</Filter>
     </ClCompile>
-    <ClCompile Include="text.cpp">
-      <Filter>...</Filter>
+    <ClCompile Include="image\combine.cpp">
+      <Filter>image</Filter>
     </ClCompile>
-    <ClCompile Include="gpu\framebuffer.cpp">
-      <Filter>gpu</Filter>
+    <ClCompile Include="image\image.cpp">
+      <Filter>image</Filter>
     </ClCompile>
-    <ClCompile Include="easymesh\easymesh.cpp">
-      <Filter>easymesh</Filter>
+    <ClCompile Include="image\kernel.cpp">
+      <Filter>image</Filter>
     </ClCompile>
-    <ClCompile Include="gpu\lolfx.cpp">
-      <Filter>gpu</Filter>
+    <ClCompile Include="image\movie.cpp">
+      <Filter>image</Filter>
     </ClCompile>
-    <ClCompile Include="base\assert.cpp">
-      <Filter>base</Filter>
+    <ClCompile Include="image\noise.cpp">
+      <Filter>image</Filter>
     </ClCompile>
-    <ClCompile Include="base\string.cpp">
-      <Filter>base</Filter>
+    <ClCompile Include="image\pixel.cpp">
+      <Filter>image</Filter>
     </ClCompile>
-    <ClCompile Include="image\color\cie1931.cpp">
-      <Filter>image\color</Filter>
+    <ClCompile Include="image\resample.cpp">
+      <Filter>image</Filter>
     </ClCompile>
-    <ClCompile Include="image\color\color.cpp">
-      <Filter>image\color</Filter>
+    <ClCompile Include="image\resource.cpp">
+      <Filter>image</Filter>
     </ClCompile>
-    <ClCompile Include="image\combine.cpp">
-      <Filter>image</Filter>
+    <ClCompile Include="light.cpp" />
+    <ClCompile Include="lolua\baselua.cpp">
+      <Filter>lolua</Filter>
     </ClCompile>
     <ClCompile Include="math\geometry.cpp">
       <Filter>math</Filter>
     </ClCompile>
-    <ClCompile Include="easymesh\csgbsp.cpp">
-      <Filter>easymesh</Filter>
+    <ClCompile Include="math\half.cpp">
+      <Filter>math</Filter>
     </ClCompile>
-    <ClCompile Include="sys\hacks.cpp">
-      <Filter>sys</Filter>
+    <ClCompile Include="math\matrix.cpp">
+      <Filter>math</Filter>
     </ClCompile>
-    <ClCompile Include="sys\init.cpp">
-      <Filter>sys</Filter>
+    <ClCompile Include="math\real.cpp">
+      <Filter>math</Filter>
     </ClCompile>
+    <ClCompile Include="math\transform.cpp">
+      <Filter>math</Filter>
+    </ClCompile>
+    <ClCompile Include="math\vector.cpp">
+      <Filter>math</Filter>
+    </ClCompile>
+    <ClCompile Include="mesh\mesh.cpp">
+      <Filter>mesh</Filter>
+    </ClCompile>
+    <ClCompile Include="mesh\primitivemesh.cpp">
+      <Filter>mesh</Filter>
+    </ClCompile>
+    <ClCompile Include="messageservice.cpp" />
+    <ClCompile Include="platform.cpp" />
+    <ClCompile Include="profiler.cpp" />
+    <ClCompile Include="scene.cpp" />
+    <ClCompile Include="sprite.cpp" />
     <ClCompile Include="sys\file.cpp">
       <Filter>sys</Filter>
     </ClCompile>
     <ClCompile Include="sys\getopt.cpp">
       <Filter>sys</Filter>
     </ClCompile>
-    <ClCompile Include="base\log.cpp">
-      <Filter>base</Filter>
+    <ClCompile Include="sys\hacks.cpp">
+      <Filter>sys</Filter>
     </ClCompile>
-    <ClCompile Include="debug\lines.cpp">
-      <Filter>debug</Filter>
+    <ClCompile Include="sys\init.cpp">
+      <Filter>sys</Filter>
     </ClCompile>
+    <ClCompile Include="text.cpp" />
+    <ClCompile Include="textureimage.cpp" />
+    <ClCompile Include="tileset.cpp" />
     <ClCompile Include="ui\controller.cpp">
       <Filter>ui</Filter>
     </ClCompile>
-    <ClCompile Include="MessageService.cpp">
-      <Filter>...</Filter>
-    </ClCompile>
-    <ClCompile Include="easymesh\easymeshrender.cpp">
-      <Filter>easymesh</Filter>
-    </ClCompile>
-    <ClCompile Include="easymesh\easymeshbuild.cpp">
-      <Filter>easymesh</Filter>
-    </ClCompile>
-    <ClCompile Include="image\codec\zed-image.cpp">
-      <Filter>image\codec</Filter>
-    </ClCompile>
-    <ClCompile Include="image\codec\zed-palette-image.cpp">
-      <Filter>image\codec</Filter>
-    </ClCompile>
-    <ClCompile Include="image\filter\colors.cpp">
-      <Filter>image\filter</Filter>
-    </ClCompile>
-    <ClCompile Include="image\filter\convolution.cpp">
-      <Filter>image\filter</Filter>
-    </ClCompile>
-    <ClCompile Include="image\filter\dilate.cpp">
-      <Filter>image\filter</Filter>
-    </ClCompile>
-    <ClCompile Include="image\filter\median.cpp">
-      <Filter>image\filter</Filter>
-    </ClCompile>
-    <ClCompile Include="image\filter\yuv.cpp">
-      <Filter>image\filter</Filter>
-    </ClCompile>
-    <ClCompile Include="image\dither\dbs.cpp">
-      <Filter>image\dither</Filter>
-    </ClCompile>
-    <ClCompile Include="image\dither\ediff.cpp">
-      <Filter>image\dither</Filter>
-    </ClCompile>
-    <ClCompile Include="image\dither\ordered.cpp">
-      <Filter>image\dither</Filter>
-    </ClCompile>
-    <ClCompile Include="image\dither\ostromoukhov.cpp">
-      <Filter>image\dither</Filter>
-    </ClCompile>
-    <ClCompile Include="image\dither\random.cpp">
-      <Filter>image\dither</Filter>
-    </ClCompile>
-    <ClCompile Include="image\noise.cpp">
-      <Filter>image</Filter>
-    </ClCompile>
-    <ClCompile Include="image\resample.cpp">
-      <Filter>image</Filter>
-    </ClCompile>
-    <ClCompile Include="image\pixel.cpp">
-      <Filter>image</Filter>
-    </ClCompile>
-    <ClCompile Include="easymesh\easymeshprimitive.cpp">
-      <Filter>easymesh</Filter>
-    </ClCompile>
-    <ClCompile Include="easymesh\easymeshtransform.cpp">
-      <Filter>easymesh</Filter>
-    </ClCompile>
-    <ClCompile Include="easymesh\easymeshcsg.cpp">
-      <Filter>easymesh</Filter>
-    </ClCompile>
-    <ClCompile Include="easymesh\easymeshinternal.cpp">
-      <Filter>easymesh</Filter>
-    </ClCompile>
-    <ClCompile Include="easymesh\easymeshcursor.cpp">
-      <Filter>easymesh</Filter>
-    </ClCompile>
-    <ClCompile Include="easymesh\easymeshlua.cpp">
-      <Filter>easymesh</Filter>
-    </ClCompile>
-    <ClCompile Include="lolua\baselua.cpp">
-      <Filter>lolua</Filter>
-    </ClCompile>
-    <ClCompile Include="tileset.cpp">
-      <Filter>tileset</Filter>
-    </ClCompile>
-    <ClCompile Include="engine\entity.cpp">
-      <Filter>engine</Filter>
-    </ClCompile>
-    <ClCompile Include="engine\tickable.cpp">
-      <Filter>engine</Filter>
-    </ClCompile>
-    <ClCompile Include="engine\ticker.cpp">
-      <Filter>engine</Filter>
-    </ClCompile>
-    <ClCompile Include="engine\world.cpp">
-      <Filter>engine</Filter>
-    </ClCompile>
-    <ClCompile Include="engine\worldentity.cpp">
-      <Filter>engine</Filter>
-    </ClCompile>
-    <ClCompile Include="textureimage.cpp">
-      <Filter>tileset</Filter>
+    <ClCompile Include="ui\d3d9-input.cpp">
+      <Filter>ui</Filter>
     </ClCompile>
     <ClCompile Include="ui\gui.cpp">
       <Filter>ui</Filter>
     </ClCompile>
-    <ClCompile Include="mesh\primitivemesh.cpp">
-      <Filter>mesh</Filter>
-    </ClCompile>
-    <ClCompile Include="video.cpp">
-      <Filter>display</Filter>
+    <ClCompile Include="ui\input.cpp">
+      <Filter>ui</Filter>
     </ClCompile>
-    <ClCompile Include="scene.cpp">
-      <Filter>display</Filter>
+    <ClCompile Include="ui\sdl-input.cpp">
+      <Filter>ui</Filter>
     </ClCompile>
+    <ClCompile Include="video.cpp" />
+    <ClCompile Include="3rdparty\imgui\imgui.cpp" />
+    <ClCompile Include="3rdparty\imgui\imgui_demo.cpp" />
+    <ClCompile Include="3rdparty\imgui\imgui_draw.cpp" />
+    <ClCompile Include="3rdparty\imgui\imgui_widgets.cpp" />
+    <ClCompile Include="audio\audio.cpp" />
+    <ClCompile Include="audio\sample.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="application\application.h">
+      <Filter>application</Filter>
+    </ClInclude>
+    <ClInclude Include="application\egl-app.h">
+      <Filter>application</Filter>
+    </ClInclude>
+    <ClInclude Include="application\sdl-app.h">
+      <Filter>application</Filter>
+    </ClInclude>
+    <ClInclude Include="camera.h" />
+    <ClInclude Include="commandstack.h" />
     <ClInclude Include="debug\fps.h">
       <Filter>debug</Filter>
     </ClInclude>
@@ -401,62 +283,98 @@
     <ClInclude Include="debug\stats.h">
       <Filter>debug</Filter>
     </ClInclude>
-    <ClInclude Include="ui\sdl-input.h">
-      <Filter>ui</Filter>
+    <ClInclude Include="easymesh\csgbsp.h">
+      <Filter>easymesh</Filter>
     </ClInclude>
-    <ClInclude Include="application\sdl-app.h">
-      <Filter>application</Filter>
+    <ClInclude Include="easymesh\easymesh.h">
+      <Filter>easymesh</Filter>
     </ClInclude>
-    <ClInclude Include="lol\algorithm\all.h">
+    <ClInclude Include="easymesh\easymeshbuild.h">
+      <Filter>easymesh</Filter>
+    </ClInclude>
+    <ClInclude Include="easymesh\easymeshlua.h">
+      <Filter>easymesh</Filter>
+    </ClInclude>
+    <ClInclude Include="easymesh\easymeshrender.h">
+      <Filter>easymesh</Filter>
+    </ClInclude>
+    <ClInclude Include="emitter.h" />
+    <ClInclude Include="engine\entity.h">
+      <Filter>engine</Filter>
+    </ClInclude>
+    <ClInclude Include="engine\ticker.h">
+      <Filter>engine</Filter>
+    </ClInclude>
+    <ClInclude Include="engine\worldentity.h">
+      <Filter>engine</Filter>
+    </ClInclude>
+    <ClInclude Include="engine\world.h">
+      <Filter>engine</Filter>
+    </ClInclude>
+    <ClInclude Include="font.h" />
+    <ClInclude Include="gradient.h" />
+    <ClInclude Include="image\image-private.h">
+      <Filter>image</Filter>
+    </ClInclude>
+    <ClInclude Include="image\resource-private.h">
+      <Filter>image</Filter>
+    </ClInclude>
+    <ClInclude Include="light.h" />
+    <ClInclude Include="loldebug.h" />
+    <ClInclude Include="lolgl.h" />
+    <ClInclude Include="lolua\baselua.h">
+      <Filter>lolua</Filter>
+    </ClInclude>
+    <ClInclude Include="lol\algorithm\aabb_tree.h">
       <Filter>lol\algorithm</Filter>
     </ClInclude>
-    <ClInclude Include="lol\algorithm\sort.h">
+    <ClInclude Include="lol\algorithm\all.h">
       <Filter>lol\algorithm</Filter>
     </ClInclude>
-    <ClInclude Include="lol\image\color.h">
-      <Filter>lol\image</Filter>
+    <ClInclude Include="lol\algorithm\portal.h">
+      <Filter>lol\algorithm</Filter>
     </ClInclude>
-    <ClInclude Include="lol\math\half.h">
-      <Filter>lol\math</Filter>
+    <ClInclude Include="lol\algorithm\sort.h">
+      <Filter>lol\algorithm</Filter>
     </ClInclude>
-    <ClInclude Include="lol\math\all.h">
-      <Filter>lol\math</Filter>
+    <ClInclude Include="lol\base\array.h">
+      <Filter>lol\base</Filter>
     </ClInclude>
-    <ClInclude Include="lol\math\bigint.h">
-      <Filter>lol\math</Filter>
+    <ClInclude Include="lol\base\assert.h">
+      <Filter>lol\base</Filter>
     </ClInclude>
-    <ClInclude Include="lol\math\matrix.h">
-      <Filter>lol\math</Filter>
+    <ClInclude Include="lol\base\enum.h">
+      <Filter>lol\base</Filter>
     </ClInclude>
-    <ClInclude Include="lol\math\noise\gradient.h">
-      <Filter>lol\math\noise</Filter>
+    <ClInclude Include="lol\base\features.h">
+      <Filter>lol\base</Filter>
     </ClInclude>
-    <ClInclude Include="lol\math\noise\perlin.h">
-      <Filter>lol\math\noise</Filter>
+    <ClInclude Include="lol\base\log.h">
+      <Filter>lol\base</Filter>
     </ClInclude>
-    <ClInclude Include="lol\math\noise\simplex.h">
-      <Filter>lol\math\noise</Filter>
+    <ClInclude Include="lol\base\map.h">
+      <Filter>lol\base</Filter>
     </ClInclude>
-    <ClInclude Include="lol\math\ops.h">
-      <Filter>lol\math</Filter>
+    <ClInclude Include="lol\base\string.h">
+      <Filter>lol\base</Filter>
     </ClInclude>
-    <ClInclude Include="lol\math\polynomial.h">
-      <Filter>lol\math</Filter>
+    <ClInclude Include="lol\base\types.h">
+      <Filter>lol\base</Filter>
     </ClInclude>
-    <ClInclude Include="lol\math\rand.h">
-      <Filter>lol\math</Filter>
+    <ClInclude Include="lol\base\tuple.h">
+      <Filter>lol\base</Filter>
     </ClInclude>
-    <ClInclude Include="lol\math\real.h">
-      <Filter>lol\math</Filter>
+    <ClInclude Include="lol\debug\all.h">
+      <Filter>lol\debug</Filter>
     </ClInclude>
-    <ClInclude Include="lol\math\remez.h">
-      <Filter>lol\math</Filter>
+    <ClInclude Include="lol\debug\lines.h">
+      <Filter>lol\debug</Filter>
     </ClInclude>
-    <ClInclude Include="lol\math\transform.h">
-      <Filter>lol\math</Filter>
+    <ClInclude Include="lol\engine\all.h">
+      <Filter>lol\engine</Filter>
     </ClInclude>
-    <ClInclude Include="lol\math\vector.h">
-      <Filter>lol\math</Filter>
+    <ClInclude Include="lol\engine\tickable.h">
+      <Filter>lol\engine</Filter>
     </ClInclude>
     <ClInclude Include="lol\engine.h">
       <Filter>lol</Filter>
@@ -467,303 +385,180 @@
     <ClInclude Include="lol\extras.h">
       <Filter>lol</Filter>
     </ClInclude>
-    <ClInclude Include="lol\lua.h">
-      <Filter>lol</Filter>
+    <ClInclude Include="lol\gpu\all.h">
+      <Filter>lol\gpu</Filter>
     </ClInclude>
-    <ClInclude Include="lol\public.h">
-      <Filter>lol</Filter>
+    <ClInclude Include="lol\gpu\framebuffer.h">
+      <Filter>lol\gpu</Filter>
     </ClInclude>
-    <ClInclude Include="lol\unit.h">
-      <Filter>lol</Filter>
+    <ClInclude Include="lol\gpu\indexbuffer.h">
+      <Filter>lol\gpu</Filter>
     </ClInclude>
-    <ClInclude Include="mesh\mesh.h">
-      <Filter>mesh</Filter>
-    </ClInclude>
-    <ClInclude Include="application\application.h">
-      <Filter>application</Filter>
-    </ClInclude>
-    <ClInclude Include="image\image-private.h">
-      <Filter>image</Filter>
-    </ClInclude>
-    <ClInclude Include="platform\xbox\xboxapp.h">
-      <Filter>platform\xbox</Filter>
-    </ClInclude>
-    <ClInclude Include="platform\xbox\xboxinput.h">
-      <Filter>platform\xbox</Filter>
-    </ClInclude>
-    <ClInclude Include="ui\input.h">
-      <Filter>ui</Filter>
-    </ClInclude>
-    <ClInclude Include="ui\d3d9-input.h">
-      <Filter>ui</Filter>
-    </ClInclude>
-    <ClInclude Include="camera.h">
-      <Filter>...</Filter>
-    </ClInclude>
-    <ClInclude Include="application\egl-app.h">
-      <Filter>application</Filter>
-    </ClInclude>
-    <ClInclude Include="emitter.h">
-      <Filter>...</Filter>
-    </ClInclude>
-    <ClInclude Include="font.h">
-      <Filter>...</Filter>
-    </ClInclude>
-    <ClInclude Include="gradient.h">
-      <Filter>...</Filter>
-    </ClInclude>
-    <ClInclude Include="light.h">
-      <Filter>...</Filter>
+    <ClInclude Include="lol\gpu\lolfx.h">
+      <Filter>lol\gpu</Filter>
     </ClInclude>
-    <ClInclude Include="loldebug.h">
-      <Filter>...</Filter>
+    <ClInclude Include="lol\gpu\rendercontext.h">
+      <Filter>lol\gpu</Filter>
     </ClInclude>
-    <ClInclude Include="lolgl.h">
-      <Filter>...</Filter>
+    <ClInclude Include="lol\gpu\renderer.h">
+      <Filter>lol\gpu</Filter>
     </ClInclude>
-    <ClInclude Include="numeric.h">
-      <Filter>...</Filter>
+    <ClInclude Include="lol\gpu\shader.h">
+      <Filter>lol\gpu</Filter>
     </ClInclude>
-    <ClInclude Include="platform.h">
-      <Filter>...</Filter>
+    <ClInclude Include="lol\gpu\texture.h">
+      <Filter>lol\gpu</Filter>
     </ClInclude>
-    <ClInclude Include="profiler.h">
-      <Filter>...</Filter>
+    <ClInclude Include="lol\gpu\vertexbuffer.h">
+      <Filter>lol\gpu</Filter>
     </ClInclude>
-    <ClInclude Include="simd.h">
-      <Filter>...</Filter>
+    <ClInclude Include="lol\image\all.h">
+      <Filter>lol\image</Filter>
     </ClInclude>
-    <ClInclude Include="sprite.h">
-      <Filter>...</Filter>
+    <ClInclude Include="lol\image\color.h">
+      <Filter>lol\image</Filter>
     </ClInclude>
-    <ClInclude Include="text.h">
-      <Filter>...</Filter>
+    <ClInclude Include="lol\image\image.h">
+      <Filter>lol\image</Filter>
     </ClInclude>
-    <ClInclude Include="engine\world.h">
-      <Filter>...</Filter>
+    <ClInclude Include="lol\image\movie.h">
+      <Filter>lol\image</Filter>
     </ClInclude>
-    <ClInclude Include="easymesh\easymesh.h">
-      <Filter>easymesh</Filter>
+    <ClInclude Include="lol\image\pixel.h">
+      <Filter>lol\image</Filter>
     </ClInclude>
-    <ClInclude Include="lol\audio\all.h">
-      <Filter>lol\audio</Filter>
+    <ClInclude Include="lol\image\resource.h">
+      <Filter>lol\image</Filter>
     </ClInclude>
-    <ClInclude Include="lol\audio\audio.h">
-      <Filter>lol\audio</Filter>
+    <ClInclude Include="lol\lua.h">
+      <Filter>lol</Filter>
     </ClInclude>
-    <ClInclude Include="lol\audio\sample.h">
-      <Filter>lol\audio</Filter>
+    <ClInclude Include="lol\math\arraynd.h">
+      <Filter>lol\math</Filter>
     </ClInclude>
-    <ClInclude Include="lol\base\array.h">
-      <Filter>lol\base</Filter>
+    <ClInclude Include="lol\math\bigint.h">
+      <Filter>lol\math</Filter>
     </ClInclude>
-    <ClInclude Include="lol\base\assert.h">
-      <Filter>lol\base</Filter>
+    <ClInclude Include="lol\math\constants.h">
+      <Filter>lol\math</Filter>
     </ClInclude>
-    <ClInclude Include="lol\base\enum.h">
-      <Filter>lol\base</Filter>
+    <ClInclude Include="lol\math\functions.h">
+      <Filter>lol\math</Filter>
     </ClInclude>
-    <ClInclude Include="lol\base\features.h">
-      <Filter>lol\base</Filter>
+    <ClInclude Include="lol\math\geometry.h">
+      <Filter>lol\math</Filter>
     </ClInclude>
-    <ClInclude Include="lol\base\map.h">
-      <Filter>lol\base</Filter>
+    <ClInclude Include="lol\math\half.h">
+      <Filter>lol\math</Filter>
     </ClInclude>
-    <ClInclude Include="lol\base\string.h">
-      <Filter>lol\base</Filter>
+    <ClInclude Include="lol\math\interp.h">
+      <Filter>lol\math</Filter>
     </ClInclude>
-    <ClInclude Include="lol\base\types.h">
-      <Filter>lol\base</Filter>
+    <ClInclude Include="lol\math\matrix.h">
+      <Filter>lol\math</Filter>
     </ClInclude>
-    <ClInclude Include="lol\base\tuple.h">
-      <Filter>lol\base</Filter>
+    <ClInclude Include="lol\math\noise\gradient.h">
+      <Filter>lol\math\noise</Filter>
     </ClInclude>
-    <ClInclude Include="lol\math\array2d.h">
-      <Filter>lol\base</Filter>
+    <ClInclude Include="lol\math\noise\perlin.h">
+      <Filter>lol\math\noise</Filter>
     </ClInclude>
-    <ClInclude Include="lol\math\array3d.h">
-      <Filter>lol\base</Filter>
+    <ClInclude Include="lol\math\noise\simplex.h">
+      <Filter>lol\math\noise</Filter>
     </ClInclude>
-    <ClInclude Include="lol\math\geometry.h">
+    <ClInclude Include="lol\math\ops.h">
       <Filter>lol\math</Filter>
     </ClInclude>
-    <ClInclude Include="lol\math\interp.h">
+    <ClInclude Include="lol\math\polynomial.h">
       <Filter>lol\math</Filter>
     </ClInclude>
-    <ClInclude Include="easymesh\csgbsp.h">
-      <Filter>easymesh</Filter>
-    </ClInclude>
-    <ClInclude Include="lol\base\all.h">
-      <Filter>lol\base</Filter>
+    <ClInclude Include="lol\math\rand.h">
+      <Filter>lol\math</Filter>
     </ClInclude>
-    <ClInclude Include="lol\math\constants.h">
+    <ClInclude Include="lol\math\real.h">
       <Filter>lol\math</Filter>
     </ClInclude>
-    <ClInclude Include="lol\math\functions.h">
+    <ClInclude Include="lol\math\transform.h">
       <Filter>lol\math</Filter>
     </ClInclude>
-    <ClInclude Include="lol\math\functions.h">
+    <ClInclude Include="lol\math\vector.h">
       <Filter>lol\math</Filter>
     </ClInclude>
+    <ClInclude Include="lol\public.h">
+      <Filter>lol</Filter>
+    </ClInclude>
+    <ClInclude Include="lol\sys\all.h">
+      <Filter>lol\sys</Filter>
+    </ClInclude>
     <ClInclude Include="lol\sys\file.h">
       <Filter>lol\sys</Filter>
     </ClInclude>
     <ClInclude Include="lol\sys\getopt.h">
       <Filter>lol\sys</Filter>
     </ClInclude>
-    <ClInclude Include="lol\gpu\framebuffer.h">
-      <Filter>lol\gpu</Filter>
-    </ClInclude>
-    <ClInclude Include="lol\gpu\indexbuffer.h">
-      <Filter>lol\gpu</Filter>
-    </ClInclude>
-    <ClInclude Include="lol\image\all.h">
-      <Filter>lol\image</Filter>
-    </ClInclude>
-    <ClInclude Include="lol\gpu\all.h">
-      <Filter>lol\gpu</Filter>
-    </ClInclude>
     <ClInclude Include="lol\sys\init.h">
       <Filter>lol\sys</Filter>
     </ClInclude>
-    <ClInclude Include="lol\base\log.h">
-      <Filter>lol\base</Filter>
-    </ClInclude>
-    <ClInclude Include="lol\gpu\rendercontext.h">
-      <Filter>lol\gpu</Filter>
-    </ClInclude>
-    <ClInclude Include="lol\gpu\renderer.h">
-      <Filter>lol\gpu</Filter>
-    </ClInclude>
-    <ClInclude Include="lol\gpu\shader.h">
-      <Filter>lol\gpu</Filter>
-    </ClInclude>
     <ClInclude Include="lol\sys\thread.h">
       <Filter>lol\sys</Filter>
     </ClInclude>
-    <ClInclude Include="lol\gpu\texture.h">
-      <Filter>lol\gpu</Filter>
-    </ClInclude>
     <ClInclude Include="lol\sys\timer.h">
       <Filter>lol\sys</Filter>
     </ClInclude>
-    <ClInclude Include="lol\gpu\vertexbuffer.h">
-      <Filter>lol\gpu</Filter>
-    </ClInclude>
-    <ClInclude Include="lol\sys\all.h">
-      <Filter>lol\sys</Filter>
-    </ClInclude>
-    <ClInclude Include="lol\gpu\lolfx.h">
-      <Filter>lol\gpu</Filter>
-    </ClInclude>
-    <ClInclude Include="lol\debug\all.h">
-      <Filter>lol\debug</Filter>
-    </ClInclude>
-    <ClInclude Include="lol\debug\lines.h">
-      <Filter>lol\debug</Filter>
+    <ClInclude Include="mesh\mesh.h">
+      <Filter>mesh</Filter>
     </ClInclude>
-    <ClInclude Include="lol\engine\all.h">
-      <Filter>lol\engine</Filter>
+    <ClInclude Include="mesh\primitivemesh.h">
+      <Filter>mesh</Filter>
     </ClInclude>
-    <ClInclude Include="lol\engine\tickable.h">
-      <Filter>lol\engine</Filter>
+    <ClInclude Include="messageservice.h" />
+    <ClInclude Include="numeric.h" />
+    <ClInclude Include="platform.h" />
+    <ClInclude Include="profiler.h" />
+    <ClInclude Include="scene.h" />
+    <ClInclude Include="sprite.h" />
+    <ClInclude Include="text.h" />
+    <ClInclude Include="textureimage-private.h" />
+    <ClInclude Include="textureimage.h" />
+    <ClInclude Include="tileset.h" />
+    <ClInclude Include="ui\controller.h">
+      <Filter>ui</Filter>
     </ClInclude>
-    <ClInclude Include="lol\image\image.h">
-      <Filter>lol\image</Filter>
+    <ClInclude Include="ui\d3d9-input.h">
+      <Filter>ui</Filter>
     </ClInclude>
-    <ClInclude Include="lol\image\pixel.h">
-      <Filter>lol\image</Filter>
+    <ClInclude Include="ui\gui.h">
+      <Filter>ui</Filter>
     </ClInclude>
-    <ClInclude Include="lol\image\movie.h">
-      <Filter>lol\image</Filter>
+    <ClInclude Include="ui\input.h">
+      <Filter>ui</Filter>
     </ClInclude>
     <ClInclude Include="ui\keys.inc">
       <Filter>ui</Filter>
     </ClInclude>
-    <ClInclude Include="ui\controller.h">
+    <ClInclude Include="ui\sdl-input.h">
       <Filter>ui</Filter>
     </ClInclude>
-    <ClInclude Include="utils.h">
-      <Filter>...</Filter>
-    </ClInclude>
-    <ClInclude Include="messageservice.h">
-      <Filter>...</Filter>
-    </ClInclude>
-    <ClInclude Include="easymesh\easymeshrender.h">
-      <Filter>easymesh</Filter>
-    </ClInclude>
-    <ClInclude Include="commandstack.h" />
-    <ClInclude Include="easymesh\easymeshbuild.h">
-      <Filter>easymesh</Filter>
-    </ClInclude>
-    <ClInclude Include="lol\algorithm\aabb_tree.h">
-      <Filter>lol\algorithm</Filter>
-    </ClInclude>
-    <ClInclude Include="lol\algorithm\portal.h">
-      <Filter>lol\algorithm</Filter>
-    </ClInclude>
-    <ClInclude Include="easymesh\easymeshlua.h">
-      <Filter>easymesh</Filter>
-    </ClInclude>
-    <ClInclude Include="lolua\baselua.h">
-      <Filter>lolua</Filter>
-    </ClInclude>
-    <ClInclude Include="tileset.h">
-      <Filter>tileset</Filter>
-    </ClInclude>
-    <ClInclude Include="engine\entity.h">
-      <Filter>engine</Filter>
-    </ClInclude>
-    <ClInclude Include="engine\ticker.h">
-      <Filter>engine</Filter>
-    </ClInclude>
-    <ClInclude Include="engine\world.h">
-      <Filter>engine</Filter>
-    </ClInclude>
-    <ClInclude Include="engine\worldentity.h">
-      <Filter>engine</Filter>
-    </ClInclude>
-    <ClInclude Include="textureimage.h">
-      <Filter>tileset</Filter>
-    </ClInclude>
-    <ClInclude Include="textureimage-private.h">
-      <Filter>tileset</Filter>
-    </ClInclude>
-    <ClInclude Include="ui\gui.h">
-      <Filter>ui</Filter>
+    <ClInclude Include="utils.h" />
+    <ClInclude Include="video.h" />
+    <ClInclude Include="lol\math\all.h">
+      <Filter>lol\math</Filter>
     </ClInclude>
-    <ClInclude Include="mesh\primitivemesh.h">
-      <Filter>mesh</Filter>
+    <ClInclude Include="lol\base\all.h">
+      <Filter>lol\base</Filter>
     </ClInclude>
-    <ClInclude Include="video.h">
-      <Filter>display</Filter>
+    <ClInclude Include="lol\audio\sample.h" />
+    <ClInclude Include="lol\audio\all.h">
+      <Filter>lol\audio</Filter>
     </ClInclude>
-    <ClInclude Include="scene.h">
-      <Filter>display</Filter>
+    <ClInclude Include="lol\audio\audio.h">
+      <Filter>lol\audio</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <LolFxCompile Include="gpu\empty-material.lolfx">
-      <Filter>gpu</Filter>
-    </LolFxCompile>
-    <LolFxCompile Include="gpu\default-material.lolfx">
-      <Filter>gpu</Filter>
-    </LolFxCompile>
-    <LolFxCompile Include="gpu\test-material.lolfx">
-      <Filter>gpu</Filter>
-    </LolFxCompile>
     <LolFxCompile Include="easymesh\shiny.lolfx">
       <Filter>easymesh</Filter>
     </LolFxCompile>
-    <LolFxCompile Include="gradient.lolfx">
-      <Filter>...</Filter>
-    </LolFxCompile>
-    <LolFxCompile Include="gpu\line.lolfx">
-      <Filter>...</Filter>
-    </LolFxCompile>
-    <LolFxCompile Include="easymesh\shiny_SK.lolfx">
-      <Filter>easymesh</Filter>
-    </LolFxCompile>
     <LolFxCompile Include="easymesh\shinydebuglighting.lolfx">
       <Filter>easymesh</Filter>
     </LolFxCompile>
@@ -779,14 +574,190 @@
     <LolFxCompile Include="easymesh\shinyflat.lolfx">
       <Filter>easymesh</Filter>
     </LolFxCompile>
+    <LolFxCompile Include="easymesh\shiny_SK.lolfx">
+      <Filter>easymesh</Filter>
+    </LolFxCompile>
+    <LolFxCompile Include="gpu\blit.lolfx">
+      <Filter>gpu</Filter>
+    </LolFxCompile>
+    <LolFxCompile Include="gpu\default-material.lolfx">
+      <Filter>gpu</Filter>
+    </LolFxCompile>
+    <LolFxCompile Include="gpu\empty-material.lolfx">
+      <Filter>gpu</Filter>
+    </LolFxCompile>
+    <LolFxCompile Include="gpu\line.lolfx">
+      <Filter>gpu</Filter>
+    </LolFxCompile>
     <LolFxCompile Include="gpu\palette.lolfx">
-      <Filter>...</Filter>
+      <Filter>gpu</Filter>
+    </LolFxCompile>
+    <LolFxCompile Include="gpu\postprocess.lolfx">
+      <Filter>gpu</Filter>
+    </LolFxCompile>
+    <LolFxCompile Include="gpu\test-material.lolfx">
+      <Filter>gpu</Filter>
     </LolFxCompile>
     <LolFxCompile Include="gpu\tile.lolfx">
-      <Filter>tileset</Filter>
+      <Filter>gpu</Filter>
     </LolFxCompile>
+    <LolFxCompile Include="gradient.lolfx" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Makefile.am" />
   </ItemGroup>
-</Project>
+  <ItemGroup>
+    <Filter Include="...">
+      <UniqueIdentifier>{3592ed6a-59d7-4a6d-be5a-c05cb5dab730}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="application">
+      <UniqueIdentifier>{459e2b92-4e46-4f07-89f7-62b55c7a2797}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="debug">
+      <UniqueIdentifier>{e056731c-5484-434a-965e-801c199c0366}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="easymesh">
+      <UniqueIdentifier>{07117029-d79d-4d59-beec-691b00a97c8f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="external">
+      <UniqueIdentifier>{1079c1f3-b1f5-48c8-8196-3a8a1819f5b4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="gpu">
+      <UniqueIdentifier>{ec9b94fc-c716-4ef2-9c3b-c7f3447574b0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="image">
+      <UniqueIdentifier>{940329fb-d054-433a-ae30-b7f409790554}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="image\codec">
+      <UniqueIdentifier>{123803f1-1722-4421-8245-098667654cda}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="ui">
+      <UniqueIdentifier>{94992c0e-ebc5-4185-b766-323b06547dcf}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lol">
+      <UniqueIdentifier>{0edcf1a5-3c9c-4425-918c-aa2cbebc51c1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lol\algorithm">
+      <UniqueIdentifier>{39f6f872-186f-48af-8e87-bcceb06b1b21}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lol\engine">
+      <UniqueIdentifier>{a20b47c1-a0f8-4a02-a7a8-6da2ccd8bb02}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lol\image">
+      <UniqueIdentifier>{f25b3187-b24c-469a-b038-5a968eaa83f6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lol\math">
+      <UniqueIdentifier>{1e0b7a4c-425f-4d4f-945e-ba2ac9386ce0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lol\math\noise">
+      <UniqueIdentifier>{97d023b5-9715-4f30-bacb-846d89025f5b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="math">
+      <UniqueIdentifier>{2caadbda-b9f1-446d-bbd2-55c959db342c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="mesh">
+      <UniqueIdentifier>{1eaa8df5-7a31-4358-a1e9-0e265de6ed49}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lol\base">
+      <UniqueIdentifier>{e17b998c-d494-480b-ae29-5d1564f73327}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="base">
+      <UniqueIdentifier>{606ea817-db84-40fe-be2e-8e5c864e39b2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="image\color">
+      <UniqueIdentifier>{73e4bc38-19e4-41d2-82e9-ebf22fa65f77}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lol\sys">
+      <UniqueIdentifier>{647eb922-e722-418a-91e9-9e2d53ff5a85}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lol\gpu">
+      <UniqueIdentifier>{514846bc-650a-4423-b35a-6ccb9a1f0edd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="sys">
+      <UniqueIdentifier>{1d945673-ee9a-48a7-9ee8-34338c5fefc1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lol\debug">
+      <UniqueIdentifier>{01285b11-c6c7-4a9e-8dee-daa2c63901e4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="platform">
+      <UniqueIdentifier>{a11c55f8-8e10-4270-be24-38e8d4fcf589}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="platform\sdl">
+      <UniqueIdentifier>{4089421f-2cc2-4036-a6b2-9df8a2f4efc8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="platform\xbox">
+      <UniqueIdentifier>{317cb5cc-5dcc-4e14-be90-40a125a2e2ec}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="image\dither">
+      <UniqueIdentifier>{63e63eea-c96e-4d37-81f6-f3f17e18b751}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="image\filter">
+      <UniqueIdentifier>{3f420a7d-0538-463a-925b-3f8968bf628e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lolua">
+      <UniqueIdentifier>{25cc0513-ad71-4fbe-bd24-acc88aa66833}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="tileset">
+      <UniqueIdentifier>{7fb4105d-4f17-4824-8d40-948553fdcde1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="engine">
+      <UniqueIdentifier>{3bd5fe6f-c9cd-45f3-98a9-958d86d415e8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="display">
+      <UniqueIdentifier>{869f0b25-469b-4b06-a2a2-325449fc868f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lol\audio">
+      <UniqueIdentifier>{1c612ab2-418c-4cd4-a266-82023c21b915}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <CopyFileToFolders Include="$(SdlMixerLibDir)\libFLAC-8.dll">
+      <Filter>external</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlImageLibDir)\libjpeg-9.dll">
+      <Filter>external</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlMixerLibDir)\libmodplug-1.dll">
+      <Filter>external</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlMixerLibDir)\libmpg123-0.dll">
+      <Filter>external</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlMixerLibDir)\libogg-0.dll">
+      <Filter>external</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlMixerLibDir)\libopus-0.dll">
+      <Filter>external</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlMixerLibDir)\libopusfile-0.dll">
+      <Filter>external</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlImageLibDir)\libpng16-16.dll">
+      <Filter>external</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlImageLibDir)\libtiff-5.dll">
+      <Filter>external</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlMixerLibDir)\libvorbis-0.dll">
+      <Filter>external</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlMixerLibDir)\libvorbisfile-3.dll">
+      <Filter>external</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlImageLibDir)\libwebp-7.dll">
+      <Filter>external</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlLibDir)\SDL2.dll">
+      <Filter>external</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlImageLibDir)\SDL2_image.dll">
+      <Filter>external</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlMixerLibDir)\SDL2_mixer.dll">
+      <Filter>external</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlImageLibDir)\zlib1.dll">
+      <Filter>external</Filter>
+    </CopyFileToFolders>
+  </ItemGroup>
+</Project>
\ No newline at end of file