From aca962d7ce3d404671cace2a82b04ff937375009 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Mon, 29 Oct 2018 08:27:51 +0800
Subject: =?UTF-8?q?*=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../examples/ParticleSystem/ParticleSystem.vcxproj |   2 +-
 build/vc++/jin.vcxproj                             |   2 +
 build/vc++/jin.vcxproj.filters                     |   9 +
 build/vc++/jin/jin.vcxproj                         |   2 +-
 build/vc++/libjin/libjin.vcxproj                   |  61 +++---
 build/vc++/libjin/libjin.vcxproj.filters           | 209 +++++++++++----------
 6 files changed, 150 insertions(+), 135 deletions(-)

(limited to 'build')

diff --git a/build/vc++/examples/ParticleSystem/ParticleSystem.vcxproj b/build/vc++/examples/ParticleSystem/ParticleSystem.vcxproj
index 3198c62..7c11e29 100644
--- a/build/vc++/examples/ParticleSystem/ParticleSystem.vcxproj
+++ b/build/vc++/examples/ParticleSystem/ParticleSystem.vcxproj
@@ -78,7 +78,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>D:\Jin\Jin\Jin\src\libjin;$(SolutionDir)libs\SDL2-2.0.5\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>D:\Documents\VisualStudio2017\Projects\Jin\jin\Jin\src\libjin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
diff --git a/build/vc++/jin.vcxproj b/build/vc++/jin.vcxproj
index 7bec5ae..39f6381 100644
--- a/build/vc++/jin.vcxproj
+++ b/build/vc++/jin.vcxproj
@@ -145,6 +145,8 @@
   <ItemGroup>
     <ClCompile Include="..\..\src\lua\common\je_lua_port.h" />
     <ClCompile Include="..\..\src\lua\jin.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\ai\je_lua_behavior_tree.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\ai\je_lua_statemachine.cpp" />
     <ClCompile Include="..\..\src\lua\modules\audio\je_lua_audio.cpp" />
     <ClCompile Include="..\..\src\lua\modules\audio\je_lua_source.cpp" />
     <ClCompile Include="..\..\src\lua\modules\bit\je_lua_bit.cpp" />
diff --git a/build/vc++/jin.vcxproj.filters b/build/vc++/jin.vcxproj.filters
index d6915c0..8c657d1 100644
--- a/build/vc++/jin.vcxproj.filters
+++ b/build/vc++/jin.vcxproj.filters
@@ -64,6 +64,9 @@
     <Filter Include="resource">
       <UniqueIdentifier>{579f12b8-5758-4be5-9cd7-e1fa62fdef74}</UniqueIdentifier>
     </Filter>
+    <Filter Include="source\modules\ai">
+      <UniqueIdentifier>{fc3fecf1-63e8-4d28-97a7-bf6a1817f57b}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\lua\jin.cpp">
@@ -153,6 +156,12 @@
     <ClCompile Include="..\..\src\lua\common\je_lua_port.h">
       <Filter>source\common</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\ai\je_lua_behavior_tree.cpp">
+      <Filter>source\modules\ai</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\ai\je_lua_statemachine.cpp">
+      <Filter>source\modules\ai</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource.h">
diff --git a/build/vc++/jin/jin.vcxproj b/build/vc++/jin/jin.vcxproj
index efc5188..b32eeb5 100644
--- a/build/vc++/jin/jin.vcxproj
+++ b/build/vc++/jin/jin.vcxproj
@@ -88,7 +88,7 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <SubSystem>Windows</SubSystem>
+      <SubSystem>Console</SubSystem>
       <AdditionalLibraryDirectories>
       </AdditionalLibraryDirectories>
       <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/build/vc++/libjin/libjin.vcxproj b/build/vc++/libjin/libjin.vcxproj
index e0672d7..e274b8f 100644
--- a/build/vc++/libjin/libjin.vcxproj
+++ b/build/vc++/libjin/libjin.vcxproj
@@ -131,6 +131,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\src\libjin\ai\je_ai.h" />
     <ClInclude Include="..\..\..\src\libjin\ai\je_behavior_tree.h" />
     <ClInclude Include="..\..\..\src\libjin\ai\je_state_machine.h" />
     <ClInclude Include="..\..\..\src\libjin\Audio\je_audio_manager.h" />
