Revision: 20007
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20007
Author: campbellbarton
Date: 2009-04-30 14:45:13 +0200 (Thu, 30 Apr 2009)
Log Message:
-----------
added Geometry as a BGE module, removed its dependency on gen_utils.c
Modified Paths:
--------------
trunk/blender/source/blender/python/api2_2x/Blender.c
trunk/blender/source/blender/python/api2_2x/Geometry.c
trunk/blender/source/blender/python/api2_2x/Geometry.h
trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
trunk/blender/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
trunk/blender/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
trunk/blender/source/gameengine/Ketsji/CMakeLists.txt
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.h
trunk/blender/source/gameengine/Ketsji/SConscript
Modified: trunk/blender/source/blender/python/api2_2x/Blender.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Blender.c 2009-04-30
11:47:35 UTC (rev 20006)
+++ trunk/blender/source/blender/python/api2_2x/Blender.c 2009-04-30
12:45:13 UTC (rev 20007)
@@ -1092,7 +1092,7 @@
PyDict_SetItemString(dict, "Mesh", Mesh_Init());
PyDict_SetItemString(dict, "Metaball", Metaball_Init());
PyDict_SetItemString(dict, "Mathutils",
Mathutils_Init("Blender.Mathutils"));
- PyDict_SetItemString(dict, "Geometry", Geometry_Init());
+ PyDict_SetItemString(dict, "Geometry",
Geometry_Init("Blender.Geometry"));
PyDict_SetItemString(dict, "Modifier", Modifier_Init());
PyDict_SetItemString(dict, "NMesh", NMesh_Init());
PyDict_SetItemString(dict, "Node", Node_Init());
Modified: trunk/blender/source/blender/python/api2_2x/Geometry.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Geometry.c 2009-04-30
11:47:35 UTC (rev 20006)
+++ trunk/blender/source/blender/python/api2_2x/Geometry.c 2009-04-30
12:45:13 UTC (rev 20007)
@@ -38,9 +38,6 @@
#include "BKE_displist.h"
#include "MEM_guardedalloc.h"
#include "BLI_blenlib.h"
-
-/* needed for EXPP_ReturnPyObjError and EXPP_check_sequence_consistency */
-#include "gen_utils.h"
#include "BKE_utildefines.h"
#include "BLI_boxpack2d.h"
@@ -76,13 +73,32 @@
{"BoxPack2D", ( PyCFunction ) M_Geometry_BoxPack2D, METH_O,
M_Geometry_BoxPack2D_doc},
{NULL, NULL, 0, NULL}
};
+
+#if (PY_VERSION_HEX >= 0x03000000)
+static struct PyModuleDef M_Geometry_module_def = {
+ {}, /* m_base */
+ "Geometry", /* m_name */
+ M_Geometry_doc, /* m_doc */
+ 0, /* m_size */
+ M_Geometry_methods, /* m_methods */
+ 0, /* m_reload */
+ 0, /* m_traverse */
+ 0, /* m_clear */
+ 0, /* m_free */
+};
+#endif
+
/*----------------------------MODULE INIT-------------------------*/
-PyObject *Geometry_Init(void)
+PyObject *Geometry_Init(const char *from)
{
PyObject *submodule;
-
- submodule = Py_InitModule3("Blender.Geometry",
- M_Geometry_methods, M_Geometry_doc);
+
+#if (PY_VERSION_HEX >= 0x03000000)
+ submodule = PyModule_Create(&M_Geometry_module_def);
+#else
+ submodule = Py_InitModule3(from, M_Geometry_methods, M_Geometry_doc);
+#endif
+
return (submodule);
}
@@ -92,7 +108,7 @@
{
PyObject *tri_list; /*return this list of tri's */
PyObject *polyLine, *polyVec;
- int i, len_polylines, len_polypoints;
+ int i, len_polylines, len_polypoints, ls_error = 0;
/* display listbase */
ListBase dispbase={NULL, NULL};
@@ -105,8 +121,8 @@
if(!PySequence_Check(polyLineSeq)) {
- return EXPP_ReturnPyObjError( PyExc_TypeError,
- "expected a sequence of poly
lines" );
+ PyErr_SetString( PyExc_TypeError, "expected a sequence of poly
lines" );
+ return NULL;
}
len_polylines = PySequence_Size( polyLineSeq );
@@ -116,19 +132,20 @@
if (!PySequence_Check(polyLine)) {
freedisplist(&dispbase);
Py_XDECREF(polyLine); /* may be null so use Py_XDECREF*/
- return EXPP_ReturnPyObjError( PyExc_TypeError,
- "One or more of the polylines is not a
sequence of Mathutils.Vector's" );
+ PyErr_SetString( PyExc_TypeError, "One or more of the
polylines is not a sequence of Mathutils.Vector's" );
+ return NULL;
}
len_polypoints= PySequence_Size( polyLine );
if (len_polypoints>0) { /* dont bother adding edges as
polylines */
+#if 0
if (EXPP_check_sequence_consistency( polyLine,
&vector_Type ) != 1) {
freedisplist(&dispbase);
Py_DECREF(polyLine);
- return EXPP_ReturnPyObjError( PyExc_TypeError,
- "A point in one of the polylines is
not a Mathutils.Vector type" );
+ PyErr_SetString( PyExc_TypeError, "A point in
one of the polylines is not a Mathutils.Vector type" );
+ return NULL;
}
-
+#endif
dl= MEM_callocN(sizeof(DispList), "poly disp");
BLI_addtail(&dispbase, dl);
dl->type= DL_INDEX3;
@@ -141,14 +158,18 @@
for( index = 0; index<len_polypoints; ++index, fp+=3) {
polyVec= PySequence_GetItem( polyLine, index );
+ if(VectorObject_Check(polyVec)) {
+ fp[0] = ((VectorObject
*)polyVec)->vec[0];
+ fp[1] = ((VectorObject
*)polyVec)->vec[1];
+ if( ((VectorObject *)polyVec)->size > 2
)
+ fp[2] = ((VectorObject
*)polyVec)->vec[2];
+ else
+ fp[2]= 0.0f; /* if its a 2d
vector then set the z to be zero */
+ }
+ else {
+ ls_error= 1;
+ }
- fp[0] = ((VectorObject *)polyVec)->vec[0];
- fp[1] = ((VectorObject *)polyVec)->vec[1];
- if( ((VectorObject *)polyVec)->size > 2 )
- fp[2] = ((VectorObject
*)polyVec)->vec[2];
- else
- fp[2]= 0.0f; /* if its a 2d vector then
set the z to be zero */
-
totpoints++;
Py_DECREF(polyVec);
}
@@ -156,7 +177,12 @@
Py_DECREF(polyLine);
}
- if (totpoints) {
+ if(ls_error) {
+ freedisplist(&dispbase); /* possible some dl was allocated */
+ PyErr_SetString( PyExc_TypeError, "A point in one of the
polylines is not a Mathutils.Vector type" );
+ return NULL;
+ }
+ else if (totpoints) {
/* now make the list to return */
filldisplist(&dispbase, &dispbase);
@@ -167,8 +193,8 @@
tri_list= PyList_New(dl->parts);
if( !tri_list ) {
freedisplist(&dispbase);
- return EXPP_ReturnPyObjError( PyExc_RuntimeError,
- "Geometry.PolyFill failed to make a new
list" );
+ PyErr_SetString( PyExc_RuntimeError, "Geometry.PolyFill
failed to make a new list" );
+ return NULL;
}
index= 0;
@@ -181,6 +207,7 @@
freedisplist(&dispbase);
} else {
/* no points, do this so scripts dont barf */
+ freedisplist(&dispbase); /* possible some dl was allocated */
tri_list= PyList_New(0);
}
@@ -197,9 +224,10 @@
&vector_Type, &line_a2,
&vector_Type, &line_b1,
&vector_Type, &line_b2)
- )
- return ( EXPP_ReturnPyObjError
- ( PyExc_TypeError, "expected 4 vector types\n" ) );
+ ) {
+ PyErr_SetString( PyExc_TypeError, "expected 4 vector types\n" );
+ return NULL;
+ }
a1x= line_a1->vec[0];
a1y= line_a1->vec[1];
@@ -293,10 +321,10 @@
&vector_Type, &pt,
&vector_Type, &line_1,
&vector_Type, &line_2)
- )
- return ( EXPP_ReturnPyObjError
- ( PyExc_TypeError, "expected 3 vector types\n"
) );
-
+ ) {
+ PyErr_SetString( PyExc_TypeError, "expected 3 vector types\n" );
+ return NULL;
+ }
/* accept 2d verts */
if (pt->size==3) { VECCOPY(pt_in, pt->vec);}
else { pt_in[2]=0.0; VECCOPY2D(pt_in, pt->vec) }
@@ -325,9 +353,10 @@
&vector_Type, &tri_p1,
&vector_Type, &tri_p2,
&vector_Type, &tri_p3)
- )
- return ( EXPP_ReturnPyObjError
- ( PyExc_TypeError, "expected 4 vector types\n" ) );
+ ) {
+ PyErr_SetString( PyExc_TypeError, "expected 4 vector types\n" );
+ return NULL;
+ }
return PyInt_FromLong(IsectPT2Df(pt_vec->vec, tri_p1->vec, tri_p2->vec,
tri_p3->vec));
}
@@ -342,9 +371,10 @@
&vector_Type, &quad_p2,
&vector_Type, &quad_p3,
&vector_Type, &quad_p4)
- )
- return ( EXPP_ReturnPyObjError
- ( PyExc_TypeError, "expected 5 vector types\n" ) );
+ ) {
+ PyErr_SetString( PyExc_TypeError, "expected 5 vector types\n" );
+ return NULL;
+ }
return PyInt_FromLong(IsectPQ2Df(pt_vec->vec, quad_p1->vec,
quad_p2->vec, quad_p3->vec, quad_p4->vec));
}
@@ -357,9 +387,10 @@
/* Error checking must alredy be done */
- if( !PyList_Check( value ) )
- return EXPP_ReturnIntError( PyExc_TypeError,
- "can only back a list of [x,y,x,w]" );
+ if( !PyList_Check( value ) ) {
+ PyErr_SetString( PyExc_TypeError, "can only back a list of
[x,y,x,w]" );
+ return -1;
+ }
len = PyList_Size( value );
@@ -370,8 +401,8 @@
list_item = PyList_GET_ITEM( value, i );
if( !PyList_Check( list_item ) || PyList_Size( list_item ) < 4
) {
MEM_freeN(*boxarray);
- return EXPP_ReturnIntError( PyExc_TypeError,
- "can only back a list of [x,y,x,w]" );
+ PyErr_SetString( PyExc_TypeError, "can only back a list
of [x,y,x,w]" );
+ return -1;
}
box = (*boxarray)+i;
@@ -381,8 +412,8 @@
if (!PyNumber_Check(item_1) || !PyNumber_Check(item_2)) {
MEM_freeN(*boxarray);
- return EXPP_ReturnIntError( PyExc_TypeError,
- "can only back a list of 2d boxes
[x,y,x,w]" );
+ PyErr_SetString( PyExc_TypeError, "can only back a list
of 2d boxes [x,y,x,w]" );
+ return -1;
}
box->w = (float)PyFloat_AsDouble( item_1 );
@@ -418,9 +449,10 @@
int len;
int error;
- if(!PyList_Check(boxlist))
- return EXPP_ReturnPyObjError( PyExc_TypeError,
- "expected a sequence of boxes
[[x,y,w,h], ... ]" );
+ if(!PyList_Check(boxlist)) {
+ PyErr_SetString( PyExc_TypeError, "expected a sequence of boxes
[[x,y,w,h], ... ]" );
+ return NULL;
+ }
len = PyList_Size( boxlist );
Modified: trunk/blender/source/blender/python/api2_2x/Geometry.h
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Geometry.h 2009-04-30
11:47:35 UTC (rev 20006)
+++ trunk/blender/source/blender/python/api2_2x/Geometry.h 2009-04-30
12:45:13 UTC (rev 20007)
@@ -34,6 +34,6 @@
#include <Python.h>
#include "Mathutils.h"
-PyObject *Geometry_Init( void );
+PyObject *Geometry_Init( const char *from );
#endif /* EXPP_Geometry_H */
Modified:
trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
2009-04-30 11:47:35 UTC (rev 20006)
+++ trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
2009-04-30 12:45:13 UTC (rev 20007)
@@ -368,6 +368,7 @@
initGameKeys();
initPythonConstraintBinding();
initMathutils();
+ initGeometry();
initBGL();
#ifdef WITH_FFMPEG
initVideoTexture();
@@ -671,6 +672,7 @@
initGameKeys();
initPythonConstraintBinding();
initMathutils();
+ initGeometry();
initBGL();
#ifdef WITH_FFMPEG
initVideoTexture();
Modified:
trunk/blender/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
2009-04-30 11:47:35 UTC (rev 20006)
+++ trunk/blender/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
2009-04-30 12:45:13 UTC (rev 20007)
@@ -669,6 +669,7 @@
initGameKeys();
initPythonConstraintBinding();
initMathutils();
+ initGeometry();
initBGL();
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
