PyAPI: expose matrix parsing function
authorCampbell Barton <ideasman42@gmail.com>
Sat, 19 Aug 2017 11:36:50 +0000 (21:36 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 19 Aug 2017 11:36:50 +0000 (21:36 +1000)
source/blender/python/intern/gpu_offscreen.c
source/blender/python/mathutils/mathutils_Matrix.c
source/blender/python/mathutils/mathutils_Matrix.h

index 7711ce18bd0d6e171799a424f881fd493738a2e9..3c340d14e3f7792f0c100e7a777ac70abc6dd702 100644 (file)
@@ -144,36 +144,6 @@ static PyObject *pygpu_offscreen_unbind(BPy_GPUOffScreen *self, PyObject *args,
        Py_RETURN_NONE;
 }
 
-/**
- * Use with PyArg_ParseTuple's "O&" formatting.
- */
-static int pygpu_offscreen_check_matrix(PyObject *o, void *p)
-{
-       MatrixObject **pymat_p = p;
-       MatrixObject  *pymat = (MatrixObject *)o;
-
-       if (!MatrixObject_Check(pymat)) {
-               PyErr_Format(PyExc_TypeError,
-                            "expected a mathutils.Matrix, not a %.200s",
-                            Py_TYPE(o)->tp_name);
-               return 0;
-       }
-
-       if (BaseMath_ReadCallback(pymat) == -1) {
-               return 0;
-       }
-
-       if ((pymat->num_col != 4) ||
-           (pymat->num_row != 4))
-       {
-               PyErr_SetString(PyExc_ValueError, "matrix must be 4x4");
-               return 0;
-       }
-
-       *pymat_p = pymat;
-       return 1;
-}
-
 PyDoc_STRVAR(pygpu_offscreen_draw_view3d_doc,
 "draw_view3d(scene, view3d, region, modelview_matrix, projection_matrix)\n"
 "\n"
@@ -209,8 +179,8 @@ static PyObject *pygpu_offscreen_draw_view3d(BPy_GPUOffScreen *self, PyObject *a
        if (!PyArg_ParseTupleAndKeywords(
                args, kwds, "OOOO&O&:draw_view3d", (char **)(kwlist),
                &py_scene, &py_view3d, &py_region,
-               pygpu_offscreen_check_matrix, &py_mat_projection,
-               pygpu_offscreen_check_matrix, &py_mat_modelview) ||
+               Matrix_Parse4x4, &py_mat_projection,
+               Matrix_Parse4x4, &py_mat_modelview) ||
            (!(scene    = PyC_RNA_AsPointer(py_scene, "Scene")) ||
             !(v3d      = PyC_RNA_AsPointer(py_view3d, "SpaceView3D")) ||
             !(ar       = PyC_RNA_AsPointer(py_region, "Region"))))
index e368e8871f316e1bf46e8a77d9c8e0745d465218..2578b19d5ec736898ec42dd478fe873b4ff9c2be 100644 (file)
@@ -2914,6 +2914,73 @@ PyObject *Matrix_CreatePyObject_cb(PyObject *cb_user,
        return (PyObject *) self;
 }
 
+/**
+ * Use with PyArg_ParseTuple's "O&" formatting.
+ */
+static bool Matrix_ParseCheck(MatrixObject *pymat)
+{
+       if (!MatrixObject_Check(pymat)) {
+               PyErr_Format(PyExc_TypeError,
+                            "expected a mathutils.Matrix, not a %.200s",
+                            Py_TYPE(pymat)->tp_name);
+               return 0;
+       }
+       /* sets error */
+       if (BaseMath_ReadCallback(pymat) == -1) {
+               return 0;
+       }
+       return 1;
+}
+
+int Matrix_ParseAny(PyObject *o, void *p)
+{
+       MatrixObject **pymat_p = p;
+       MatrixObject  *pymat = (MatrixObject *)o;
+
+       if (!Matrix_ParseCheck(pymat)) {
+               return 0;
+       }
+       *pymat_p = pymat;
+       return 1;
+}
+
+int Matrix_Parse3x3(PyObject *o, void *p)
+{
+       MatrixObject **pymat_p = p;
+       MatrixObject  *pymat = (MatrixObject *)o;
+
+       if (!Matrix_ParseCheck(pymat)) {
+               return 0;
+       }
+       if ((pymat->num_col != 3) ||
+           (pymat->num_row != 3))
+       {
+               PyErr_SetString(PyExc_ValueError, "matrix must be 3x3");
+               return 0;
+       }
+
+       *pymat_p = pymat;
+       return 1;
+}
+
+int Matrix_Parse4x4(PyObject *o, void *p)
+{
+       MatrixObject **pymat_p = p;
+       MatrixObject  *pymat = (MatrixObject *)o;
+
+       if (!Matrix_ParseCheck(pymat)) {
+               return 0;
+       }
+       if ((pymat->num_col != 4) ||
+           (pymat->num_row != 4))
+       {
+               PyErr_SetString(PyExc_ValueError, "matrix must be 4x4");
+               return 0;
+       }
+
+       *pymat_p = pymat;
+       return 1;
+}
 
 /* ----------------------------------------------------------------------------
  * special type for alternate access */
index 542a0e349c76d12487c2354e2846eb8271de9e67..9c84716d3072d53a406fc75cbf69b99c913d0b5b 100644 (file)
@@ -77,6 +77,11 @@ PyObject *Matrix_CreatePyObject_cb(
         unsigned char cb_type, unsigned char cb_subtype
         ) ATTR_WARN_UNUSED_RESULT;
 
+/* PyArg_ParseTuple's "O&" formatting helpers. */
+int Matrix_ParseAny(PyObject *o, void *p);
+int Matrix_Parse3x3(PyObject *o, void *p);
+int Matrix_Parse4x4(PyObject *o, void *p);
+
 extern unsigned char mathutils_matrix_row_cb_index; /* default */
 extern unsigned char mathutils_matrix_col_cb_index;
 extern unsigned char mathutils_matrix_translation_cb_index;