Daniele Bartolini 11 年之前
父节点
当前提交
9b1ba7aed2
共有 2 个文件被更改,包括 15 次插入31 次删除
  1. 6 22
      engine/config.h
  2. 9 9
      engine/lua/lua_system.cpp

+ 6 - 22
engine/config.h

@@ -106,36 +106,20 @@ OTHER DEALINGS IN THE SOFTWARE.
 	#define CE_MAX_CONSOLE_CLIENTS 32
 #endif // CE_MAX
 
-#ifndef CE_MAX_GUI_RECTS
-	#define CE_MAX_GUI_RECTS 64 // Per Gui
-#endif // CE_MAX
-
-#ifndef CE_MAX_GUI_TRIANGLES
-	#define CE_MAX_GUI_TRIANGLES 64 // Per Gui
-#endif // CE_MAX
-
-#ifndef CE_MAX_GUI_IMAGES
-	#define CE_MAX_GUI_IMAGES 64 // Per Gui
-#endif // CE_MAX
-
-#ifndef CE_MAX_GUI_TEXTS
-	#define CE_MAX_GUI_TEXTS 64 // Per Gui
-#endif // CE_MAX
-
 #ifndef CE_MAX_DEBUG_LINES
 	#define CE_MAX_DEBUG_LINES 2 * 1024 // Per DebugLine
 #endif // CE_MAX
 
-#ifndef CE_MAX_LUA_VECTOR3
-	#define CE_MAX_LUA_VECTOR3 4096
+#ifndef CROWN_MAX_LUA_VECTOR3
+	#define CROWN_MAX_LUA_VECTOR3 4096
 #endif // CE_MAX
 
-#ifndef CE_MAX_LUA_MATRIX4X4
-	#define CE_MAX_LUA_MATRIX4X4 4096
+#ifndef CROWN_MAX_LUA_MATRIX4X4
+	#define CROWN_MAX_LUA_MATRIX4X4 4096
 #endif // CE_MAX
 
-#ifndef CE_MAX_LUA_QUATERNION
-	#define CE_MAX_LUA_QUATERNION 4096
+#ifndef CROWN_MAX_LUA_QUATERNION
+	#define CROWN_MAX_LUA_QUATERNION 4096
 #endif // CE_MAX
 
 #ifndef CROWN_SOUND_OPENAL

+ 9 - 9
engine/lua/lua_system.cpp

@@ -79,11 +79,11 @@ namespace lua_globals
 	static lua_State* _L;
 
 	static uint32_t _vec3_used = 0;
-	static Vector3 _vec3_buffer[CE_MAX_LUA_VECTOR3];
+	static Vector3 _vec3_buffer[CROWN_MAX_LUA_VECTOR3];
 	static uint32_t _mat4_used = 0;
-	static Matrix4x4 s_mat4_buffer[CE_MAX_LUA_MATRIX4X4];
+	static Matrix4x4 s_mat4_buffer[CROWN_MAX_LUA_MATRIX4X4];
 	static uint32_t _quat_used = 0;
-	static Quaternion _quat_buffer[CE_MAX_LUA_QUATERNION];
+	static Quaternion _quat_buffer[CROWN_MAX_LUA_QUATERNION];
 
 	// When an error occurs, logs the error message and pauses the engine.
 	int error_handler(lua_State* L)
@@ -311,40 +311,40 @@ namespace lua_globals
 
 	Vector3* next_vector3(const Vector3& v)
 	{
-		CE_ASSERT(_vec3_used < CE_MAX_LUA_VECTOR3, "Maximum number of Vector3 reached");
+		CE_ASSERT(_vec3_used < CROWN_MAX_LUA_VECTOR3, "Maximum number of Vector3 reached");
 
 		return &(_vec3_buffer[_vec3_used++] = v);
 	}
 
 	Matrix4x4* next_matrix4x4(const Matrix4x4& m)
 	{
-		CE_ASSERT(_mat4_used < CE_MAX_LUA_MATRIX4X4, "Maximum number of Matrix4x4 reached");
+		CE_ASSERT(_mat4_used < CROWN_MAX_LUA_MATRIX4X4, "Maximum number of Matrix4x4 reached");
 
 		return &(s_mat4_buffer[_mat4_used++] = m);
 	}
 
 	Quaternion* next_quaternion(const Quaternion& q)
 	{
-		CE_ASSERT(_quat_used < CE_MAX_LUA_QUATERNION, "Maximum number of Quaternion reached");
+		CE_ASSERT(_quat_used < CROWN_MAX_LUA_QUATERNION, "Maximum number of Quaternion reached");
 		return &(_quat_buffer[_quat_used++] = q);
 	}
 
 	bool is_vector3(int32_t index)
 	{
 		void* type = lua_touserdata(_L, index);
-		return (type >= &_vec3_buffer[0] && type <= &_vec3_buffer[CE_MAX_LUA_VECTOR3 - 1]);
+		return (type >= &_vec3_buffer[0] && type <= &_vec3_buffer[CROWN_MAX_LUA_VECTOR3 - 1]);
 	}
 
 	bool is_matrix4x4(int32_t index)
 	{
 		void* type = lua_touserdata(_L, index);
-		return (type >= &s_mat4_buffer[0] && type <= &s_mat4_buffer[CE_MAX_LUA_MATRIX4X4 - 1]);
+		return (type >= &s_mat4_buffer[0] && type <= &s_mat4_buffer[CROWN_MAX_LUA_MATRIX4X4 - 1]);
 	}
 
 	bool is_quaternion(int32_t index)
 	{
 		void* type = lua_touserdata(_L, index);
-		return (type >= &_quat_buffer[0] && type <= &_quat_buffer[CE_MAX_LUA_QUATERNION - 1]);
+		return (type >= &_quat_buffer[0] && type <= &_quat_buffer[CROWN_MAX_LUA_QUATERNION - 1]);
 	}
 
 	void clear_temporaries()