diff options
| -rw-r--r-- | .gitignore | 17 | ||||
| -rw-r--r-- | bin/Animation.exe | bin | 0 -> 1057280 bytes | |||
| -rw-r--r-- | bin/Jin.exe | bin | 2565120 -> 2565120 bytes | |||
| -rw-r--r-- | bin/ParticleSystem.exe | bin | 0 -> 1052672 bytes | |||
| -rw-r--r-- | bin/game/anim2.png | bin | 0 -> 648800 bytes | |||
| -rw-r--r-- | bin/jin.exe | bin | 0 -> 2565120 bytes | |||
| -rw-r--r-- | bin/particle.png | bin | 0 -> 1821 bytes | |||
| -rw-r--r-- | build/vc++/jin.vcxproj | 1 | ||||
| -rw-r--r-- | build/vc++/jin.vcxproj.filters | 9 | ||||
| -rw-r--r-- | examples/particle_system/main.cpp | 8 | ||||
| -rw-r--r-- | src/3rdparty/luax/luax.h (renamed from src/lua/libraries/luax/luax.h) | 0 | ||||
| -rw-r--r-- | src/lua/common/je_lua.h | 2 | ||||
| -rw-r--r-- | src/lua/common/je_lua_proxy.h | 8 | ||||
| -rw-r--r-- | src/lua/common/je_lua_shared.cpp | 1 | ||||
| -rw-r--r-- | src/lua/modules/graphics/je_lua_animation.cpp | 3 |
15 files changed, 30 insertions, 19 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d7d42cf --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ + +*.ilk +*.pdb +*.lib +*.exp +*.obj +*.tlog +*.lastbuildstate +*.log +*.ipch +*.idb +*.res +*.db +*.suo +*.opendb +*.db-shm +*.db-wal diff --git a/bin/Animation.exe b/bin/Animation.exe Binary files differnew file mode 100644 index 0000000..4bda616 --- /dev/null +++ b/bin/Animation.exe diff --git a/bin/Jin.exe b/bin/Jin.exe Binary files differindex 0c72f2d..e48b1f6 100644 --- a/bin/Jin.exe +++ b/bin/Jin.exe diff --git a/bin/ParticleSystem.exe b/bin/ParticleSystem.exe Binary files differnew file mode 100644 index 0000000..6284228 --- /dev/null +++ b/bin/ParticleSystem.exe diff --git a/bin/game/anim2.png b/bin/game/anim2.png Binary files differnew file mode 100644 index 0000000..63c1f63 --- /dev/null +++ b/bin/game/anim2.png diff --git a/bin/jin.exe b/bin/jin.exe Binary files differnew file mode 100644 index 0000000..e48b1f6 --- /dev/null +++ b/bin/jin.exe diff --git a/bin/particle.png b/bin/particle.png Binary files differnew file mode 100644 index 0000000..632fcc1 --- /dev/null +++ b/bin/particle.png diff --git a/build/vc++/jin.vcxproj b/build/vc++/jin.vcxproj index 025c309..e687894 100644 --- a/build/vc++/jin.vcxproj +++ b/build/vc++/jin.vcxproj @@ -205,7 +205,6 @@ <ClInclude Include="..\..\src\lua\embed\scripts\net.lua.h" /> <ClInclude Include="..\..\src\lua\embed\scripts\path.lua.h" /> <ClInclude Include="..\..\src\lua\jin.h" /> - <ClInclude Include="..\..\src\lua\libraries\luax\luax.h" /> <ClInclude Include="..\..\src\lua\modules\ai\je_lua_ai.h" /> <ClInclude Include="..\..\src\lua\modules\ai\je_lua_behavior_tree.h" /> <ClInclude Include="..\..\src\lua\modules\ai\je_lua_state_machine.h" /> diff --git a/build/vc++/jin.vcxproj.filters b/build/vc++/jin.vcxproj.filters index 6b1e8f9..b613a33 100644 --- a/build/vc++/jin.vcxproj.filters +++ b/build/vc++/jin.vcxproj.filters @@ -7,12 +7,6 @@ <Filter Include="source\common"> <UniqueIdentifier>{2264d908-20ee-41c2-8bdc-bc1117959c4f}</UniqueIdentifier> </Filter> - <Filter Include="source\libraries"> - <UniqueIdentifier>{269451af-b8e9-451f-940a-9b679e6116d3}</UniqueIdentifier> - </Filter> - <Filter Include="source\libraries\luax"> - <UniqueIdentifier>{93b29ece-8318-4b20-a65d-2e79c1a2f816}</UniqueIdentifier> - </Filter> <Filter Include="source\modules"> <UniqueIdentifier>{923b475a-00e2-4b8f-925a-ca1e5f9b4689}</UniqueIdentifier> </Filter> @@ -203,9 +197,6 @@ <ClInclude Include="resource.h"> <Filter>resource</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\libraries\luax\luax.h"> - <Filter>source\libraries\luax</Filter> - </ClInclude> <ClInclude Include="..\..\src\lua\resources\font.ttf.h"> <Filter>source\resources</Filter> </ClInclude> diff --git a/examples/particle_system/main.cpp b/examples/particle_system/main.cpp index 6ab3448..b337722 100644 --- a/examples/particle_system/main.cpp +++ b/examples/particle_system/main.cpp @@ -37,7 +37,7 @@ const char* shader_code = R"( const float Pi = 3.14f; void onLoad() { - tex = Texture::createTexture("texture.png"); + tex = Texture::createTexture("particle.png"); spr = new Sprite(tex, Origin::BottomCenter); shader = Shader::createShader(shader_code); ParticleSystemDef def; @@ -46,15 +46,15 @@ void onLoad() def.emitterDef.emitRateDef.rate.rate = 0.01f; def.emitterDef.forceDef.force.force = 50.f; def.emitterDef.positionDef.enableRandom = true; - def.emitterDef.positionDef.position.random.floor = Vector2<float>(-20, 0); - def.emitterDef.positionDef.position.random.ceil = Vector2<float>(20, 0); + def.emitterDef.positionDef.position.random.floor = Vector2<float>(0, 0); + def.emitterDef.positionDef.position.random.ceil = Vector2<float>(0, 0); def.emitterDef.directionDef.enableRandom = true; def.emitterDef.directionDef.direction.random.floor = -Pi / 2 ; def.emitterDef.directionDef.direction.random.ceil = -Pi / 2 ; def.particleDef.colorOverTimeDef.enable = true; - def.particleDef.colorOverTimeDef.colorStart = Color(255, 100, 0, 255); + def.particleDef.colorOverTimeDef.colorStart = Color(255, 255, 0, 255); def.particleDef.colorOverTimeDef.colorEnd = Color(255, 0, 0, 0); /* def.particleDef.angularSpeedDef.enableRandom = true; diff --git a/src/lua/libraries/luax/luax.h b/src/3rdparty/luax/luax.h index 0055176..0055176 100644 --- a/src/lua/libraries/luax/luax.h +++ b/src/3rdparty/luax/luax.h diff --git a/src/lua/common/je_lua.h b/src/lua/common/je_lua.h index 56a5090..05cf917 100644 --- a/src/lua/common/je_lua.h +++ b/src/lua/common/je_lua.h @@ -4,7 +4,7 @@ #include <vector> #include "LuaJIT/lua.hpp" -#include "libraries/luax/luax.h" +#include "luax/luax.h" #include "je_lua_shared.hpp" #include "je_lua_proxy.h" diff --git a/src/lua/common/je_lua_proxy.h b/src/lua/common/je_lua_proxy.h index aa03fa0..6b79b9d 100644 --- a/src/lua/common/je_lua_proxy.h +++ b/src/lua/common/je_lua_proxy.h @@ -20,6 +20,8 @@ namespace JinEngine void release(); + const char* getObjectType(); + template<class T> Shared<T>& getShared() { @@ -36,9 +38,9 @@ namespace JinEngine return shared.getObject(); } - const char* getObjectType(); - - // Bind shared object. + /// + /// + /// SharedBase* shared; }; diff --git a/src/lua/common/je_lua_shared.cpp b/src/lua/common/je_lua_shared.cpp index a3478dd..241aec2 100644 --- a/src/lua/common/je_lua_shared.cpp +++ b/src/lua/common/je_lua_shared.cpp @@ -15,6 +15,7 @@ namespace JinEngine { if (--mCount <= 0) { + // Remove game object reference. luax_removeobject(mL, this); delete this; } diff --git a/src/lua/modules/graphics/je_lua_animation.cpp b/src/lua/modules/graphics/je_lua_animation.cpp index cd048e3..d2c806a 100644 --- a/src/lua/modules/graphics/je_lua_animation.cpp +++ b/src/lua/modules/graphics/je_lua_animation.cpp @@ -1,6 +1,7 @@ +#include "libjin/jin.h" + #include "common/je_lua_proxy.h" #include "common/je_lua_common.h" -#include "libjin/jin.h" #include "je_lua_sprite.h" #include "je_lua_canvas.h" |
