Exposed matrix3x4_t as Matrix3x4

Author: Ayuto

addons/source-python/packages/source-python/mathlib.py

@@ -12,15 +12,18 @@
 from _mathlib import Quaternion
 from _mathlib import Plane
 from _mathlib import RadianEuler
+from _mathlib import Matrix3x4
 
 
 # =============================================================================
 # >> ALL DECLARATION
 # =============================================================================
-__all__ = ('NULL_QANGLE',
+__all__ = ('NULL_MATRIX',
+           'NULL_QANGLE',
            'NULL_QUATERNION',
            'NULL_RADIANEULER',
            'NULL_VECTOR',
+           'Matrix3x4',
            'Plane',
            'QAngle',
            'Quaternion',
@@ -37,3 +40,4 @@
 NULL_QUATERNION = Quaternion()  #:
 NULL_RADIANEULER = RadianEuler()  #:
 NULL_VECTOR = Vector()  #:
+NULL_MATRIX = Matrix3x4(NULL_VECTOR, NULL_VECTOR, NULL_VECTOR, NULL_VECTOR)  #:

src/core/modules/mathlib/mathlib.h

@@ -129,4 +129,52 @@ class RadianEulerExt
 	{ return str("RadianEuler" + str(tuple(pRadianEuler))); }
 };
 
+
+//-----------------------------------------------------------------------------
+// matrix3x4_t extension class.
+//-----------------------------------------------------------------------------
+class Matrix3x4Row
+{
+public:
+	Matrix3x4Row(float* row)
+	{
+		m_row = row;
+	}
+
+	float& operator[](unsigned int index)
+	{
+		return m_row[index];
+	}
+
+	str __repr__()
+	{
+		return str(tuple(*this)); 
+	}
+
+public:
+	float* m_row;
+};
+
+
+class matrix3x4_tExt
+{
+public:
+	static Matrix3x4Row* __getitem__(matrix3x4_t& matrix, unsigned int index)
+	{
+		if (index >= 3) {
+			BOOST_RAISE_EXCEPTION(PyExc_IndexError, "Index out of range (%d)", index)
+		}
+
+		return new Matrix3x4Row(matrix[index]);
+	}
+
+	static str __repr__(matrix3x4_t& matrix)
+	{
+		return str("["
+			+ str(__getitem__(matrix, 0)) + ",\n"
+			+ str(__getitem__(matrix, 1)) + ",\n"
+			+ str(__getitem__(matrix, 2)) + "]");
+	}
+};
+
 #endif // _MATHLIB_H

src/core/modules/mathlib/mathlib_wrap.cpp

@@ -43,6 +43,7 @@ void export_qangle(scope);
 void export_quaternion(scope);
 void export_cplane_t(scope);
 void export_radian_euler(scope);
+void export_matrix3x4_t(scope);
 
 
 //-----------------------------------------------------------------------------
@@ -55,6 +56,7 @@ DECLARE_SP_MODULE(_mathlib)
 	export_quaternion(_mathlib);
 	export_cplane_t(_mathlib);
 	export_radian_euler(_mathlib);
+	export_matrix3x4_t(_mathlib);
 }
 
 
@@ -504,3 +506,65 @@ void export_radian_euler(scope _mathlib)
 		ADD_MEM_TOOLS(RadianEuler)
 	;
 }
+
+
+//-----------------------------------------------------------------------------
+// Exports matrix3x4_t.
+//-----------------------------------------------------------------------------
+void export_matrix3x4_t(scope _mathlib)
+{
+	// TODO:
+	// - Add support for e.g. matrix[0] = (1, 2, 3, 4)
+	class_<matrix3x4_t>("Matrix3x4")
+		.def(init<
+			float, float, float, float,
+			float, float, float, float,
+			float, float, float, float>(
+			"Create a new 3x4 matrix.\n\n"
+			".. note:: The matrix is not initialized with ``0.0``."))
+
+		.def(init<matrix3x4_t&>(
+			"Copy an existing matrix."))
+
+		.def(init<const Vector&, const Vector&, const Vector&, const Vector&>())
+		.def("__repr__", &matrix3x4_tExt::__repr__)
+
+		.def(
+			"invalidate",
+			&matrix3x4_t::Invalidate,
+			"Invalidate the the matrix (set all values to ``nan``).")
+
+		.def(
+			"__getitem__",
+			&matrix3x4_tExt::__getitem__,
+			manage_new_object_policy(),
+			"Return a single row of the matrix (0 - 2).\n\n"
+			":rtype: tuple")
+
+		ADD_MEM_TOOLS(matrix3x4_t)
+	;
+
+	class_<Matrix3x4Row>("Matrix3x4Row", no_init)
+		.def("__repr__", &Matrix3x4Row::__repr__)
+
+		.def(
+			"__getitem__", 
+			&GetItemIndexer<Matrix3x4Row, float, 0, 3>,
+			(arg("index")),
+			"Return the value of a column (0 - 3).\n"
+			"\n"
+			":param int index: An index between 0 and 3 that identifies the column.\n"
+			":rtype: float"
+		)
+
+		.def(
+			"__setitem__", 
+			&SetItemIndexer<Matrix3x4Row, float, 0, 3>,
+			(arg("index"), arg("value")),
+			"Set the value of a column.\n"
+			"\n"
+			":param int index: An index between 0 and 3 that identifies the column.\n"
+			":param float value: The value to set."
+		)
+	;
+}