@@ -157,18 +158,18 @@
     <ClInclude Include="..\..\..\src\libjin\Game\je_application.h" />
     <ClInclude Include="..\..\..\src\libjin\Game\je_gameobject.h" />
     <ClInclude Include="..\..\..\src\libjin\game\je_scene.h" />
-    <ClInclude Include="..\..\..\src\libjin\graphics\animation\je_animator.h" />
-    <ClInclude Include="..\..\..\src\libjin\graphics\animation\je_animation.h" />
+    <ClInclude Include="..\..\..\src\libjin\graphics\animations\je_animation.h" />
+    <ClInclude Include="..\..\..\src\libjin\graphics\animations\je_animator.h" />
+    <ClInclude Include="..\..\..\src\libjin\graphics\fonts\je_decoder.h" />
+    <ClInclude Include="..\..\..\src\libjin\graphics\fonts\je_font.h" />
+    <ClInclude Include="..\..\..\src\libjin\graphics\fonts\je_page.h" />
+    <ClInclude Include="..\..\..\src\libjin\graphics\fonts\je_text.h" />
+    <ClInclude Include="..\..\..\src\libjin\graphics\fonts\je_texture_font.h" />
+    <ClInclude Include="..\..\..\src\libjin\graphics\fonts\je_ttf.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\je_bitmap.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\je_canvas.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\je_color.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\je_graphic.h" />
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Font\je_decoder.h" />
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Font\je_font.h" />
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Font\je_page.h" />
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Font\je_text.h" />
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Font\je_texture_font.h" />
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Font\je_ttf.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\je_graphics.h" />
     <ClInclude Include="..\..\..\src\libjin\graphics\je_graphic_manager.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\je_image.h" />
@@ -176,20 +177,20 @@
     <ClInclude Include="..\..\..\src\libjin\Graphics\je_gl.h" />
     <ClInclude Include="..\..\..\src\libjin\graphics\je_sprite_batch.h" />
     <ClInclude Include="..\..\..\src\libjin\graphics\je_sprite_sheet.h" />
-    <ClInclude Include="..\..\..\src\libjin\graphics\particle\je_particle.h" />
-    <ClInclude Include="..\..\..\src\libjin\Graphics\particle\je_particle_pool.h" />
-    <ClInclude Include="..\..\..\src\libjin\Graphics\particle\je_particle_emitter.h" />
-    <ClInclude Include="..\..\..\src\libjin\graphics\particle\je_particle_system.h" />
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\je_base.shader.h" />
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\je_shader.h" />
-    <ClInclude Include="..\..\..\src\libjin\graphics\shader\je_jsl_compiler.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\je_shapes.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\je_sprite.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\je_texture.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\je_window.h" />
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\shaders\je_default.shader.h" />
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\shaders\je_font.shader.h" />
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\shaders\je_texture.shader.h" />
+    <ClInclude Include="..\..\..\src\libjin\graphics\particles\je_particle.h" />
+    <ClInclude Include="..\..\..\src\libjin\graphics\particles\je_particle_emitter.h" />
+    <ClInclude Include="..\..\..\src\libjin\graphics\particles\je_particle_pool.h" />
+    <ClInclude Include="..\..\..\src\libjin\graphics\particles\je_particle_system.h" />
+    <ClInclude Include="..\..\..\src\libjin\graphics\shaders\built-in\je_default.shader.h" />
+    <ClInclude Include="..\..\..\src\libjin\graphics\shaders\built-in\je_font.shader.h" />
+    <ClInclude Include="..\..\..\src\libjin\graphics\shaders\built-in\je_texture.shader.h" />
+    <ClInclude Include="..\..\..\src\libjin\graphics\shaders\je_base.shader.h" />
+    <ClInclude Include="..\..\..\src\libjin\graphics\shaders\je_jsl_compiler.h" />
+    <ClInclude Include="..\..\..\src\libjin\graphics\shaders\je_shader.h" />
     <ClInclude Include="..\..\..\src\libjin\Input\je_event.h" />
     <ClInclude Include="..\..\..\src\libjin\Input\je_input.h" />
     <ClInclude Include="..\..\..\src\libjin\Input\je_joypad.h" />
