From 6bb55fd93eb728b07a04dbe5c440a6525dd6cef1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 26 Apr 2010 21:04:42 +0000 Subject: py/rna, euler objects order is now wrapped correctly... eg: eul = bpy.context.object.rotation_euler eul.order = 'XZY' # will update the objects setting. --- source/gameengine/Ketsji/KX_ObjectActuator.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'source/gameengine/Ketsji/KX_ObjectActuator.cpp') diff --git a/source/gameengine/Ketsji/KX_ObjectActuator.cpp b/source/gameengine/Ketsji/KX_ObjectActuator.cpp index c93ebe2ee8b..824017f5704 100644 --- a/source/gameengine/Ketsji/KX_ObjectActuator.cpp +++ b/source/gameengine/Ketsji/KX_ObjectActuator.cpp @@ -383,18 +383,18 @@ PyAttributeDef KX_ObjectActuator::Attributes[] = { static int mathutils_kxobactu_vector_cb_index= -1; /* index for our callbacks */ -static int mathutils_obactu_generic_check(PyObject *self_v) +static int mathutils_obactu_generic_check(BaseMathObject *bmo) { - KX_ObjectActuator* self= static_castBGE_PROXY_REF(self_v); + KX_ObjectActuator* self= static_castBGE_PROXY_REF(bmo->cb_user); if(self==NULL) return 0; return 1; } -static int mathutils_obactu_vector_get(PyObject *self_v, int subtype, float *vec_from) +static int mathutils_obactu_vector_get(BaseMathObject *bmo, int subtype, float *vec_from) { - KX_ObjectActuator* self= static_castBGE_PROXY_REF(self_v); + KX_ObjectActuator* self= static_castBGE_PROXY_REF(bmo->cb_user); if(self==NULL) return 0; @@ -410,9 +410,9 @@ static int mathutils_obactu_vector_get(PyObject *self_v, int subtype, float *vec return 1; } -static int mathutils_obactu_vector_set(PyObject *self_v, int subtype, float *vec_to) +static int mathutils_obactu_vector_set(BaseMathObject *bmo, int subtype, float *vec_to) { - KX_ObjectActuator* self= static_castBGE_PROXY_REF(self_v); + KX_ObjectActuator* self= static_castBGE_PROXY_REF(bmo->cb_user); if(self==NULL) return 0; @@ -428,27 +428,27 @@ static int mathutils_obactu_vector_set(PyObject *self_v, int subtype, float *vec return 1; } -static int mathutils_obactu_vector_get_index(PyObject *self_v, int subtype, float *vec_from, int index) +static int mathutils_obactu_vector_get_index(BaseMathObject *bmo, int subtype, float *vec_from, int index) { float f[4]; /* lazy, avoid repeteing the case statement */ - if(!mathutils_obactu_vector_get(self_v, subtype, f)) + if(!mathutils_obactu_vector_get(bmo, subtype, f)) return 0; vec_from[index]= f[index]; return 1; } -static int mathutils_obactu_vector_set_index(PyObject *self_v, int subtype, float *vec_to, int index) +static int mathutils_obactu_vector_set_index(BaseMathObject *bmo, int subtype, float *vec_to, int index) { float f= vec_to[index]; /* lazy, avoid repeteing the case statement */ - if(!mathutils_obactu_vector_get(self_v, subtype, vec_to)) + if(!mathutils_obactu_vector_get(bmo, subtype, vec_to)) return 0; vec_to[index]= f; - mathutils_obactu_vector_set(self_v, subtype, vec_to); + mathutils_obactu_vector_set(bmo, subtype, vec_to); return 1; } -- cgit v1.2.3