add boxed vector3 to lua

engine/Android.mk

@@ -195,6 +195,7 @@ LOCAL_SRC_FILES :=\
 	lua/LuaUnit.cpp\
 	lua/LuaVector2.cpp\
 	lua/LuaVector3.cpp\
+	lua/LuaVector3Box.cpp\
 	lua/LuaWindow.cpp\
 	lua/LuaWorld.cpp\
 \

engine/CMakeLists.txt

@@ -374,6 +374,7 @@ set (LUA_SRC
 	lua/LuaUnit.cpp
 	lua/LuaVector2.cpp
 	lua/LuaVector3.cpp
+	lua/LuaVector3Box.cpp
 	lua/LuaWindow.cpp
 	lua/LuaWorld.cpp
 )

engine/lua/LuaStack.h

@@ -29,6 +29,10 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "lua.hpp"
 #include "Types.h"
 #include "LuaSystem.h"
+#include "Vector3.h"
+#include "Vector2.h"
+#include "Quaternion.h"
+#include "Matrix4x4.h"
 
 namespace crown
 {
@@ -455,6 +459,44 @@ public:
 		lua_pushlightuserdata(m_state, lua_system::next_quaternion(q));
 	}
 
+	/// Allocates a new Vector3Box (full userdata)
+	Vector3& push_vector3box()
+	{
+		return *(Vector3*) lua_newuserdata(m_state, sizeof(Vector3));
+	}
+
+	/// Retrieves Vector3Box (full userdata)
+	Vector3& get_vector3box(uint32_t index)
+	{
+		CE_ASSERT(lua_isuserdata(m_state, index), "Unable to retrieve Vector3Box (wrong index)");
+		return *(Vector3*) lua_touserdata(m_state, index);
+	}
+
+	/// Allocates a new QuaternionBox (full userdata)
+	Quaternion& push_quaternionbox()
+	{
+		return *(Quaternion*) lua_newuserdata(m_state, sizeof(Quaternion));
+	}
+
+	/// Retrieves QuaternionBox (full userdata)
+	Quaternion& get_quaternionbox(uint32_t index)
+	{
+		CE_ASSERT(lua_isuserdata(m_state, index), "Unable to retrieve QuaternionBox (wrong index)");
+		return *(Quaternion*) lua_touserdata(m_state, index);
+	}
+
+	/// Allocates a new Matrix4x4Box (full userdata)
+	Matrix4x4& push_matrix4x4box()
+	{
+		return *(Matrix4x4*) lua_newuserdata(m_state, sizeof(Matrix4x4));
+	}
+
+	/// Retrieves QuaternionBox (full userdata)
+	Matrix4x4& get_matrix4x4box(uint32_t index)
+	{
+		CE_ASSERT(lua_isuserdata(m_state, index), "Unable to retrieve Matrix4x4Box (wrong index)");
+		return *(Matrix4x4*) lua_touserdata(m_state, index);
+	}
 private:
 
 	lua_State* m_state;

engine/lua/LuaVector3Box.cpp

@@ -0,0 +1,134 @@
+/*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
+Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include "LuaEnvironment.h"
+#include "LuaStack.h"
+#include "Vector3.h"
+
+namespace crown
+{
+
+//-----------------------------------------------------------------------------
+CE_EXPORT int vector3box(lua_State* L)
+{
+	LuaStack stack(L);
+
+	Vector3& v = stack.push_vector3box();
+
+	if (stack.num_args() == 2)
+	{
+		Vector3 tv = stack.get_vector3(1);
+
+		v = tv;
+	}
+	else if (stack.num_args() == 4)
+	{
+		v.x = stack.get_float(1);
+		v.y = stack.get_float(2);
+		v.z = stack.get_float(3);
+	}
+	return 1;
+}
+
+//-----------------------------------------------------------------------------
+CE_EXPORT int vector3box_store(lua_State* L)
+{
+	LuaStack stack(L);
+
+	Vector3& v = stack.get_vector3box(1);
+	
+	if (stack.num_args() == 2)
+	{
+		Vector3 tv = stack.get_vector3(1);
+
+		v = tv;
+	}
+	else if (stack.num_args() == 4)
+	{
+		v.x = stack.get_float(1);
+		v.y = stack.get_float(2);
+		v.z = stack.get_float(3);
+	}
+	return 0;
+}
+
+//-----------------------------------------------------------------------------
+CE_EXPORT int vector3box_unbox(lua_State* L)
+{
+	LuaStack stack(L);
+
+	Vector3& v = stack.get_vector3box(1);
+
+	stack.push_vector3(v);
+	return 1;
+}
+
+// //-----------------------------------------------------------------------------
+// CE_EXPORT int vector3box_x(lua_State* L)
+// {
+// 	LuaStack stack(L);
+
+// 	Vector3* v = (Vector3*) stack.get_vector3box(1);
+
+// 	stack.push_float(v->x);
+// 	return 1;
+// }
+
+// //-----------------------------------------------------------------------------
+// CE_EXPORT int vector3box_y(lua_State* L)
+// {
+// 	LuaStack stack(L);
+
+// 	Vector3* v = (Vector3*) stack.get_vector3box(1);
+
+// 	stack.push_float(v->y);
+// 	return 1;
+// }
+
+// //-----------------------------------------------------------------------------
+// CE_EXPORT int vector3box_z(lua_State* L)
+// {
+// 	LuaStack stack(L);
+
+// 	Vector3* v = (Vector3*) stack.get_vector3box(1);
+
+// 	stack.push_float(v->z);
+// 	return 1;
+// }
+
+
+//-----------------------------------------------------------------------------
+void load_vector3box(LuaEnvironment& env)
+{
+	env.load_module_function("Vector3Box", "new", vector3box);
+	env.load_module_function("Vector3Box", "store", vector3box_store);
+	env.load_module_function("Vector3Box", "unbox", vector3box_unbox);
+	// env.load_module_function("Vector3Box", "x", vector3box_x);
+	// env.load_module_function("Vector3Box", "y", vector3box_y);
+	// env.load_module_function("Vector3Box", "z", vector3box_z);
+}
+
+} // namespace crown