aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2018-12-08 22:27:24 +0800
committerchai <chaifix@163.com>2018-12-08 22:27:24 +0800
commit7069a62a7984feff85a37f60c67e2a7624241841 (patch)
tree45fd86e46347a477f7b7a4078a44046670eb92ce /src
parent0b39a434e2191b8b184ad94e052f89b8a89e9a3c (diff)
*format
Diffstat (limited to 'src')
-rw-r--r--src/libjin/graphics/particles/je_particle_system.cpp2
-rw-r--r--src/lua/common/je_lua_runtime.cpp2
-rw-r--r--src/lua/common/je_lua_shared.hpp12
-rw-r--r--src/lua/modules/graphics/je_lua_page.cpp4
4 files changed, 10 insertions, 10 deletions
diff --git a/src/libjin/graphics/particles/je_particle_system.cpp b/src/libjin/graphics/particles/je_particle_system.cpp
index cb2472f..d0cd4e0 100644
--- a/src/libjin/graphics/particles/je_particle_system.cpp
+++ b/src/libjin/graphics/particles/je_particle_system.cpp
@@ -62,7 +62,7 @@ namespace JinEngine
{
Particle* p = new (mParticlePool.GetNextWithoutInitializing()) Particle();
mAliveParticles.push_back(p);
- jin_log_info("particle count %d", mAliveParticles.size());
+ //jin_log_info("particle count %d", mAliveParticles.size());
return p;
}
diff --git a/src/lua/common/je_lua_runtime.cpp b/src/lua/common/je_lua_runtime.cpp
index 0110d22..d7069b8 100644
--- a/src/lua/common/je_lua_runtime.cpp
+++ b/src/lua/common/je_lua_runtime.cpp
@@ -54,7 +54,7 @@ namespace JinEngine
luax_copyinstance(to, luaObj);
luax_pop(to, 1); // Pop reference object.
}
- Shared * shr = src->getShared();
+ Shared* shr = src->getShared();
LuaObject* obj = luax_newinstance(to, src->getObjectType(), shr);
(*obj->dependencies) = (*src->dependencies);
// Add to objects_table.
diff --git a/src/lua/common/je_lua_shared.hpp b/src/lua/common/je_lua_shared.hpp
index d9d9a0e..55434c9 100644
--- a/src/lua/common/je_lua_shared.hpp
+++ b/src/lua/common/je_lua_shared.hpp
@@ -1,5 +1,5 @@
-#ifndef __JIN_COMMON_SHARED_H__
-#define __JIN_COMMON_SHARED_H__
+#ifndef __JE_LUA_SHARED_H__
+#define __JE_LUA_SHARED_H__
#include <map>
#include <vector>
@@ -15,7 +15,7 @@ namespace JinEngine
class LuaObject;
///
- /// ̰߳ȫĹģ塣
+ /// Thread shared object wrapper.
///
class Shared
{
@@ -27,12 +27,12 @@ namespace JinEngine
{
}
- Object* operator->()
+ inline Object* operator->()
{
return static_cast<Object*>(mObject);
}
- Object* getObject()
+ inline Object* getObject()
{
return static_cast<Object*>(mObject);
}
@@ -48,7 +48,7 @@ namespace JinEngine
}
template<class T>
- T* getObject()
+ inline T* getObject()
{
return static_cast<T*>(mObject);
}
diff --git a/src/lua/modules/graphics/je_lua_page.cpp b/src/lua/modules/graphics/je_lua_page.cpp
index 6d84c4f..6407256 100644
--- a/src/lua/modules/graphics/je_lua_page.cpp
+++ b/src/lua/modules/graphics/je_lua_page.cpp
@@ -1,9 +1,9 @@
+#include <iostream>
+
#include "common/je_lua_object.h"
#include "common/je_lua_common.h"
#include "libjin/jin.h"
-#include <iostream>
-
using namespace JinEngine::Graphics;
using namespace JinEngine::Graphics::Fonts;
using namespace JinEngine::Graphics::Shaders;