@@ -232,32 +233,32 @@
     <ClCompile Include="..\..\..\src\libjin\Game\je_gameobject.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Game\je_application.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Game\je_scene.cpp" />
-    <ClCompile Include="..\..\..\src\libjin\graphics\animation\je_animator.cpp" />
-    <ClCompile Include="..\..\..\src\libjin\graphics\animation\je_animation.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\graphics\animations\je_animation.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\graphics\animations\je_animator.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\graphics\fonts\je_decoder.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\graphics\fonts\je_text.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\graphics\fonts\je_texture_font.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\graphics\fonts\je_ttf.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\je_bitmap.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\je_canvas.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\je_color.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\je_graphic.cpp" />
-    <ClCompile Include="..\..\..\src\libjin\Graphics\Font\je_decoder.cpp" />
-    <ClCompile Include="..\..\..\src\libjin\Graphics\Font\je_text.cpp" />
-    <ClCompile Include="..\..\..\src\libjin\Graphics\Font\je_texture_font.cpp" />
-    <ClCompile Include="..\..\..\src\libjin\Graphics\Font\je_ttf.cpp" />
     <ClCompile Include="..\..\..\src\libjin\graphics\je_graphic_manager.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\je_image.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\je_mesh.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\je_gl.cpp" />
     <ClCompile Include="..\..\..\src\libjin\graphics\je_sprite_batch.cpp" />
     <ClCompile Include="..\..\..\src\libjin\graphics\je_sprite_sheet.cpp" />
-    <ClCompile Include="..\..\..\src\libjin\graphics\particle\je_particle.cpp" />
-    <ClCompile Include="..\..\..\src\libjin\graphics\particle\je_particle_pool.cpp" />
-    <ClCompile Include="..\..\..\src\libjin\Graphics\particle\je_particle_emitter.cpp" />
-    <ClCompile Include="..\..\..\src\libjin\graphics\particle\je_particle_system.cpp" />
-    <ClCompile Include="..\..\..\src\libjin\Graphics\Shader\je_shader.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\je_shapes.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\je_sprite.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\je_texture.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\je_window.cpp" />
-    <ClCompile Include="..\..\..\src\libjin\graphics\shader\je_jsl_compiler.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\graphics\particles\je_particle.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\graphics\particles\je_particle_emitter.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\graphics\particles\je_particle_pool.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\graphics\particles\je_particle_system.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\graphics\shaders\je_jsl_compiler.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\graphics\shaders\je_shader.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Input\je_event.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Input\je_joypad.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Input\je_keyboard.cpp" />
diff --git a/build/vc++/libjin/libjin.vcxproj.filters b/build/vc++/libjin/libjin.vcxproj.filters
index 8ec97c1..cda52d7 100644
--- a/build/vc++/libjin/libjin.vcxproj.filters
+++ b/build/vc++/libjin/libjin.vcxproj.filters
@@ -22,18 +22,6 @@
     <Filter Include="source\graphics">
       <UniqueIdentifier>{bb6c372a-520b-4de3-ab14-64839a6166d9}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\graphics\font">
