From d703eacde8198433d6b9acf59a98db183e1d6b64 Mon Sep 17 00:00:00 2001 From: chai Date: Thu, 25 Oct 2018 14:09:27 +0800 Subject: =?UTF-8?q?*=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/Jin.exe | Bin 504832 -> 504832 bytes build/vc++/3rdparty/GLee/GLee.vcxproj | 2 +- build/vc++/3rdparty/smount/smount.vcxproj | 2 +- build/vc++/3rdparty/stb/stb.vcxproj | 2 +- build/vc++/3rdparty/tekcos/tekcos.vcxproj | 2 +- build/vc++/3rdparty/wav/wav.vcxproj | 2 +- build/vc++/jin.vcxproj | 4 +-- build/vc++/jin/jin.vcxproj.user | 5 +++- build/vc++/libjin/libjin.vcxproj | 2 +- src/libjin/Filesystem/je_asset_database.cpp | 5 ++-- src/libjin/Graphics/je_sprite.h | 4 +-- src/lua/embed/embed.h | 44 ++++++++++++++-------------- 12 files changed, 38 insertions(+), 36 deletions(-) diff --git a/bin/Jin.exe b/bin/Jin.exe index 06d1e54..1ee05bf 100644 Binary files a/bin/Jin.exe and b/bin/Jin.exe differ diff --git a/build/vc++/3rdparty/GLee/GLee.vcxproj b/build/vc++/3rdparty/GLee/GLee.vcxproj index 007dc38..7efcdd2 100644 --- a/build/vc++/3rdparty/GLee/GLee.vcxproj +++ b/build/vc++/3rdparty/GLee/GLee.vcxproj @@ -78,7 +78,7 @@ Level3 - MinSpace + Disabled true false _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) diff --git a/build/vc++/3rdparty/smount/smount.vcxproj b/build/vc++/3rdparty/smount/smount.vcxproj index c174850..6b710f4 100644 --- a/build/vc++/3rdparty/smount/smount.vcxproj +++ b/build/vc++/3rdparty/smount/smount.vcxproj @@ -78,7 +78,7 @@ Level3 - MinSpace + Disabled true false _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) diff --git a/build/vc++/3rdparty/stb/stb.vcxproj b/build/vc++/3rdparty/stb/stb.vcxproj index 6cb9b3f..e6abf2a 100644 --- a/build/vc++/3rdparty/stb/stb.vcxproj +++ b/build/vc++/3rdparty/stb/stb.vcxproj @@ -78,7 +78,7 @@ Level3 - MinSpace + Disabled true false _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) diff --git a/build/vc++/3rdparty/tekcos/tekcos.vcxproj b/build/vc++/3rdparty/tekcos/tekcos.vcxproj index 3148e63..e8a5bd7 100644 --- a/build/vc++/3rdparty/tekcos/tekcos.vcxproj +++ b/build/vc++/3rdparty/tekcos/tekcos.vcxproj @@ -78,7 +78,7 @@ Level3 - MinSpace + Disabled true false _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) diff --git a/build/vc++/3rdparty/wav/wav.vcxproj b/build/vc++/3rdparty/wav/wav.vcxproj index bba56a1..ff62736 100644 --- a/build/vc++/3rdparty/wav/wav.vcxproj +++ b/build/vc++/3rdparty/wav/wav.vcxproj @@ -78,7 +78,7 @@ Level3 - MinSpace + Disabled true false _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) diff --git a/build/vc++/jin.vcxproj b/build/vc++/jin.vcxproj index b233e67..f512551 100644 --- a/build/vc++/jin.vcxproj +++ b/build/vc++/jin.vcxproj @@ -22,7 +22,7 @@ {A3E35ECA-62EB-45CE-8152-674FBC7F7A3B} jin 8.1 - libjin-lua + luaport @@ -89,7 +89,7 @@ $(IntDir)/%(RelativeDir)/ Size true - MinSpace + Disabled opengl32.lib;lua51.lib;SDL2main.lib;SDL2.lib;%(AdditionalDependencies) diff --git a/build/vc++/jin/jin.vcxproj.user b/build/vc++/jin/jin.vcxproj.user index be25078..8790539 100644 --- a/build/vc++/jin/jin.vcxproj.user +++ b/build/vc++/jin/jin.vcxproj.user @@ -1,4 +1,7 @@  - + + $(ProjectDir)..\..\..\bin + WindowsLocalDebugger + \ No newline at end of file diff --git a/build/vc++/libjin/libjin.vcxproj b/build/vc++/libjin/libjin.vcxproj index c993555..049f1d8 100644 --- a/build/vc++/libjin/libjin.vcxproj +++ b/build/vc++/libjin/libjin.vcxproj @@ -98,7 +98,7 @@ Level3 - MinSpace + Disabled true false _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) diff --git a/src/libjin/Filesystem/je_asset_database.cpp b/src/libjin/Filesystem/je_asset_database.cpp index ac547f0..f2c5681 100644 --- a/src/libjin/Filesystem/je_asset_database.cpp +++ b/src/libjin/Filesystem/je_asset_database.cpp @@ -73,12 +73,11 @@ namespace JinEngine { return smtexists(mSmt, path) == 0; } - +/* std::vector AssetDatabase::getFiles(const char* path, bool recursive) { - } - +*/ } // namespace Filesystem } // namespace JinEngine diff --git a/src/libjin/Graphics/je_sprite.h b/src/libjin/Graphics/je_sprite.h index 94c39cd..df8d6eb 100644 --- a/src/libjin/Graphics/je_sprite.h +++ b/src/libjin/Graphics/je_sprite.h @@ -18,7 +18,7 @@ namespace JinEngine class Sprite { public: - void setOrigin(float x, float y); + void setOrigin(int x, int y); void setPosition(int x, int y); void setScale(float x, float y); void setColor(Color color); @@ -35,7 +35,7 @@ namespace JinEngine /// Origin must be 0~1 float value. /// Math::Vector2 mPosition; - Math::Vector2 mOrigin; + Math::Vector2 mOrigin; Math::Vector2 mScale; Color mColor; Shader* mShader; diff --git a/src/lua/embed/embed.h b/src/lua/embed/embed.h index 18373c8..e343dcd 100644 --- a/src/lua/embed/embed.h +++ b/src/lua/embed/embed.h @@ -4,28 +4,26 @@ namespace JinEngine { -namespace embed -{ + namespace embed + { -#define embed(L, script, name)\ - if(luax_loadbuffer(L, script, strlen(script), name) == 0)\ - lua_call(L, 0, 0); + #define embed(L, script, name)\ + if(luax_loadbuffer(L, script, strlen(script), name) == 0)\ + lua_call(L, 0, 0); - /** - * embed structure. - */ - struct jin_Embed - { - const char* file, *source; - }; + /** + * embed structure. + */ + struct jin_Embed + { + const char* file, *source; + }; - static void boot(lua_State* L) - { // embed scripts - #include "graphics.lua.h" - #include "keyboard.lua.h" - #include "mouse.lua.h" - #include "boot.lua.h" + #include "graphics.lua.h" + #include "keyboard.lua.h" + #include "mouse.lua.h" + #include "boot.lua.h" // in order const jin_Embed scripts[] = { @@ -36,11 +34,13 @@ namespace embed { 0, 0 } }; - for (int i = 0; scripts[i].file; ++i) - embed(L, scripts[i].source, scripts[i].file); - } + static void boot(lua_State* L) + { + for (int i = 0; scripts[i].file; ++i) + embed(L, scripts[i].source, scripts[i].file); + } -} // embed + } // embed } // namespace JinEngine #endif \ No newline at end of file -- cgit v1.1-26-g67d0