aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bin/game/main.lua5
-rw-r--r--bin/jin.exebin1926656 -> 1925632 bytes
-rw-r--r--src/lua/common/je_lua_shared.cpp13
-rw-r--r--src/lua/common/je_lua_shared.hpp16
4 files changed, 13 insertions, 21 deletions
diff --git a/bin/game/main.lua b/bin/game/main.lua
index 3e5182b..fd54a7d 100644
--- a/bin/game/main.lua
+++ b/bin/game/main.lua
@@ -141,13 +141,10 @@ function jin.core.onDraw()
--jin.graphics.draw(sprs[2], 150, 150, 1, 1, 0)
local x, y = jin.mouse.getPosition()
animator:render(50, 150, 1, 1, 0)
- ps:render()
--jin.graphics.print(#sprs, 10, 10)
jin.graphics.draw(spr, 100, 200, 1, 1, 0)
--jin.graphics.useShader(shader_program2)
--jin.graphics.draw(tex, 0, 0,0.2, 0.2)
--jin.graphics.unuseShader()
- if stop then
- --jin.graphics.print("Quit", 100, 300)
- end
+ ps:render()
end \ No newline at end of file
diff --git a/bin/jin.exe b/bin/jin.exe
index 75c0b06..51d0ffb 100644
--- a/bin/jin.exe
+++ b/bin/jin.exe
Binary files differ
diff --git a/src/lua/common/je_lua_shared.cpp b/src/lua/common/je_lua_shared.cpp
index 62dfab9..fce6d81 100644
--- a/src/lua/common/je_lua_shared.cpp
+++ b/src/lua/common/je_lua_shared.cpp
@@ -7,18 +7,5 @@ namespace JinEngine
namespace Lua
{
- void Shared::retain()
- {
- ++mCount;
- }
-
- void Shared::release()
- {
- if (--mCount <= 0)
- {
- delete this;
- }
- }
-
}
} \ No newline at end of file
diff --git a/src/lua/common/je_lua_shared.hpp b/src/lua/common/je_lua_shared.hpp
index 16dd943..d9d9a0e 100644
--- a/src/lua/common/je_lua_shared.hpp
+++ b/src/lua/common/je_lua_shared.hpp
@@ -56,6 +56,7 @@ namespace JinEngine
private:
friend class LuaObject;
+ // Disable copy.
Shared(const Shared& shared);
///
@@ -63,8 +64,7 @@ namespace JinEngine
///
~Shared()
{
- Object* obj = static_cast<Object*>(mObject);
- delete obj;
+ delete mObject;
}
///
@@ -73,8 +73,16 @@ namespace JinEngine
/// Sharedʱһüͬһ߳УһEngineObjectֻһLuaObject󶨣new
/// instanceУômCountͱEngineObjectĹ߳
///
- void retain();
- void release();
+ inline void Shared::retain()
+ {
+ ++mCount;
+ }
+
+ inline void Shared::release()
+ {
+ if (--mCount <= 0)
+ delete this;
+ }
Object* mObject;
int mCount;