diff options
63 files changed, 534 insertions, 502 deletions
diff --git a/bin/Jin.exe b/bin/Jin.exe Binary files differindex a245433..43a10b2 100644 --- a/bin/Jin.exe +++ b/bin/Jin.exe diff --git a/bin/jin.exe b/bin/jin.exe Binary files differindex a245433..43a10b2 100644 --- a/bin/jin.exe +++ b/bin/jin.exe diff --git a/build/vc++/jin.vcxproj b/build/vc++/jin.vcxproj index b996f7d..2febc9b 100644 --- a/build/vc++/jin.vcxproj +++ b/build/vc++/jin.vcxproj @@ -124,7 +124,7 @@ <OptimizeReferences>true</OptimizeReferences> <AdditionalDependencies>opengl32.lib;glu32.lib;lua51.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>$(SolutionDir)libs\SDL2-2.0.5\lib\x86;$(SolutionDir)libs\LuaJIT-2.0.5\src;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <SubSystem>Windows</SubSystem> + <SubSystem>Console</SubSystem> <EntryPointSymbol> </EntryPointSymbol> </Link> @@ -154,7 +154,7 @@ <ClCompile Include="..\..\src\lua\modules\graphics\bitmap.cpp" /> <ClCompile Include="..\..\src\lua\modules\graphics\canvas.cpp" /> <ClCompile Include="..\..\src\lua\modules\graphics\text.cpp" /> - <ClCompile Include="..\..\src\lua\modules\graphics\textureFont.cpp" /> + <ClCompile Include="..\..\src\lua\modules\graphics\texture_font.cpp" /> <ClCompile Include="..\..\src\lua\modules\graphics\ttf.cpp" /> <ClCompile Include="..\..\src\lua\modules\graphics\ttfData.cpp" /> <ClCompile Include="..\..\src\lua\modules\graphics\graphics.cpp" /> @@ -165,7 +165,7 @@ <ClCompile Include="..\..\src\lua\modules\keyboard\keyboard.cpp" /> <ClCompile Include="..\..\src\lua\modules\math\math.cpp" /> <ClCompile Include="..\..\src\lua\modules\mouse\mouse.cpp" /> - <ClCompile Include="..\..\src\lua\modules\net\Buffer.cpp" /> + <ClCompile Include="..\..\src\lua\modules\net\buffer.cpp" /> <ClCompile Include="..\..\src\lua\modules\net\net.cpp" /> <ClCompile Include="..\..\src\lua\modules\net\socket.cpp" /> <ClCompile Include="..\..\src\lua\modules\thread\thread.cpp" /> @@ -188,7 +188,7 @@ <ClInclude Include="..\..\src\lua\libraries\luax\luax.h" /> <ClInclude Include="..\..\src\lua\luax.h" /> <ClInclude Include="..\..\src\lua\modules\luax.h" /> - <ClInclude Include="..\..\src\lua\modules\net\Buffer.h" /> + <ClInclude Include="..\..\src\lua\modules\net\buffer.h" /> <ClInclude Include="..\..\src\lua\modules\thread\thread.h" /> <ClInclude Include="..\..\src\lua\modules\types.h" /> <ClInclude Include="..\..\src\lua\resources\font.ttf.h" /> diff --git a/build/vc++/jin.vcxproj.filters b/build/vc++/jin.vcxproj.filters index 18f4535..1a17f85 100644 --- a/build/vc++/jin.vcxproj.filters +++ b/build/vc++/jin.vcxproj.filters @@ -102,9 +102,6 @@ <ClCompile Include="..\..\src\lua\modules\mouse\mouse.cpp"> <Filter>src\modules\mouse</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\net\Buffer.cpp"> - <Filter>src\modules\net</Filter> - </ClCompile> <ClCompile Include="..\..\src\lua\modules\net\net.cpp"> <Filter>src\modules\net</Filter> </ClCompile> @@ -144,9 +141,12 @@ <ClCompile Include="..\..\src\lua\modules\graphics\text.cpp"> <Filter>src\modules\graphics</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\graphics\textureFont.cpp"> + <ClCompile Include="..\..\src\lua\modules\graphics\texture_font.cpp"> <Filter>src\modules\graphics</Filter> </ClCompile> + <ClCompile Include="..\..\src\lua\modules\net\buffer.cpp"> + <Filter>src\modules\net</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="resource.h"> @@ -164,9 +164,6 @@ <ClInclude Include="..\..\src\lua\common\constant.h"> <Filter>src\common</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\net\Buffer.h"> - <Filter>src\modules\net</Filter> - </ClInclude> <ClInclude Include="..\..\src\lua\libraries\luax\luax.h"> <Filter>src\libraries\luax</Filter> </ClInclude> @@ -212,6 +209,9 @@ <ClInclude Include="..\..\src\lua\luax.h"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\src\lua\modules\net\buffer.h"> + <Filter>src\modules\net</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="jin.rc"> diff --git a/build/vc++/libjin/libjin.vcxproj b/build/vc++/libjin/libjin.vcxproj index acb4ab9..6fca2e9 100644 --- a/build/vc++/libjin/libjin.vcxproj +++ b/build/vc++/libjin/libjin.vcxproj @@ -139,67 +139,68 @@ <ClInclude Include="..\..\..\src\libjin\3rdparty\stb\stb_truetype.h" /> <ClInclude Include="..\..\..\src\libjin\3rdparty\tekcos\tekcos.h" /> <ClInclude Include="..\..\..\src\libjin\3rdparty\wav\wav.h" /> - <ClInclude Include="..\..\..\src\libjin\Audio\Audio.h" /> - <ClInclude Include="..\..\..\src\libjin\Audio\SDL\SDLAudio.h" /> - <ClInclude Include="..\..\..\src\libjin\Audio\SDL\SDLSource.h" /> - <ClInclude Include="..\..\..\src\libjin\Audio\Source.h" /> - <ClInclude Include="..\..\..\src\libjin\Common\Array.hpp" /> - <ClInclude Include="..\..\..\src\libjin\Common\common.h" /> - <ClInclude Include="..\..\..\src\libjin\Common\Exception.h" /> - <ClInclude Include="..\..\..\src\libjin\Common\Object.h" /> - <ClInclude Include="..\..\..\src\libjin\Common\Singleton.hpp" /> - <ClInclude Include="..\..\..\src\libjin\Common\StringMap.hpp" /> - <ClInclude Include="..\..\..\src\libjin\Common\Subsystem.hpp" /> - <ClInclude Include="..\..\..\src\libjin\Common\types.h" /> - <ClInclude Include="..\..\..\src\libjin\Common\utf8.h" /> - <ClInclude Include="..\..\..\src\libjin\Filesystem\Buffer.h" /> - <ClInclude Include="..\..\..\src\libjin\Filesystem\Filesystem.h" /> - <ClInclude Include="..\..\..\src\libjin\Game\Game.h" /> - <ClInclude Include="..\..\..\src\libjin\Graphics\Bitmap.h" /> - <ClInclude Include="..\..\..\src\libjin\Graphics\Canvas.h" /> - <ClInclude Include="..\..\..\src\libjin\Graphics\Color.h" /> - <ClInclude Include="..\..\..\src\libjin\Graphics\Drawable.h" /> - <ClInclude Include="..\..\..\src\libjin\Graphics\Font\Decoder.h" /> - <ClInclude Include="..\..\..\src\libjin\Graphics\Font\Font.h" /> - <ClInclude Include="..\..\..\src\libjin\Graphics\Font\Page.h" /> - <ClInclude Include="..\..\..\src\libjin\Graphics\Font\Text.h" /> - <ClInclude Include="..\..\..\src\libjin\Graphics\Font\TextureFont.h" /> - <ClInclude Include="..\..\..\src\libjin\Graphics\Font\TTF.h" /> - <ClInclude Include="..\..\..\src\libjin\Graphics\Graphics.h" /> - <ClInclude Include="..\..\..\src\libjin\Graphics\Image.h" /> - <ClInclude Include="..\..\..\src\libjin\Graphics\Mesh.h" /> - <ClInclude Include="..\..\..\src\libjin\Graphics\OpenGL.h" /> - <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\base.shader.h" /> - <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\default.shader.h" /> - <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\font.shader.h" /> - <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\Shader.h" /> - <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\texture.shader.h" /> - <ClInclude Include="..\..\..\src\libjin\Graphics\Shapes.h" /> - <ClInclude Include="..\..\..\src\libjin\Graphics\Sprite.h" /> - <ClInclude Include="..\..\..\src\libjin\Graphics\Texture.h" /> - <ClInclude Include="..\..\..\src\libjin\Graphics\Window.h" /> - <ClInclude Include="..\..\..\src\libjin\Input\Event.h" /> - <ClInclude Include="..\..\..\src\libjin\Input\Input.h" /> - <ClInclude Include="..\..\..\src\libjin\Input\Joypad.h" /> - <ClInclude Include="..\..\..\src\libjin\Input\Keyboard.h" /> - <ClInclude Include="..\..\..\src\libjin\Input\Mouse.h" /> + <ClInclude Include="..\..\..\src\libjin\Audio\je_audio.h" /> + <ClInclude Include="..\..\..\src\libjin\Audio\SDL\je_sdl_audio.h" /> + <ClInclude Include="..\..\..\src\libjin\Audio\SDL\je_sdl_source.h" /> + <ClInclude Include="..\..\..\src\libjin\Audio\je_source.h" /> + <ClInclude Include="..\..\..\src\libjin\Common\je_array.hpp" /> + <ClInclude Include="..\..\..\src\libjin\Common\je_common.h" /> + <ClInclude Include="..\..\..\src\libjin\Common\je_exception.h" /> + <ClInclude Include="..\..\..\src\libjin\Common\je_object.h" /> + <ClInclude Include="..\..\..\src\libjin\Common\je_singleton.hpp" /> + <ClInclude Include="..\..\..\src\libjin\Common\je_stringmap.hpp" /> + <ClInclude Include="..\..\..\src\libjin\Common\je_subsystem.hpp" /> + <ClInclude Include="..\..\..\src\libjin\Common\je_types.h" /> + <ClInclude Include="..\..\..\src\libjin\Common\je_utf8.h" /> + <ClInclude Include="..\..\..\src\libjin\core\je_configuration.h" /> + <ClInclude Include="..\..\..\src\libjin\core\je_types.h" /> + <ClInclude Include="..\..\..\src\libjin\Filesystem\je_buffer.h" /> + <ClInclude Include="..\..\..\src\libjin\Filesystem\je_filesystem.h" /> + <ClInclude Include="..\..\..\src\libjin\Game\je_game.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_drawable.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_image.h" /> + <ClInclude Include="..\..\..\src\libjin\Graphics\je_mesh.h" /> + <ClInclude Include="..\..\..\src\libjin\Graphics\je_gl.h" /> + <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\je_base.shader.h" /> + <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\je_default.shader.h" /> + <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\je_font.shader.h" /> + <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\je_shader.h" /> + <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\je_texture.shader.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\Input\je_event.h" /> + <ClInclude Include="..\..\..\src\libjin\Input\je_input.h" /> + <ClInclude Include="..\..\..\src\libjin\Input\je_joypad.h" /> + <ClInclude Include="..\..\..\src\libjin\Input\je_keyboard.h" /> + <ClInclude Include="..\..\..\src\libjin\Input\je_mouse.h" /> <ClInclude Include="..\..\..\src\libjin\jin.h" /> - <ClInclude Include="..\..\..\src\libjin\configuration.h" /> - <ClInclude Include="..\..\..\src\libjin\Math\constant.h" /> - <ClInclude Include="..\..\..\src\libjin\Math\Math.h" /> - <ClInclude Include="..\..\..\src\libjin\Math\Matrix.h" /> - <ClInclude Include="..\..\..\src\libjin\Math\Quad.h" /> - <ClInclude Include="..\..\..\src\libjin\Math\Vector2.hpp" /> - <ClInclude Include="..\..\..\src\libjin\Math\Vector3.hpp" /> - <ClInclude Include="..\..\..\src\libjin\Math\Vector4.hpp" /> - <ClInclude Include="..\..\..\src\libjin\Net\Net.h" /> - <ClInclude Include="..\..\..\src\libjin\Net\Socket.h" /> - <ClInclude Include="..\..\..\src\libjin\Thread\Thread.h" /> - <ClInclude Include="..\..\..\src\libjin\Time\Timer.h" /> - <ClInclude Include="..\..\..\src\libjin\Utils\endian.h" /> - <ClInclude Include="..\..\..\src\libjin\Utils\Log.h" /> - <ClInclude Include="..\..\..\src\libjin\Utils\macros.h" /> - <ClInclude Include="..\..\..\src\libjin\Utils\utils.h" /> + <ClInclude Include="..\..\..\src\libjin\Math\je_constant.h" /> + <ClInclude Include="..\..\..\src\libjin\Math\je_math.h" /> + <ClInclude Include="..\..\..\src\libjin\Math\je_matrix.h" /> + <ClInclude Include="..\..\..\src\libjin\Math\je_quad.h" /> + <ClInclude Include="..\..\..\src\libjin\Math\je_vector2.hpp" /> + <ClInclude Include="..\..\..\src\libjin\Math\je_vector3.hpp" /> + <ClInclude Include="..\..\..\src\libjin\Math\je_vector4.hpp" /> + <ClInclude Include="..\..\..\src\libjin\Net\je_net.h" /> + <ClInclude Include="..\..\..\src\libjin\Net\je_socket.h" /> + <ClInclude Include="..\..\..\src\libjin\Thread\je_thread.h" /> + <ClInclude Include="..\..\..\src\libjin\Time\je_timer.h" /> + <ClInclude Include="..\..\..\src\libjin\Utils\je_endian.h" /> + <ClInclude Include="..\..\..\src\libjin\Utils\je_log.h" /> + <ClInclude Include="..\..\..\src\libjin\Utils\je_macros.h" /> + <ClInclude Include="..\..\..\src\libjin\Utils\je_utils.h" /> </ItemGroup> <ItemGroup> <None Include="..\..\..\src\libjin\README.md" /> @@ -210,42 +211,42 @@ <ClCompile Include="..\..\..\src\libjin\3rdparty\stb\stb_vorbis.c" /> <ClCompile Include="..\..\..\src\libjin\3rdparty\tekcos\tekcos.c" /> <ClCompile Include="..\..\..\src\libjin\3rdparty\wav\wav.c" /> - <ClCompile Include="..\..\..\src\libjin\Audio\Audio.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Audio\SDL\SDLAudio.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Audio\SDL\SDLSource.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Audio\Source.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Common\Exception.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Common\Object.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Common\utf8.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Filesystem\Filesystem.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Game\Game.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Graphics\Bitmap.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Graphics\Canvas.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Graphics\Color.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Graphics\Drawable.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Graphics\Font\Decoder.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Graphics\Font\Text.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Graphics\Font\TextureFont.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Graphics\Font\TTF.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Graphics\Image.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Graphics\Mesh.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Graphics\OpenGL.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Graphics\Shader\Shader.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Graphics\Shapes.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Graphics\Sprite.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Graphics\Texture.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Graphics\Window.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Input\Event.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Input\Joypad.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Input\Keyboard.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Input\Mouse.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Math\Matrix.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Net\Net.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Net\Socket.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Thread\Thread.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Time\Timer.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Utils\Log.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Utils\unittest.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Audio\je_audio.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Audio\SDL\je_sdl_audio.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Audio\SDL\je_sdl_source.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Audio\je_source.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Common\je_exception.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Common\je_object.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Common\je_utf8.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Filesystem\je_filesystem.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Game\je_game.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_drawable.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_image.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Graphics\je_mesh.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Graphics\je_gl.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\Input\je_event.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Input\je_joypad.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Input\je_keyboard.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Input\je_mouse.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Math\je_matrix.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Net\je_net.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Net\je_socket.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Thread\je_thread.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Time\je_timer.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Utils\je_log.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Utils\je_unittest.cpp" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> diff --git a/build/vc++/libjin/libjin.vcxproj.filters b/build/vc++/libjin/libjin.vcxproj.filters index 52e0af9..dc49cd4 100644 --- a/build/vc++/libjin/libjin.vcxproj.filters +++ b/build/vc++/libjin/libjin.vcxproj.filters @@ -22,263 +22,271 @@ <Filter Include="Source\3rdparty\smount"> <UniqueIdentifier>{60deec03-f023-4417-a058-c955d23f01d4}</UniqueIdentifier> </Filter> - <Filter Include="Source\Audio"> - <UniqueIdentifier>{27146cd2-84fe-4eaf-a45b-641a463d381b}</UniqueIdentifier> + <Filter Include="Source\3rdparty\ogl2d"> + <UniqueIdentifier>{c582e534-7e96-484c-ae1b-a9e7962ab6c2}</UniqueIdentifier> </Filter> - <Filter Include="Source\Audio\SDL"> - <UniqueIdentifier>{2dc5e4ca-0904-4b49-8043-5d02db438008}</UniqueIdentifier> + <Filter Include="Source\3rdparty\base64"> + <UniqueIdentifier>{086e2fe7-2366-4d52-b059-212ada075da4}</UniqueIdentifier> </Filter> - <Filter Include="Source\Common"> - <UniqueIdentifier>{908f94da-1fc4-42db-abe9-8c8e17051f9d}</UniqueIdentifier> + <Filter Include="Source\utils"> + <UniqueIdentifier>{6259760f-501a-4b52-b9a1-4abb4d788a99}</UniqueIdentifier> </Filter> - <Filter Include="Source\Filesystem"> - <UniqueIdentifier>{3a98cf95-d45a-4a0e-b3fe-65b5accdb75f}</UniqueIdentifier> + <Filter Include="Source\time"> + <UniqueIdentifier>{492364c7-464b-488e-aae0-15aca7824f32}</UniqueIdentifier> </Filter> - <Filter Include="Source\Graphics"> - <UniqueIdentifier>{bb6c372a-520b-4de3-ab14-64839a6166d9}</UniqueIdentifier> + <Filter Include="Source\thread"> + <UniqueIdentifier>{5d5c96c3-1065-4e74-9521-f4d756d4057f}</UniqueIdentifier> </Filter> - <Filter Include="Source\Input"> - <UniqueIdentifier>{e4d464ae-1cb5-47fd-b24a-fd35708aead0}</UniqueIdentifier> + <Filter Include="Source\net"> + <UniqueIdentifier>{125ecddc-2a19-4da8-9e81-da40ccfb1be7}</UniqueIdentifier> </Filter> - <Filter Include="Source\Math"> + <Filter Include="Source\math"> <UniqueIdentifier>{17b71ceb-a8ff-4ec0-aa18-b51e265bec34}</UniqueIdentifier> </Filter> - <Filter Include="Source\Net"> - <UniqueIdentifier>{125ecddc-2a19-4da8-9e81-da40ccfb1be7}</UniqueIdentifier> - </Filter> - <Filter Include="Source\Thread"> - <UniqueIdentifier>{5d5c96c3-1065-4e74-9521-f4d756d4057f}</UniqueIdentifier> + <Filter Include="Source\input"> + <UniqueIdentifier>{e4d464ae-1cb5-47fd-b24a-fd35708aead0}</UniqueIdentifier> </Filter> - <Filter Include="Source\Time"> - <UniqueIdentifier>{492364c7-464b-488e-aae0-15aca7824f32}</UniqueIdentifier> + <Filter Include="Source\graphics"> + <UniqueIdentifier>{bb6c372a-520b-4de3-ab14-64839a6166d9}</UniqueIdentifier> </Filter> - <Filter Include="Source\Utils"> - <UniqueIdentifier>{6259760f-501a-4b52-b9a1-4abb4d788a99}</UniqueIdentifier> + <Filter Include="Source\graphics\font"> + <UniqueIdentifier>{ce02dfa9-2afe-4295-b14f-c786d65456cd}</UniqueIdentifier> </Filter> - <Filter Include="Source\3rdparty\ogl2d"> - <UniqueIdentifier>{c582e534-7e96-484c-ae1b-a9e7962ab6c2}</UniqueIdentifier> + <Filter Include="Source\graphics\shader"> + <UniqueIdentifier>{bed786b4-6d8a-4c8d-b04f-67eb0f7435b8}</UniqueIdentifier> </Filter> - <Filter Include="Source\Game"> + <Filter Include="Source\game"> <UniqueIdentifier>{c002d452-c7a0-4161-a419-c10fd3d1c297}</UniqueIdentifier> </Filter> - <Filter Include="Source\Graphics\Font"> - <UniqueIdentifier>{ce02dfa9-2afe-4295-b14f-c786d65456cd}</UniqueIdentifier> + <Filter Include="Source\filesystem"> + <UniqueIdentifier>{3a98cf95-d45a-4a0e-b3fe-65b5accdb75f}</UniqueIdentifier> </Filter> - <Filter Include="Source\3rdparty\base64"> - <UniqueIdentifier>{086e2fe7-2366-4d52-b059-212ada075da4}</UniqueIdentifier> + <Filter Include="Source\common"> + <UniqueIdentifier>{908f94da-1fc4-42db-abe9-8c8e17051f9d}</UniqueIdentifier> </Filter> - <Filter Include="Source\Graphics\Shader"> - <UniqueIdentifier>{bed786b4-6d8a-4c8d-b04f-67eb0f7435b8}</UniqueIdentifier> + <Filter Include="Source\audio"> + <UniqueIdentifier>{27146cd2-84fe-4eaf-a45b-641a463d381b}</UniqueIdentifier> + </Filter> + <Filter Include="Source\audio\sdl"> + <UniqueIdentifier>{2dc5e4ca-0904-4b49-8043-5d02db438008}</UniqueIdentifier> + </Filter> + <Filter Include="Source\core"> + <UniqueIdentifier>{410ae074-3f19-4ca1-bbf4-380f2ba67500}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\..\src\libjin\Audio\Audio.h"> - <Filter>Source\Audio</Filter> + <ClInclude Include="..\..\..\src\libjin\3rdparty\GLee\GLee.h"> + <Filter>Source\3rdparty\GLee</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\3rdparty\stb\stb_image.h"> + <Filter>Source\3rdparty\stb</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Audio\Source.h"> - <Filter>Source\Audio</Filter> + <ClInclude Include="..\..\..\src\libjin\3rdparty\stb\stb_truetype.h"> + <Filter>Source\3rdparty\stb</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Audio\SDL\SDLAudio.h"> - <Filter>Source\Audio\SDL</Filter> + <ClInclude Include="..\..\..\src\libjin\3rdparty\wav\wav.h"> + <Filter>Source\3rdparty\wav</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\3rdparty\tekcos\tekcos.h"> + <Filter>Source\3rdparty\tekcos</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Audio\SDL\SDLSource.h"> - <Filter>Source\Audio\SDL</Filter> + <ClInclude Include="..\..\..\src\libjin\3rdparty\smount\dirent.h"> + <Filter>Source\3rdparty\smount</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Common\Object.h"> - <Filter>Source\Common</Filter> + <ClInclude Include="..\..\..\src\libjin\3rdparty\smount\smount.h"> + <Filter>Source\3rdparty\smount</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Common\Singleton.hpp"> - <Filter>Source\Common</Filter> + <ClInclude Include="..\..\..\src\libjin\jin.h"> + <Filter>Source</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Common\StringMap.hpp"> - <Filter>Source\Common</Filter> + <ClInclude Include="..\..\..\src\libjin\3rdparty\ogl\OpenGL.h"> + <Filter>Source\3rdparty\ogl2d</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Common\Subsystem.hpp"> - <Filter>Source\Common</Filter> + <ClInclude Include="..\..\..\src\libjin\Graphics\je_mesh.h"> + <Filter>Source\graphics</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Common\utf8.h"> - <Filter>Source\Common</Filter> + <ClInclude Include="..\..\..\src\libjin\Graphics\je_bitmap.h"> + <Filter>Source\graphics</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Filesystem\Buffer.h"> - <Filter>Source\Filesystem</Filter> + <ClInclude Include="..\..\..\src\libjin\Graphics\je_window.h"> + <Filter>Source\graphics</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Filesystem\Filesystem.h"> - <Filter>Source\Filesystem</Filter> + <ClInclude Include="..\..\..\src\libjin\Graphics\je_texture.h"> + <Filter>Source\graphics</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Input\Event.h"> - <Filter>Source\Input</Filter> + <ClInclude Include="..\..\..\src\libjin\Graphics\je_sprite.h"> + <Filter>Source\graphics</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Input\Input.h"> - <Filter>Source\Input</Filter> + <ClInclude Include="..\..\..\src\libjin\Graphics\je_shapes.h"> + <Filter>Source\graphics</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Input\Joypad.h"> - <Filter>Source\Input</Filter> + <ClInclude Include="..\..\..\src\libjin\Graphics\je_gl.h"> + <Filter>Source\graphics</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Input\Keyboard.h"> - <Filter>Source\Input</Filter> + <ClInclude Include="..\..\..\src\libjin\Graphics\je_image.h"> + <Filter>Source\graphics</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Input\Mouse.h"> - <Filter>Source\Input</Filter> + <ClInclude Include="..\..\..\src\libjin\Graphics\je_graphics.h"> + <Filter>Source\graphics</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Math\constant.h"> - <Filter>Source\Math</Filter> + <ClInclude Include="..\..\..\src\libjin\Graphics\je_drawable.h"> + <Filter>Source\graphics</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Math\Math.h"> - <Filter>Source\Math</Filter> + <ClInclude Include="..\..\..\src\libjin\Graphics\je_color.h"> + <Filter>Source\graphics</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Math\Matrix.h"> - <Filter>Source\Math</Filter> + <ClInclude Include="..\..\..\src\libjin\Graphics\je_canvas.h"> + <Filter>Source\graphics</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Math\Quad.h"> - <Filter>Source\Math</Filter> + <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\je_shader.h"> + <Filter>Source\graphics\shader</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Net\Net.h"> - <Filter>Source\Net</Filter> + <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\je_base.shader.h"> + <Filter>Source\graphics\shader</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Net\Socket.h"> - <Filter>Source\Net</Filter> + <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\je_default.shader.h"> + <Filter>Source\graphics\shader</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Thread\Thread.h"> - <Filter>Source\Thread</Filter> + <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\je_font.shader.h"> + <Filter>Source\graphics\shader</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Utils\endian.h"> - <Filter>Source\Utils</Filter> + <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\je_texture.shader.h"> + <Filter>Source\graphics\shader</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Utils\Log.h"> - <Filter>Source\Utils</Filter> + <ClInclude Include="..\..\..\src\libjin\Graphics\Font\je_decoder.h"> + <Filter>Source\graphics\font</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Utils\macros.h"> - <Filter>Source\Utils</Filter> + <ClInclude Include="..\..\..\src\libjin\Graphics\Font\je_font.h"> + <Filter>Source\graphics\font</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Utils\utils.h"> - <Filter>Source\Utils</Filter> + <ClInclude Include="..\..\..\src\libjin\Graphics\Font\je_page.h"> + <Filter>Source\graphics\font</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\3rdparty\GLee\GLee.h"> - <Filter>Source\3rdparty\GLee</Filter> + <ClInclude Include="..\..\..\src\libjin\Graphics\Font\je_text.h"> + <Filter>Source\graphics\font</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\3rdparty\stb\stb_image.h"> - <Filter>Source\3rdparty\stb</Filter> + <ClInclude Include="..\..\..\src\libjin\Graphics\Font\je_texture_font.h"> + <Filter>Source\graphics\font</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\3rdparty\stb\stb_truetype.h"> - <Filter>Source\3rdparty\stb</Filter> + <ClInclude Include="..\..\..\src\libjin\Graphics\Font\je_ttf.h"> + <Filter>Source\graphics\font</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\3rdparty\wav\wav.h"> - <Filter>Source\3rdparty\wav</Filter> + <ClInclude Include="..\..\..\src\libjin\Utils\je_utils.h"> + <Filter>Source\utils</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\3rdparty\tekcos\tekcos.h"> - <Filter>Source\3rdparty\tekcos</Filter> + <ClInclude Include="..\..\..\src\libjin\Utils\je_macros.h"> + <Filter>Source\utils</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\3rdparty\smount\dirent.h"> - <Filter>Source\3rdparty\smount</Filter> + <ClInclude Include="..\..\..\src\libjin\Utils\je_log.h"> + <Filter>Source\utils</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\3rdparty\smount\smount.h"> - <Filter>Source\3rdparty\smount</Filter> + <ClInclude Include="..\..\..\src\libjin\Utils\je_endian.h"> + <Filter>Source\utils</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Time\Timer.h"> - <Filter>Source\Time</Filter> + <ClInclude Include="..\..\..\src\libjin\Time\je_timer.h"> + <Filter>Source\time</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Math\Vector2.hpp"> - <Filter>Source\Math</Filter> + <ClInclude Include="..\..\..\src\libjin\Thread\je_thread.h"> + <Filter>Source\thread</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Math\Vector3.hpp"> - <Filter>Source\Math</Filter> + <ClInclude Include="..\..\..\src\libjin\Net\je_socket.h"> + <Filter>Source\net</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Math\Vector4.hpp"> - <Filter>Source\Math</Filter> + <ClInclude Include="..\..\..\src\libjin\Net\je_net.h"> + <Filter>Source\net</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\jin.h"> - <Filter>Source</Filter> + <ClInclude Include="..\..\..\src\libjin\Math\je_vector4.hpp"> + <Filter>Source\math</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Common\Array.hpp"> - <Filter>Source\Common</Filter> + <ClInclude Include="..\..\..\src\libjin\Math\je_vector3.hpp"> + <Filter>Source\math</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Common\common.h"> - <Filter>Source\Common</Filter> + <ClInclude Include="..\..\..\src\libjin\Math\je_vector2.hpp"> + <Filter>Source\math</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Common\types.h"> - <Filter>Source\Common</Filter> + <ClInclude Include="..\..\..\src\libjin\Math\je_quad.h"> + <Filter>Source\math</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\3rdparty\ogl\OpenGL.h"> - <Filter>Source\3rdparty\ogl2d</Filter> + <ClInclude Include="..\..\..\src\libjin\Math\je_matrix.h"> + <Filter>Source\math</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Game\Game.h"> - <Filter>Source\Game</Filter> + <ClInclude Include="..\..\..\src\libjin\Math\je_math.h"> + <Filter>Source\math</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Common\Exception.h"> - <Filter>Source\Common</Filter> + <ClInclude Include="..\..\..\src\libjin\Math\je_constant.h"> + <Filter>Source\math</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Graphics\Font\Decoder.h"> - <Filter>Source\Graphics\Font</Filter> + <ClInclude Include="..\..\..\src\libjin\Input\je_mouse.h"> + <Filter>Source\input</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Graphics\Font\Font.h"> - <Filter>Source\Graphics\Font</Filter> + <ClInclude Include="..\..\..\src\libjin\Input\je_keyboard.h"> + <Filter>Source\input</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Graphics\Font\Page.h"> - <Filter>Source\Graphics\Font</Filter> + <ClInclude Include="..\..\..\src\libjin\Input\je_joypad.h"> + <Filter>Source\input</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Graphics\Font\Text.h"> - <Filter>Source\Graphics\Font</Filter> + <ClInclude Include="..\..\..\src\libjin\Input\je_input.h"> + <Filter>Source\input</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Graphics\Font\TextureFont.h"> - <Filter>Source\Graphics\Font</Filter> + <ClInclude Include="..\..\..\src\libjin\Input\je_event.h"> + <Filter>Source\input</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Graphics\Font\TTF.h"> - <Filter>Source\Graphics\Font</Filter> + <ClInclude Include="..\..\..\src\libjin\Game\je_game.h"> + <Filter>Source\game</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Graphics\Bitmap.h"> - <Filter>Source\Graphics</Filter> + <ClInclude Include="..\..\..\src\libjin\Filesystem\je_buffer.h"> + <Filter>Source\filesystem</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Graphics\Canvas.h"> - <Filter>Source\Graphics</Filter> + <ClInclude Include="..\..\..\src\libjin\Filesystem\je_filesystem.h"> + <Filter>Source\filesystem</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Graphics\Color.h"> - <Filter>Source\Graphics</Filter> + <ClInclude Include="..\..\..\src\libjin\Common\je_array.hpp"> + <Filter>Source\common</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Graphics\Drawable.h"> - <Filter>Source\Graphics</Filter> + <ClInclude Include="..\..\..\src\libjin\Common\je_common.h"> + <Filter>Source\common</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Graphics\Graphics.h"> - <Filter>Source\Graphics</Filter> + <ClInclude Include="..\..\..\src\libjin\Common\je_exception.h"> + <Filter>Source\common</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Graphics\Image.h"> - <Filter>Source\Graphics</Filter> + <ClInclude Include="..\..\..\src\libjin\Common\je_object.h"> + <Filter>Source\common</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Graphics\Mesh.h"> - <Filter>Source\Graphics</Filter> + <ClInclude Include="..\..\..\src\libjin\Common\je_singleton.hpp"> + <Filter>Source\common</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Graphics\OpenGL.h"> - <Filter>Source\Graphics</Filter> + <ClInclude Include="..\..\..\src\libjin\Common\je_stringmap.hpp"> + <Filter>Source\common</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Graphics\Shapes.h"> - <Filter>Source\Graphics</Filter> + <ClInclude Include="..\..\..\src\libjin\Common\je_subsystem.hpp"> + <Filter>Source\common</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Graphics\Sprite.h"> - <Filter>Source\Graphics</Filter> + <ClInclude Include="..\..\..\src\libjin\Common\je_types.h"> + <Filter>Source\common</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Graphics\Texture.h"> - <Filter>Source\Graphics</Filter> + <ClInclude Include="..\..\..\src\libjin\Common\je_utf8.h"> + <Filter>Source\common</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Graphics\Window.h"> - <Filter>Source\Graphics</Filter> + <ClInclude Include="..\..\..\src\libjin\Audio\je_source.h"> + <Filter>Source\audio</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\3rdparty\base64\base64.h" /> - <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\base.shader.h"> - <Filter>Source\Graphics\Shader</Filter> + <ClInclude Include="..\..\..\src\libjin\Audio\je_audio.h"> + <Filter>Source\audio</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\default.shader.h"> - <Filter>Source\Graphics\Shader</Filter> + <ClInclude Include="..\..\..\src\libjin\Audio\SDL\je_sdl_source.h"> + <Filter>Source\audio\sdl</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\font.shader.h"> - <Filter>Source\Graphics\Shader</Filter> + <ClInclude Include="..\..\..\src\libjin\Audio\SDL\je_sdl_audio.h"> + <Filter>Source\audio\sdl</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\Shader.h"> - <Filter>Source\Graphics\Shader</Filter> + <ClInclude Include="..\..\..\src\libjin\3rdparty\base64\base64.h"> + <Filter>Source\3rdparty\base64</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\texture.shader.h"> - <Filter>Source\Graphics\Shader</Filter> + <ClInclude Include="..\..\..\src\libjin\core\je_configuration.h"> + <Filter>Source\core</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\configuration.h"> - <Filter>Source</Filter> + <ClInclude Include="..\..\..\src\libjin\core\je_types.h"> + <Filter>Source\core</Filter> </ClInclude> </ItemGroup> <ItemGroup> @@ -287,128 +295,128 @@ </None> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\..\src\libjin\Audio\Audio.cpp"> - <Filter>Source\Audio</Filter> + <ClCompile Include="..\..\..\src\libjin\3rdparty\GLee\GLee.c"> + <Filter>Source\3rdparty\GLee</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Audio\Source.cpp"> - <Filter>Source\Audio</Filter> + <ClCompile Include="..\..\..\src\libjin\3rdparty\stb\stb_vorbis.c"> + <Filter>Source\3rdparty\stb</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Audio\SDL\SDLAudio.cpp"> - <Filter>Source\Audio\SDL</Filter> + <ClCompile Include="..\..\..\src\libjin\3rdparty\wav\wav.c"> + <Filter>Source\3rdparty\wav</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Audio\SDL\SDLSource.cpp"> - <Filter>Source\Audio\SDL</Filter> + <ClCompile Include="..\..\..\src\libjin\3rdparty\tekcos\tekcos.c"> + <Filter>Source\3rdparty\tekcos</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Common\Object.cpp"> - <Filter>Source\Common</Filter> + <ClCompile Include="..\..\..\src\libjin\3rdparty\smount\smount.c"> + <Filter>Source\3rdparty\smount</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Common\utf8.cpp"> - <Filter>Source\Common</Filter> + <ClCompile Include="..\..\..\src\libjin\Graphics\je_mesh.cpp"> + <Filter>Source\graphics</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Filesystem\Filesystem.cpp"> - <Filter>Source\Filesystem</Filter> + <ClCompile Include="..\..\..\src\libjin\Graphics\je_bitmap.cpp"> + <Filter>Source\graphics</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Input\Event.cpp"> - <Filter>Source\Input</Filter> + <ClCompile Include="..\..\..\src\libjin\Graphics\je_window.cpp"> + <Filter>Source\graphics</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Input\Joypad.cpp"> - <Filter>Source\Input</Filter> + <ClCompile Include="..\..\..\src\libjin\Graphics\je_texture.cpp"> + <Filter>Source\graphics</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Input\Keyboard.cpp"> - <Filter>Source\Input</Filter> + <ClCompile Include="..\..\..\src\libjin\Graphics\je_sprite.cpp"> + <Filter>Source\graphics</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Input\Mouse.cpp"> - <Filter>Source\Input</Filter> + <ClCompile Include="..\..\..\src\libjin\Graphics\je_shapes.cpp"> + <Filter>Source\graphics</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Math\Matrix.cpp"> - <Filter>Source\Math</Filter> + <ClCompile Include="..\..\..\src\libjin\Graphics\je_gl.cpp"> + <Filter>Source\graphics</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Net\Net.cpp"> - <Filter>Source\Net</Filter> + <ClCompile Include="..\..\..\src\libjin\Graphics\je_image.cpp"> + <Filter>Source\graphics</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Net\Socket.cpp"> - <Filter>Source\Net</Filter> + <ClCompile Include="..\..\..\src\libjin\Graphics\je_drawable.cpp"> + <Filter>Source\graphics</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Thread\Thread.cpp"> - <Filter>Source\Thread</Filter> + <ClCompile Include="..\..\..\src\libjin\Graphics\je_color.cpp"> + <Filter>Source\graphics</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Utils\Log.cpp"> - <Filter>Source\Utils</Filter> + <ClCompile Include="..\..\..\src\libjin\Graphics\je_canvas.cpp"> + <Filter>Source\graphics</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Utils\unittest.cpp"> - <Filter>Source\Utils</Filter> + <ClCompile Include="..\..\..\src\libjin\Graphics\Shader\je_shader.cpp"> + <Filter>Source\graphics\shader</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\3rdparty\GLee\GLee.c"> - <Filter>Source\3rdparty\GLee</Filter> + <ClCompile Include="..\..\..\src\libjin\Graphics\Font\je_decoder.cpp"> + <Filter>Source\graphics\font</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\3rdparty\stb\stb_vorbis.c"> - <Filter>Source\3rdparty\stb</Filter> + <ClCompile Include="..\..\..\src\libjin\Graphics\Font\je_text.cpp"> + <Filter>Source\graphics\font</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\3rdparty\wav\wav.c"> - <Filter>Source\3rdparty\wav</Filter> + <ClCompile Include="..\..\..\src\libjin\Graphics\Font\je_texture_font.cpp"> + <Filter>Source\graphics\font</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\3rdparty\tekcos\tekcos.c"> - <Filter>Source\3rdparty\tekcos</Filter> + <ClCompile Include="..\..\..\src\libjin\Graphics\Font\je_ttf.cpp"> + <Filter>Source\graphics\font</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\3rdparty\smount\smount.c"> - <Filter>Source\3rdparty\smount</Filter> + <ClCompile Include="..\..\..\src\libjin\Utils\je_unittest.cpp"> + <Filter>Source\utils</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Time\Timer.cpp"> - <Filter>Source\Time</Filter> + <ClCompile Include="..\..\..\src\libjin\Utils\je_log.cpp"> + <Filter>Source\utils</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Game\Game.cpp"> - <Filter>Source\Game</Filter> + <ClCompile Include="..\..\..\src\libjin\Time\je_timer.cpp"> + <Filter>Source\time</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Common\Exception.cpp"> - <Filter>Source\Common</Filter> + <ClCompile Include="..\..\..\src\libjin\Thread\je_thread.cpp"> + <Filter>Source\thread</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Graphics\Font\Decoder.cpp"> - <Filter>Source\Graphics\Font</Filter> + <ClCompile Include="..\..\..\src\libjin\Net\je_socket.cpp"> + <Filter>Source\net</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Graphics\Font\Text.cpp"> - <Filter>Source\Graphics\Font</Filter> + <ClCompile Include="..\..\..\src\libjin\Net\je_net.cpp"> + <Filter>Source\net</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Graphics\Font\TextureFont.cpp"> - <Filter>Source\Graphics\Font</Filter> + <ClCompile Include="..\..\..\src\libjin\Math\je_matrix.cpp"> + <Filter>Source\math</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Graphics\Font\TTF.cpp"> - <Filter>Source\Graphics\Font</Filter> + <ClCompile Include="..\..\..\src\libjin\Input\je_mouse.cpp"> + <Filter>Source\input</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Graphics\Bitmap.cpp"> - <Filter>Source\Graphics</Filter> + <ClCompile Include="..\..\..\src\libjin\Input\je_keyboard.cpp"> + <Filter>Source\input</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Graphics\Canvas.cpp"> - <Filter>Source\Graphics</Filter> + <ClCompile Include="..\..\..\src\libjin\Input\je_joypad.cpp"> + <Filter>Source\input</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Graphics\Color.cpp"> - <Filter>Source\Graphics</Filter> + <ClCompile Include="..\..\..\src\libjin\Input\je_event.cpp"> + <Filter>Source\input</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Graphics\Drawable.cpp"> - <Filter>Source\Graphics</Filter> + <ClCompile Include="..\..\..\src\libjin\Game\je_game.cpp"> + <Filter>Source\game</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Graphics\Image.cpp"> - <Filter>Source\Graphics</Filter> + <ClCompile Include="..\..\..\src\libjin\Filesystem\je_filesystem.cpp"> + <Filter>Source\filesystem</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Graphics\Mesh.cpp"> - <Filter>Source\Graphics</Filter> + <ClCompile Include="..\..\..\src\libjin\Common\je_exception.cpp"> + <Filter>Source\common</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Graphics\OpenGL.cpp"> - <Filter>Source\Graphics</Filter> + <ClCompile Include="..\..\..\src\libjin\Common\je_object.cpp"> + <Filter>Source\common</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Graphics\Shapes.cpp"> - <Filter>Source\Graphics</Filter> + <ClCompile Include="..\..\..\src\libjin\Common\je_utf8.cpp"> + <Filter>Source\common</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Graphics\Sprite.cpp"> - <Filter>Source\Graphics</Filter> + <ClCompile Include="..\..\..\src\libjin\Audio\je_source.cpp"> + <Filter>Source\audio</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Graphics\Texture.cpp"> - <Filter>Source\Graphics</Filter> + <ClCompile Include="..\..\..\src\libjin\Audio\je_audio.cpp"> + <Filter>Source\audio</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Graphics\Window.cpp"> - <Filter>Source\Graphics</Filter> + <ClCompile Include="..\..\..\src\libjin\Audio\SDL\je_sdl_source.cpp"> + <Filter>Source\audio\sdl</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Graphics\Shader\Shader.cpp"> - <Filter>Source\Graphics\Shader</Filter> + <ClCompile Include="..\..\..\src\libjin\Audio\SDL\je_sdl_audio.cpp"> + <Filter>Source\audio\sdl</Filter> </ClCompile> </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/libjin/Audio/SDL/je_sdl_audio.h b/src/libjin/Audio/SDL/je_sdl_audio.h index c64b109..4ce3756 100644 --- a/src/libjin/Audio/SDL/je_sdl_audio.h +++ b/src/libjin/Audio/SDL/je_sdl_audio.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_AUDIO_SDL_H -#define __LIBJIN_AUDIO_SDL_H +#ifndef __JE_AUDIO_SDL_H +#define __JE_AUDIO_SDL_H #include "../../core/je_configuration.h" #if LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO @@ -59,4 +59,4 @@ namespace jin } // namespace jin #endif // LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO -#endif // __LIBJIN_AUDIO_SDL_H +#endif // __JE_AUDIO_SDL_H diff --git a/src/libjin/Audio/SDL/je_sdl_source.h b/src/libjin/Audio/SDL/je_sdl_source.h index 15676d6..1d055bf 100644 --- a/src/libjin/Audio/SDL/je_sdl_source.h +++ b/src/libjin/Audio/SDL/je_sdl_source.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_SOURCE_SDL_H -#define __LIBJIN_SOURCE_SDL_H +#ifndef __JE_SOURCE_SDL_H +#define __JE_SOURCE_SDL_H #include "../../core/je_configuration.h" #if LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO @@ -104,4 +104,4 @@ namespace jin } // namespace jin #endif // LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO -#endif // __LIBJIN_SOURCE_SDL_H +#endif // __JE_SOURCE_SDL_H diff --git a/src/libjin/Audio/je_audio.h b/src/libjin/Audio/je_audio.h index 341e4c9..4dd8007 100644 --- a/src/libjin/Audio/je_audio.h +++ b/src/libjin/Audio/je_audio.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_AUDIO_H -#define __LIBJIN_AUDIO_H +#ifndef __JE_AUDIO_H +#define __JE_AUDIO_H #include "../core/je_configuration.h" #if LIBJIN_MODULES_AUDIO @@ -50,4 +50,4 @@ namespace jin } // namespace jin #endif // LIBJIN_MODULES_AUDIO -#endif // __LIBJIN_AUDIO_H +#endif // __JE_AUDIO_H diff --git a/src/libjin/Audio/je_source.h b/src/libjin/Audio/je_source.h index bcac214..07cfee5 100644 --- a/src/libjin/Audio/je_source.h +++ b/src/libjin/Audio/je_source.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_AUDIO_SOURCE_H -#define __LIBJIN_AUDIO_SOURCE_H +#ifndef __JE_AUDIO_SOURCE_H +#define __JE_AUDIO_SOURCE_H #include "../core/je_configuration.h" #if LIBJIN_MODULES_AUDIO @@ -44,4 +44,4 @@ namespace jin } // namespace jin #endif // LIBJIN_MODULES_AUDIO -#endif // __LIBJIN_AUDIO_SOURCE_H +#endif // __JE_AUDIO_SOURCE_H diff --git a/src/libjin/Common/je_array.hpp b/src/libjin/Common/je_array.hpp index eadd36f..6708378 100644 --- a/src/libjin/Common/je_array.hpp +++ b/src/libjin/Common/je_array.hpp @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_COMMON_ARRAY_H -#define __LIBJIN_COMMON_ARRAY_H +#ifndef __JE_COMMON_ARRAY_H +#define __JE_COMMON_ARRAY_H namespace jin { diff --git a/src/libjin/Common/je_common.h b/src/libjin/Common/je_common.h index 63528b0..0dfa79a 100644 --- a/src/libjin/Common/je_common.h +++ b/src/libjin/Common/je_common.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_COMMON_H -#define __LIBJIN_COMMON_H +#ifndef __JE_COMMON_H +#define __JE_COMMON_H #include "je_array.hpp" diff --git a/src/libjin/Common/je_object.h b/src/libjin/Common/je_object.h index c4bf225..1f11936 100644 --- a/src/libjin/Common/je_object.h +++ b/src/libjin/Common/je_object.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_COMMON_OBJECT_H -#define __LIBJIN_COMMON_OBJECT_H +#ifndef __JE_COMMON_OBJECT_H +#define __JE_COMMON_OBJECT_H namespace jin { diff --git a/src/libjin/Common/je_singleton.hpp b/src/libjin/Common/je_singleton.hpp index 12b1450..c49184b 100644 --- a/src/libjin/Common/je_singleton.hpp +++ b/src/libjin/Common/je_singleton.hpp @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_SINGLETON_H -#define __LIBJIN_SINGLETON_H +#ifndef __JE_SINGLETON_H +#define __JE_SINGLETON_H namespace jin { @@ -34,4 +34,4 @@ namespace jin } // namespace jin -#endif // __LIBJIN_SINGLETON_H
\ No newline at end of file +#endif // __JE_SINGLETON_H
\ No newline at end of file diff --git a/src/libjin/Common/je_stringmap.hpp b/src/libjin/Common/je_stringmap.hpp index 641e32d..a4c24a9 100644 --- a/src/libjin/Common/je_stringmap.hpp +++ b/src/libjin/Common/je_stringmap.hpp @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_COMMON_SREINGMAP_H -#define __LIBJIN_COMMON_SREINGMAP_H +#ifndef __JE_COMMON_SREINGMAP_H +#define __JE_COMMON_SREINGMAP_H namespace jin { diff --git a/src/libjin/Common/je_subsystem.hpp b/src/libjin/Common/je_subsystem.hpp index 2875058..ecfab20 100644 --- a/src/libjin/Common/je_subsystem.hpp +++ b/src/libjin/Common/je_subsystem.hpp @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_COMMON_SUBSYSTEM_H -#define __LIBJIN_COMMON_SUBSYSTEM_H +#ifndef __JE_COMMON_SUBSYSTEM_H +#define __JE_COMMON_SUBSYSTEM_H #include "../utils/je_macros.h" diff --git a/src/libjin/Common/je_types.h b/src/libjin/Common/je_types.h index 2d257c3..fb11181 100644 --- a/src/libjin/Common/je_types.h +++ b/src/libjin/Common/je_types.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_TYPES_H -#define __LIBJIN_TYPES_H +#ifndef __JE_TYPES_H +#define __JE_TYPES_H #include <stdint.h> namespace jin diff --git a/src/libjin/Common/je_utf8.h b/src/libjin/Common/je_utf8.h index 0193abd..00eaab5 100644 --- a/src/libjin/Common/je_utf8.h +++ b/src/libjin/Common/je_utf8.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_COMMON_UTF8_H -#define __LIBJIN_COMMON_UTF8_H +#ifndef __JE_COMMON_UTF8_H +#define __JE_COMMON_UTF8_H #include "../core/je_configuration.h" #if LIBJIN_OS == LIBJIN_WINDOWS @@ -28,4 +28,4 @@ namespace jin } // namespace jin #endif // LIBJIN_OS == LIBJIN_WINDOWS -#endif // __LIBJIN_COMMON_UTF8_H +#endif // __JE_COMMON_UTF8_H diff --git a/src/libjin/Filesystem/je_buffer.h b/src/libjin/Filesystem/je_buffer.h index f0d987a..6ac9f4a 100644 --- a/src/libjin/Filesystem/je_buffer.h +++ b/src/libjin/Filesystem/je_buffer.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_BUFFER_H -#define __LIBJIN_BUFFER_H +#ifndef __JE_BUFFER_H +#define __JE_BUFFER_H #include <string.h> #include <stdlib.h> diff --git a/src/libjin/Game/je_game.h b/src/libjin/Game/je_game.h index 9323177..5225ed7 100644 --- a/src/libjin/Game/je_game.h +++ b/src/libjin/Game/je_game.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_CORE_GAME_H -#define __LIBJIN_CORE_GAME_H +#ifndef __JE_CORE_GAME_H +#define __JE_CORE_GAME_H #include "../common/je_subsystem.hpp" #include "../utils/je_macros.h" @@ -55,4 +55,4 @@ namespace jin } // namespace core } // namespace jin -#endif // __LIBJIN_CORE_GAME_H +#endif // __JE_CORE_GAME_H diff --git a/src/libjin/Graphics/Font/je_decoder.h b/src/libjin/Graphics/Font/je_decoder.h index e95f7c3..6a69c21 100644 --- a/src/libjin/Graphics/Font/je_decoder.h +++ b/src/libjin/Graphics/Font/je_decoder.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_UTF8_H -#define __LIBJIN_UTF8_H +#ifndef __JE_UTF8_H +#define __JE_UTF8_H #include <vector> diff --git a/src/libjin/Graphics/Font/je_font.h b/src/libjin/Graphics/Font/je_font.h index 9fde723..0601713 100644 --- a/src/libjin/Graphics/Font/je_font.h +++ b/src/libjin/Graphics/Font/je_font.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_FONT_H -#define __LIBJIN_FONT_H +#ifndef __JE_FONT_H +#define __JE_FONT_H #include <vector> #include "je_text.h" diff --git a/src/libjin/Graphics/Font/je_page.h b/src/libjin/Graphics/Font/je_page.h index d887c9b..569780e 100644 --- a/src/libjin/Graphics/Font/je_page.h +++ b/src/libjin/Graphics/Font/je_page.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_PAGE_H -#define __LIBJIN_PAGE_H +#ifndef __JE_PAGE_H +#define __JE_PAGE_H #include "../../math/je_vector2.hpp" diff --git a/src/libjin/Graphics/Font/je_text.h b/src/libjin/Graphics/Font/je_text.h index 38e60ca..9d2dd95 100644 --- a/src/libjin/Graphics/Font/je_text.h +++ b/src/libjin/Graphics/Font/je_text.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_TEXT_H -#define __LIBJIN_TEXT_H +#ifndef __JE_TEXT_H +#define __JE_TEXT_H #include <vector> diff --git a/src/libjin/Graphics/Font/je_texture_font.h b/src/libjin/Graphics/Font/je_texture_font.h index fa3f72e..bfa4815 100644 --- a/src/libjin/Graphics/Font/je_texture_font.h +++ b/src/libjin/Graphics/Font/je_texture_font.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_TEXTURE_FONT_H -#define __LIBJIN_TEXTURE_FONT_H +#ifndef __JE_TEXTURE_FONT_H +#define __JE_TEXTURE_FONT_H #include <map> #include <vector> diff --git a/src/libjin/Graphics/Font/je_ttf.h b/src/libjin/Graphics/Font/je_ttf.h index f3761ac..5c44d26 100644 --- a/src/libjin/Graphics/Font/je_ttf.h +++ b/src/libjin/Graphics/Font/je_ttf.h @@ -1,5 +1,5 @@ -#ifndef __LIBJINTTF_H -#define __LIBJIN_TTF_H +#ifndef __JETTF_H +#define __JE_TTF_H #include "../../core/je_configuration.h" #if LIBJIN_MODULES_RENDER @@ -131,4 +131,4 @@ namespace jin #endif // LIBJIN_MODULES_RENDER -#endif // __LIBJIN_FONT_H
\ No newline at end of file +#endif // __JE_FONT_H
\ No newline at end of file diff --git a/src/libjin/Graphics/Shader/je_base.shader.h b/src/libjin/Graphics/Shader/je_base.shader.h index 45b63cd..0616751 100644 --- a/src/libjin/Graphics/Shader/je_base.shader.h +++ b/src/libjin/Graphics/Shader/je_base.shader.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_BASE_SHADER_H -#define __LIBJIN_BASE_SHADER_H +#ifndef __JE_BASE_SHADER_H +#define __JE_BASE_SHADER_H static const char* base_shared = R"( #define Number float diff --git a/src/libjin/Graphics/Shader/je_shader.h b/src/libjin/Graphics/Shader/je_shader.h index bcee584..5145f85 100644 --- a/src/libjin/Graphics/Shader/je_shader.h +++ b/src/libjin/Graphics/Shader/je_shader.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_SHADER_H -#define __LIBJIN_SHADER_H +#ifndef __JE_SHADER_H +#define __JE_SHADER_H #include "../../core/je_configuration.h" #if defined(jin_graphics) && defined(jin_graphics_shader) @@ -197,4 +197,4 @@ namespace jin #endif // jin_graphics && jin_graphics_shader -#endif // __LIBJIN_SHADER_H
\ No newline at end of file +#endif // __JE_SHADER_H
\ No newline at end of file diff --git a/src/libjin/Graphics/je_bitmap.h b/src/libjin/Graphics/je_bitmap.h index b9747f2..92ab836 100644 --- a/src/libjin/Graphics/je_bitmap.h +++ b/src/libjin/Graphics/je_bitmap.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_BITMAP_H -#define __LIBJIN_BITMAP_H +#ifndef __JE_BITMAP_H +#define __JE_BITMAP_H #include "../core/je_configuration.h" #if LIBJIN_MODULES_RENDER diff --git a/src/libjin/Graphics/je_canvas.h b/src/libjin/Graphics/je_canvas.h index 12611d9..5a44e87 100644 --- a/src/libjin/Graphics/je_canvas.h +++ b/src/libjin/Graphics/je_canvas.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_CANVAS_H -#define __LIBJIN_CANVAS_H +#ifndef __JE_CANVAS_H +#define __JE_CANVAS_H #include "../core/je_configuration.h" #if LIBJIN_MODULES_RENDER @@ -63,4 +63,4 @@ namespace jin } // namespace jin #endif // LIBJIN_MODULES_RENDER -#endif // __LIBJIN_CANVAS_H
\ No newline at end of file +#endif // __JE_CANVAS_H
\ No newline at end of file diff --git a/src/libjin/Graphics/je_color.h b/src/libjin/Graphics/je_color.h index b13d882..675d25e 100644 --- a/src/libjin/Graphics/je_color.h +++ b/src/libjin/Graphics/je_color.h @@ -1,8 +1,8 @@ /** * Some color operating here. */ -#ifndef __LIBJIN_COLOR_H -#define __LIBJIN_COLOR_H +#ifndef __JE_COLOR_H +#define __JE_COLOR_H #include "../core/je_configuration.h" #if LIBJIN_MODULES_RENDER @@ -82,4 +82,4 @@ namespace jin } // namespace jin #endif // LIBJIN_MODULES_RENDER -#endif // __LIBJIN_COLOR_H
\ No newline at end of file +#endif // __JE_COLOR_H
\ No newline at end of file diff --git a/src/libjin/Graphics/je_drawable.h b/src/libjin/Graphics/je_drawable.h index 13464f0..f31f3d7 100644 --- a/src/libjin/Graphics/je_drawable.h +++ b/src/libjin/Graphics/je_drawable.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_DRAWABLE -#define __LIBJIN_DRAWABLE +#ifndef __JE_DRAWABLE +#define __JE_DRAWABLE #include "../core/je_configuration.h" #if LIBJIN_MODULES_RENDER @@ -87,4 +87,4 @@ namespace jin } // namespace jin #endif // LIBJIN_MODULES_RENDER -#endif // __LIBJIN_DRAWABLE
\ No newline at end of file +#endif // __JE_DRAWABLE
\ No newline at end of file diff --git a/src/libjin/Graphics/je_gl.h b/src/libjin/Graphics/je_gl.h index 296b8aa..2b76162 100644 --- a/src/libjin/Graphics/je_gl.h +++ b/src/libjin/Graphics/je_gl.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_OPENGL_H -#define __LIBJIN_OPENGL_H +#ifndef __JE_OPENGL_H +#define __JE_OPENGL_H #include "../3rdparty/GLee/GLee.h" #include "../3rdparty/ogl/OpenGL.h" diff --git a/src/libjin/Graphics/je_graphics.h b/src/libjin/Graphics/je_graphics.h index 6f099cd..8c964c3 100644 --- a/src/libjin/Graphics/je_graphics.h +++ b/src/libjin/Graphics/je_graphics.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_GRAPHICS_H -#define __LIBJIN_GRAPHICS_H +#ifndef __JE_GRAPHICS_H +#define __JE_GRAPHICS_H #include "../core/je_configuration.h" #if LIBJIN_MODULES_RENDER @@ -18,4 +18,4 @@ #include "font/je_texture_font.h" #endif // LIBJIN_MODULES_RENDER -#endif // __LIBJIN_GRAPHICS_H
\ No newline at end of file +#endif // __JE_GRAPHICS_H
\ No newline at end of file diff --git a/src/libjin/Graphics/je_image.h b/src/libjin/Graphics/je_image.h index 5c06258..adb9cde 100644 --- a/src/libjin/Graphics/je_image.h +++ b/src/libjin/Graphics/je_image.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_IMAGE_H -#define __LIBJIN_IMAGE_H +#ifndef __JE_IMAGE_H +#define __JE_IMAGE_H #include "je_bitmap.h" diff --git a/src/libjin/Graphics/je_mesh.h b/src/libjin/Graphics/je_mesh.h index 66727e4..e85344c 100644 --- a/src/libjin/Graphics/je_mesh.h +++ b/src/libjin/Graphics/je_mesh.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_MESH_H -#define __LIBJIN_MESH_H +#ifndef __JE_MESH_H +#define __JE_MESH_H namespace jin { diff --git a/src/libjin/Graphics/je_shapes.h b/src/libjin/Graphics/je_shapes.h index 32b5284..bb2da25 100644 --- a/src/libjin/Graphics/je_shapes.h +++ b/src/libjin/Graphics/je_shapes.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_GEOMETRY_H -#define __LIBJIN_GEOMETRY_H +#ifndef __JE_GEOMETRY_H +#define __JE_GEOMETRY_H #include "../core/je_configuration.h" #if LIBJIN_MODULES_RENDER @@ -34,4 +34,4 @@ namespace jin } // namespace jin #endif // LIBJIN_MODULES_RENDER -#endif // __LIBJIN_GEOMETRY_H
\ No newline at end of file +#endif // __JE_GEOMETRY_H
\ No newline at end of file diff --git a/src/libjin/Graphics/je_sprite.h b/src/libjin/Graphics/je_sprite.h index 7a4e53a..e0bf6fa 100644 --- a/src/libjin/Graphics/je_sprite.h +++ b/src/libjin/Graphics/je_sprite.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_SPRITE_H -#define __LIBJIN_SPRITE_H +#ifndef __JE_SPRITE_H +#define __JE_SPRITE_H namespace jin { diff --git a/src/libjin/Graphics/je_texture.h b/src/libjin/Graphics/je_texture.h index 30c5063..a58f1db 100644 --- a/src/libjin/Graphics/je_texture.h +++ b/src/libjin/Graphics/je_texture.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_TEXTURE_H -#define __LIBJIN_TEXTURE_H +#ifndef __JE_TEXTURE_H +#define __JE_TEXTURE_H #include "../core/je_configuration.h" #if defined(jin_graphics) @@ -42,4 +42,4 @@ namespace jin #endif // jin_graphics -#endif // __LIBJIN_TEXTURE_H
\ No newline at end of file +#endif // __JE_TEXTURE_H
\ No newline at end of file diff --git a/src/libjin/Graphics/je_window.h b/src/libjin/Graphics/je_window.h index 995d8b0..08a9c59 100644 --- a/src/libjin/Graphics/je_window.h +++ b/src/libjin/Graphics/je_window.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_RENDER_WINDOW -#define __LIBJIN_RENDER_WINDOW +#ifndef __JE_RENDER_WINDOW +#define __JE_RENDER_WINDOW #include "../core/je_configuration.h" #if defined(jin_graphics) @@ -93,4 +93,4 @@ namespace jin #endif // jin_graphics -#endif // __LIBJIN_RENDER_WINDOW
\ No newline at end of file +#endif // __JE_RENDER_WINDOW
\ No newline at end of file diff --git a/src/libjin/Input/je_event.h b/src/libjin/Input/je_event.h index d8ceda0..e39032e 100644 --- a/src/libjin/Input/je_event.h +++ b/src/libjin/Input/je_event.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_EVENT_H -#define __LIBJIN_EVENT_H +#ifndef __JE_EVENT_H +#define __JE_EVENT_H #include "../core/je_configuration.h" #if LIBJIN_MODULES_INPUT diff --git a/src/libjin/Input/je_input.h b/src/libjin/Input/je_input.h index 2f6a895..8c7faf7 100644 --- a/src/libjin/Input/je_input.h +++ b/src/libjin/Input/je_input.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_INPUT_H -#define __LIBJIN_INPUT_H +#ifndef __JE_INPUT_H +#define __JE_INPUT_H #include "je_event.h" #include "je_keyboard.h" diff --git a/src/libjin/Input/je_joypad.h b/src/libjin/Input/je_joypad.h index 570699e..a163dca 100644 --- a/src/libjin/Input/je_joypad.h +++ b/src/libjin/Input/je_joypad.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_JOYPAD_H -#define __LIBJIN_JOYPAD_H +#ifndef __JE_JOYPAD_H +#define __JE_JOYPAD_H #include <SDL2/SDL.h> diff --git a/src/libjin/Input/je_keyboard.h b/src/libjin/Input/je_keyboard.h index 60f1169..2b9ea38 100644 --- a/src/libjin/Input/je_keyboard.h +++ b/src/libjin/Input/je_keyboard.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_KEYBOARD_H -#define __LIBJIN_KEYBOARD_H +#ifndef __JE_KEYBOARD_H +#define __JE_KEYBOARD_H namespace jin { @@ -14,4 +14,4 @@ namespace jin } // namespace input } // namespace jin -#endif // __LIBJIN_KEYBOARD_H
\ No newline at end of file +#endif // __JE_KEYBOARD_H
\ No newline at end of file diff --git a/src/libjin/Input/je_mouse.h b/src/libjin/Input/je_mouse.h index e9fab42..f229ed1 100644 --- a/src/libjin/Input/je_mouse.h +++ b/src/libjin/Input/je_mouse.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_MOUSE_H -#define __LIBJIN_MOUSE_H +#ifndef __JE_MOUSE_H +#define __JE_MOUSE_H #include "../core/je_configuration.h" #ifdef LIBJIN_MODULES_INPUT @@ -28,4 +28,4 @@ namespace jin } // namespace jin #endif // LIBJIN_MODULES_INPUT -#endif // __LIBJIN_MOUSE_H
\ No newline at end of file +#endif // __JE_MOUSE_H
\ No newline at end of file diff --git a/src/libjin/Math/je_constant.h b/src/libjin/Math/je_constant.h index f8e0f5a..5ab126c 100644 --- a/src/libjin/Math/je_constant.h +++ b/src/libjin/Math/je_constant.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_MATH_CONSTANT_H -#define __LIBJIN_MATH_CONSTANT_H +#ifndef __JE_MATH_CONSTANT_H +#define __JE_MATH_CONSTANT_H #define PI 3.1415926f diff --git a/src/libjin/Math/je_math.h b/src/libjin/Math/je_math.h index b6a2ffd..66cb2d6 100644 --- a/src/libjin/Math/je_math.h +++ b/src/libjin/Math/je_math.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_UTILS_MATH_H -#define __LIBJIN_UTILS_MATH_H +#ifndef __JE_UTILS_MATH_H +#define __JE_UTILS_MATH_H #include "je_constant.h" #include "je_matrix.h" diff --git a/src/libjin/Math/je_matrix.h b/src/libjin/Math/je_matrix.h index 1fe6ab1..f478d70 100644 --- a/src/libjin/Math/je_matrix.h +++ b/src/libjin/Math/je_matrix.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_MATRIX_H -#define __LIBJIN_MATRIX_H +#ifndef __JE_MATRIX_H +#define __JE_MATRIX_H namespace jin { diff --git a/src/libjin/Math/je_quad.h b/src/libjin/Math/je_quad.h index 6eb4f45..3f6c26d 100644 --- a/src/libjin/Math/je_quad.h +++ b/src/libjin/Math/je_quad.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_QUAD_H -#define __LIBJIN_QUAD_H +#ifndef __JE_QUAD_H +#define __JE_QUAD_H namespace jin { diff --git a/src/libjin/Math/je_vector2.hpp b/src/libjin/Math/je_vector2.hpp index 51ac4a7..7ebe307 100644 --- a/src/libjin/Math/je_vector2.hpp +++ b/src/libjin/Math/je_vector2.hpp @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_VECTOR_H -#define __LIBJIN_VECTOR_H +#ifndef __JE_VECTOR_H +#define __JE_VECTOR_H namespace jin { diff --git a/src/libjin/Math/je_vector3.hpp b/src/libjin/Math/je_vector3.hpp index 96d4e9a..d200898 100644 --- a/src/libjin/Math/je_vector3.hpp +++ b/src/libjin/Math/je_vector3.hpp @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_VECTOR3_H -#define __LIBJIN_VECTOR3_H +#ifndef __JE_VECTOR3_H +#define __JE_VECTOR3_H namespace jin { diff --git a/src/libjin/Math/je_vector4.hpp b/src/libjin/Math/je_vector4.hpp index 35be056..81b343f 100644 --- a/src/libjin/Math/je_vector4.hpp +++ b/src/libjin/Math/je_vector4.hpp @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_VECTOR4_H -#define __LIBJIN_VECTOR4_H +#ifndef __JE_VECTOR4_H +#define __JE_VECTOR4_H namespace jin { diff --git a/src/libjin/Net/je_net.h b/src/libjin/Net/je_net.h index 7718085..6ed018a 100644 --- a/src/libjin/Net/je_net.h +++ b/src/libjin/Net/je_net.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_NET_H -#define __LIBJIN_NET_H +#ifndef __JE_NET_H +#define __JE_NET_H #include "../core/je_configuration.h" #if LIBJIN_MODULES_NET @@ -29,4 +29,4 @@ namespace jin } // namespace jin #endif // LIBJIN_MODULES_NET -#endif // __LIBJIN_NET_H +#endif // __JE_NET_H diff --git a/src/libjin/Net/je_socket.h b/src/libjin/Net/je_socket.h index ab6a561..e360d72 100644 --- a/src/libjin/Net/je_socket.h +++ b/src/libjin/Net/je_socket.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_NET_SOCKET_H -#define __LIBJIN_NET_SOCKET_H +#ifndef __JE_NET_SOCKET_H +#define __JE_NET_SOCKET_H #include "../core/je_configuration.h" #if LIBJIN_MODULES_NET @@ -59,4 +59,4 @@ namespace jin } // namespace jin #endif // LIBJIN_MODULES_NET -#endif // __LIBJIN_NET_SOCKET_H +#endif // __JE_NET_SOCKET_H diff --git a/src/libjin/Thread/je_thread.h b/src/libjin/Thread/je_thread.h index bdbc093..ddba541 100644 --- a/src/libjin/Thread/je_thread.h +++ b/src/libjin/Thread/je_thread.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_THREAD_H -#define __LIBJIN_THREAD_H +#ifndef __JE_THREAD_H +#define __JE_THREAD_H #include "../core/je_configuration.h" #if LIBJIN_MODULES_THREAD @@ -163,4 +163,4 @@ namespace jin } // namespace jin #endif // LIBJIN_MODULES_THREAD -#endif // __LIBJIN_THREAD_H
\ No newline at end of file +#endif // __JE_THREAD_H
\ No newline at end of file diff --git a/src/libjin/Time/je_timer.h b/src/libjin/Time/je_timer.h index c31de42..12d3101 100644 --- a/src/libjin/Time/je_timer.h +++ b/src/libjin/Time/je_timer.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_TIMER_H -#define __LIBJIN_TIMER_H +#ifndef __JE_TIMER_H +#define __JE_TIMER_H #include "../core/je_configuration.h" #if LIBJIN_MODULES_TIME @@ -74,4 +74,4 @@ namespace jin } // namespace jin #endif // LIBJIN_MODULES_TIME -#endif // __LIBJIN_TIMER_H +#endif // __JE_TIMER_H diff --git a/src/libjin/Utils/je_macros.h b/src/libjin/Utils/je_macros.h index e19193c..475a482 100644 --- a/src/libjin/Utils/je_macros.h +++ b/src/libjin/Utils/je_macros.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_MACROS_H -#define __LIBJIN_MACROS_H +#ifndef __JE_MACROS_H +#define __JE_MACROS_H #include <cstring> //#define implement // ʵֽӿ diff --git a/src/libjin/Utils/je_utils.h b/src/libjin/Utils/je_utils.h index 583f892..21c507d 100644 --- a/src/libjin/Utils/je_utils.h +++ b/src/libjin/Utils/je_utils.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_UTILS_H -#define __LIBJIN_UTILS_H +#ifndef __JE_UTILS_H +#define __JE_UTILS_H #include "je_macros.h" #include "je_endian.h" diff --git a/src/libjin/core/je_configuration.h b/src/libjin/core/je_configuration.h index 55633a1..819b34d 100644 --- a/src/libjin/core/je_configuration.h +++ b/src/libjin/core/je_configuration.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_COMMON_MODULES_H -#define __LIBJIN_COMMON_MODULES_H +#ifndef __JE_COMMON_MODULES_H +#define __JE_COMMON_MODULES_H /* * ģģı룬Ҫģرղ */ diff --git a/src/libjin/core/je_types.h b/src/libjin/core/je_types.h index 71ba640..3c902cc 100644 --- a/src/libjin/core/je_types.h +++ b/src/libjin/core/je_types.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_CORE_TYPES_H -#define __LIBJIN_CORE_TYPES_H +#ifndef __JE_CORE_TYPES_H +#define __JE_CORE_TYPES_H #include <stdint.h> @@ -21,4 +21,4 @@ namespace jin } } -#endif // __LIBJIN_CORE_TYPES_H
\ No newline at end of file +#endif // __JE_CORE_TYPES_H
\ No newline at end of file diff --git a/src/libjin/jin.h b/src/libjin/jin.h index 0b6a416..ad328d4 100644 --- a/src/libjin/jin.h +++ b/src/libjin/jin.h @@ -1,5 +1,5 @@ -#ifndef __LIBJIN_H -#define __LIBJIN_H +#ifndef __JE_H +#define __JE_H #include "core/je_configuration.h" @@ -22,4 +22,4 @@ #define LIBJIN_RELEASE "Jin 0.1.1"; #define LIBJIN_VERSION_NUM 101; -#endif // __LIBJIN_H
\ No newline at end of file +#endif // __JE_H
\ No newline at end of file diff --git a/src/lua/modules/graphics/graphics.cpp b/src/lua/modules/graphics/graphics.cpp index 4ef2b56..31f6fba 100644 --- a/src/lua/modules/graphics/graphics.cpp +++ b/src/lua/modules/graphics/graphics.cpp @@ -1,18 +1,16 @@ -#include "lua/modules/luax.h" -#include "lua/modules/types.h" -#include "libjin/jin.h" -#include "lua/common/common.h" - #include <iostream> #include <fstream> -using namespace std; +#include "libjin/jin.h" +#include "lua/modules/luax.h" +#include "lua/modules/types.h" +#include "lua/common/common.h" namespace jin { namespace lua { - + using namespace std; using namespace jin::graphics; using jin::filesystem::Filesystem; using jin::filesystem::Buffer; @@ -655,8 +653,23 @@ namespace lua { Proxy* p = (Proxy*)luax_checktype(L, 1, JIN_GRAPHICS_BITMAP); Bitmap* bitmap = p->getObject<Bitmap>(); - Proxy* pt = (Proxy*)luax_checktype(L, 2, JIN_GRAPHICS_TEXT); - Text* text = pt->getObject<Text>(); + Text* text; + if (luax_istype(L, 2, JIN_GRAPHICS_TEXT)) + { + Proxy* pt = (Proxy*)luax_checktype(L, 2, JIN_GRAPHICS_TEXT); + text = pt->getObject<Text>(); + } + else if (luax_isstring(L, 2)) + { + unsigned len; + const char* str = luax_checklstring(L, 2, &len); + text = new Text(Encode::UTF8, str, len); + } + else + { + luax_typerror(L, 2, "Text or string"); + return 1; + } float cellh = luax_checknumber(L, 4); TextureFont* textureFont = nullptr; if (luax_istable(L, 3)) @@ -672,6 +685,16 @@ namespace lua float cellw = luax_checknumber(L, 3); textureFont = TextureFont::createTextureFont(bitmap, *text, cellw, cellh); } + else + { + luax_error(L, "bad arguments #3 to 'newTextureFont', need to be table or number"); + return 0; + } + if (luax_isstring(L, 2)) + { + // Delete temporary text. + delete text; + } Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_GRAPHICS_TEXTUREFONT, sizeof(Proxy)); proxy->bind(new Ref<TextureFont>(textureFont, JIN_GRAPHICS_TEXTUREFONT)); return 1; diff --git a/src/lua/modules/graphics/textureFont.cpp b/src/lua/modules/graphics/texture_font.cpp index 4cf5bdd..4cf5bdd 100644 --- a/src/lua/modules/graphics/textureFont.cpp +++ b/src/lua/modules/graphics/texture_font.cpp |