diff options
| author | chai <chaifix@163.com> | 2018-10-30 08:27:01 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2018-10-30 08:27:01 +0800 |
| commit | 7bc154b43769f36e1148a0870858ed7ec1267d6b (patch) | |
| tree | dfea24663ec094ab1f71c9e9ff1f0dac014778cb | |
| parent | a24f5572a38caa47a19c1f8a9bcea43d7ed88d1e (diff) | |
*格式化代码
| -rw-r--r-- | bin/Jin.exe | bin | 843264 -> 843264 bytes | |||
| -rw-r--r-- | bin/SDL2.dll | bin | 771072 -> 771072 bytes | |||
| -rw-r--r-- | src/3rdparty/buildvm/buildvm.exe | bin | 62976 -> 62976 bytes | |||
| -rw-r--r-- | src/3rdparty/minilua/minilua.exe | bin | 112640 -> 112640 bytes | |||
| -rw-r--r-- | src/jin/main.cpp | 2 | ||||
| -rw-r--r-- | src/libjin/Graphics/je_image.cpp | 4 | ||||
| -rw-r--r-- | src/lua/modules/graphics/je_lua_graphics.cpp | 4 | ||||
| -rw-r--r-- | src/lua/modules/graphics/je_lua_texture.cpp | 4 |
8 files changed, 7 insertions, 7 deletions
diff --git a/bin/Jin.exe b/bin/Jin.exe Binary files differindex 72487e2..310988c 100644 --- a/bin/Jin.exe +++ b/bin/Jin.exe diff --git a/bin/SDL2.dll b/bin/SDL2.dll Binary files differindex 8036cbe..758547a 100644 --- a/bin/SDL2.dll +++ b/bin/SDL2.dll diff --git a/src/3rdparty/buildvm/buildvm.exe b/src/3rdparty/buildvm/buildvm.exe Binary files differindex 3f7515a..542418c 100644 --- a/src/3rdparty/buildvm/buildvm.exe +++ b/src/3rdparty/buildvm/buildvm.exe diff --git a/src/3rdparty/minilua/minilua.exe b/src/3rdparty/minilua/minilua.exe Binary files differindex f902b70..538cc53 100644 --- a/src/3rdparty/minilua/minilua.exe +++ b/src/3rdparty/minilua/minilua.exe diff --git a/src/jin/main.cpp b/src/jin/main.cpp index 029436d..d4f08a0 100644 --- a/src/jin/main.cpp +++ b/src/jin/main.cpp @@ -8,8 +8,8 @@ #include "libjin/jin.h" #include <Windows.h> -using namespace JinEngine::Lua; using namespace JinEngine::Filesystem; +using namespace JinEngine::Lua; static void setParamters(lua_State* L, int argc, char* args[]) { diff --git a/src/libjin/Graphics/je_image.cpp b/src/libjin/Graphics/je_image.cpp index 171bba0..6baf16d 100644 --- a/src/libjin/Graphics/je_image.cpp +++ b/src/libjin/Graphics/je_image.cpp @@ -1,7 +1,7 @@ -#include "stb/stb_image.h" - #include "../filesystem/je_asset_database.h" +#include "stb/stb_image.h" + #include "je_image.h" namespace JinEngine diff --git a/src/lua/modules/graphics/je_lua_graphics.cpp b/src/lua/modules/graphics/je_lua_graphics.cpp index 7c417a5..90e4533 100644 --- a/src/lua/modules/graphics/je_lua_graphics.cpp +++ b/src/lua/modules/graphics/je_lua_graphics.cpp @@ -808,5 +808,5 @@ namespace JinEngine return 1; } - }// lua -}// jin
\ No newline at end of file + } // namespace Lua +} // namespace JinEngine
\ No newline at end of file diff --git a/src/lua/modules/graphics/je_lua_texture.cpp b/src/lua/modules/graphics/je_lua_texture.cpp index b9c58db..0ab79b5 100644 --- a/src/lua/modules/graphics/je_lua_texture.cpp +++ b/src/lua/modules/graphics/je_lua_texture.cpp @@ -61,5 +61,5 @@ namespace JinEngine return 0; } - }// lua -}// jin
\ No newline at end of file + }// namespace Lua +}// namespace JinEngine
\ No newline at end of file |