-      <UniqueIdentifier>{ce02dfa9-2afe-4295-b14f-c786d65456cd}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="source\graphics\shader">
-      <UniqueIdentifier>{bed786b4-6d8a-4c8d-b04f-67eb0f7435b8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="source\graphics\particle">
-      <UniqueIdentifier>{6d44a7c8-3ed7-4377-920b-2d8c98f34435}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="source\graphics\animation">
-      <UniqueIdentifier>{75436e7f-5196-4981-a0f0-f2eaf5e97dce}</UniqueIdentifier>
-    </Filter>
     <Filter Include="source\game">
       <UniqueIdentifier>{c002d452-c7a0-4161-a419-c10fd3d1c297}</UniqueIdentifier>
     </Filter>
@@ -58,7 +46,19 @@
     <Filter Include="source\ai">
       <UniqueIdentifier>{caecef4f-a2c6-4d0a-8052-20e400378f3a}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\graphics\shader\shaders">
+    <Filter Include="source\graphics\animations">
+      <UniqueIdentifier>{75436e7f-5196-4981-a0f0-f2eaf5e97dce}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="source\graphics\fonts">
+      <UniqueIdentifier>{ce02dfa9-2afe-4295-b14f-c786d65456cd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="source\graphics\particles">
+      <UniqueIdentifier>{6d44a7c8-3ed7-4377-920b-2d8c98f34435}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="source\graphics\shaders">
+      <UniqueIdentifier>{bed786b4-6d8a-4c8d-b04f-67eb0f7435b8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="source\graphics\shaders\built-in">
       <UniqueIdentifier>{9bb29b2f-9812-4a0b-ad27-fd57756c0717}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
@@ -99,30 +99,6 @@
     <ClInclude Include="..\..\..\src\libjin\Graphics\je_canvas.h">
       <Filter>source\graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\je_shader.h">
-      <Filter>source\graphics\shader</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\je_base.shader.h">
-      <Filter>source\graphics\shader</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Font\je_decoder.h">
-      <Filter>source\graphics\font</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Font\je_font.h">
-      <Filter>source\graphics\font</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Font\je_page.h">
-      <Filter>source\graphics\font</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Font\je_text.h">
-      <Filter>source\graphics\font</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Font\je_texture_font.h">
-      <Filter>source\graphics\font</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Font\je_ttf.h">
-      <Filter>source\graphics\font</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Utils\je_utils.h">
       <Filter>source\utils</Filter>
     </ClInclude>
@@ -228,9 +204,6 @@
     <ClInclude Include="..\..\..\src\libjin\multithread\je_thread.h">
       <Filter>source\multithread</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\graphics\shader\je_jsl_compiler.h">
-      <Filter>source\graphics\shader</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\math\je_random.h">
       <Filter>source\math</Filter>
     </ClInclude>
@@ -240,9 +213,6 @@
     <ClInclude Include="..\..\..\src\libjin\game\je_scene.h">
       <Filter>source\game</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\graphics\particle\je_particle.h">
-      <Filter>source\graphics\particle</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\ai\je_behavior_tree.h">
       <Filter>source\ai</Filter>
     </ClInclude>
@@ -264,33 +234,9 @@
     <ClInclude Include="..\..\..\src\libjin\Graphics\je_graphic.h">
       <Filter>source\graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\graphics\particle\je_particle_system.h">
-      <Filter>source\graphics\particle</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\particle\je_particle_emitter.h">
-      <Filter>source\graphics\particle</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\particle\je_particle_pool.h">
-      <Filter>source\graphics\particle</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Game\je_entity.h">
       <Filter>source\game</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\graphics\animation\je_animator.h">
-      <Filter>source\graphics\animation</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\graphics\animation\je_animation.h">
-      <Filter>source\graphics\animation</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\shaders\je_default.shader.h">
-      <Filter>source\graphics\shader\shaders</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\shaders\je_font.shader.h">
-      <Filter>source\graphics\shader\shaders</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\shaders\je_texture.shader.h">
-      <Filter>source\graphics\shader\shaders</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Game\je_application.h">
       <Filter>source\game</Filter>
     </ClInclude>
@@ -306,6 +252,63 @@
     <ClInclude Include="..\..\..\src\libjin\graphics\je_graphic_manager.h">
       <Filter>source\graphics</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\graphics\shaders\built-in\je_default.shader.h">
+      <Filter>source\graphics\shaders\built-in</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\graphics\shaders\built-in\je_font.shader.h">
+      <Filter>source\graphics\shaders\built-in</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\graphics\shaders\built-in\je_texture.shader.h">
+      <Filter>source\graphics\shaders\built-in</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\graphics\shaders\je_base.shader.h">
+      <Filter>source\graphics\shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\graphics\shaders\je_jsl_compiler.h">
+      <Filter>source\graphics\shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\graphics\shaders\je_shader.h">
+      <Filter>source\graphics\shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\graphics\particles\je_particle.h">
+      <Filter>source\graphics\particles</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\graphics\particles\je_particle_emitter.h">
+      <Filter>source\graphics\particles</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\graphics\particles\je_particle_pool.h">
+      <Filter>source\graphics\particles</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\graphics\particles\je_particle_system.h">
+      <Filter>source\graphics\particles</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\graphics\fonts\je_decoder.h">
+      <Filter>source\graphics\fonts</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\graphics\fonts\je_font.h">
+      <Filter>source\graphics\fonts</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\graphics\fonts\je_page.h">
+      <Filter>source\graphics\fonts</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\graphics\fonts\je_text.h">
+      <Filter>source\graphics\fonts</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\graphics\fonts\je_texture_font.h">
+      <Filter>source\graphics\fonts</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\graphics\fonts\je_ttf.h">
+      <Filter>source\graphics\fonts</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\graphics\animations\je_animation.h">
+      <Filter>source\graphics\animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\graphics\animations\je_animator.h">
+      <Filter>source\graphics\animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\ai\je_ai.h">
+      <Filter>source\ai</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\src\libjin\README.md">
@@ -349,21 +352,6 @@
     <ClCompile Include="..\..\..\src\libjin\Graphics\je_canvas.cpp">
       <Filter>source\graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\Graphics\Shader\je_shader.cpp">
-      <Filter>source\graphics\shader</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\Graphics\Font\je_decoder.cpp">
-      <Filter>source\graphics\font</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\Graphics\Font\je_text.cpp">
-      <Filter>source\graphics\font</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\Graphics\Font\je_texture_font.cpp">
-      <Filter>source\graphics\font</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\Graphics\Font\je_ttf.cpp">
-      <Filter>source\graphics\font</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Utils\je_unittest.cpp">
       <Filter>source\utils</Filter>
     </ClCompile>
@@ -418,12 +406,6 @@
     <ClCompile Include="..\..\..\src\libjin\multithread\je_thread.cpp">
       <Filter>source\multithread</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\graphics\shader\je_jsl_compiler.cpp">
-      <Filter>source\graphics\shader</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\graphics\particle\je_particle.cpp">
-      <Filter>source\graphics\particle</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\ai\je_behavior_tree.cpp">
       <Filter>source\ai</Filter>
     </ClCompile>
@@ -436,24 +418,9 @@
     <ClCompile Include="..\..\..\src\libjin\Graphics\je_graphic.cpp">
       <Filter>source\graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\graphics\particle\je_particle_system.cpp">
-      <Filter>source\graphics\particle</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\Graphics\particle\je_particle_emitter.cpp">
-      <Filter>source\graphics\particle</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\graphics\particle\je_particle_pool.cpp">
-      <Filter>source\graphics\particle</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Game\je_entity.cpp">
       <Filter>source\game</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\graphics\animation\je_animator.cpp">
-      <Filter>source\graphics\animation</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\graphics\animation\je_animation.cpp">
-      <Filter>source\graphics\animation</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Game\je_application.cpp">
       <Filter>source\game</Filter>
     </ClCompile>
@@ -469,5 +436,41 @@
     <ClCompile Include="..\..\..\src\libjin\graphics\je_graphic_manager.cpp">
       <Filter>source\graphics</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\graphics\shaders\je_jsl_compiler.cpp">
+      <Filter>source\graphics\shaders</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\graphics\shaders\je_shader.cpp">
+      <Filter>source\graphics\shaders</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\graphics\particles\je_particle.cpp">
+      <Filter>source\graphics\particles</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\graphics\particles\je_particle_emitter.cpp">
+      <Filter>source\graphics\particles</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\graphics\particles\je_particle_pool.cpp">
+      <Filter>source\graphics\particles</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\graphics\particles\je_particle_system.cpp">
+      <Filter>source\graphics\particles</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\graphics\fonts\je_decoder.cpp">
+      <Filter>source\graphics\fonts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\graphics\fonts\je_text.cpp">
+      <Filter>source\graphics\fonts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\graphics\fonts\je_texture_font.cpp">
+      <Filter>source\graphics\fonts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\graphics\fonts\je_ttf.cpp">
+      <Filter>source\graphics\fonts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\graphics\animations\je_animation.cpp">
+      <Filter>source\graphics\animations</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\graphics\animations\je_animator.cpp">
+      <Filter>source\graphics\animations</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
-- 
cgit v1.1-26-g67d0