diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/libjin/Filesystem/je_asset_database.cpp | 5 | ||||
| -rw-r--r-- | src/libjin/Graphics/je_sprite.h | 4 | ||||
| -rw-r--r-- | src/lua/embed/embed.h | 44 |
3 files changed, 26 insertions, 27 deletions
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<std::string> 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<float> mPosition; - Math::Vector2<float> mOrigin; + Math::Vector2<int> mOrigin; Math::Vector2<float> 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 |