Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2012-01-22 07:21:28 +0400
committerDalai Felinto <dfelinto@gmail.com>2012-01-22 07:21:28 +0400
commit6964b5a6c48f2fab19b4ce5a52ba23525a5f05eb (patch)
tree0384f726655f145874d4bab056cb9740c1f44d65 /source/gameengine/Ketsji/KX_GameObject.h
parentf45a8105eedc93ba8c4284f85e7e29f3eaeeb510 (diff)
cucumber merge: world scaling + video texture constants
revisions: 38166,38167,38177,38179,38180,38187,38242 To be implemented after merge: 1) add pydocs(rst) for the video texture new defines 2) see if a NodeSetLocalMatrix would fit well #43439 by kupoman Changing the worldTransform and localTransform python attributes to use BLI_math to simplify the code #38242 by kupoman Adding the constants SOURCE_ERROR, SOURCE_EMPTY, SOURCE_READY, SOURCE_PLAYING, SOURCE_STOPPED to the video texture module. Updates to the documentation will follow after a merge with trunk #38187 by kupoman Updates to the documentation to reflect that worldScale is now writable, and added localTransform and worldTransform to KX_GameObject. #38180 by kupoman The Transform attribute of KX_GameObject was based on world space data. I converted that one to worldTransform, and added a localTransform for local space transform information. #38179 by kupoman Fixed the transform attribute of KX_GameObject's set method to properly deal with negative scaling. #38177 by kupoman Updated the transform property on KX_GameObject so that it is now read/write, and added the corresponding set method. Also simplified the get method by calling GetOpenGLMatrix instead of making the matrix myself. #38167 by kupoman Adding a read only transform attribute to KX_GameObject that returns a 4x4 matrix representing the object's transformations. #38166 by kupoman Adding a worldScale attribute to KX_GameObject. This attribute scales the object independently of its parent's scale.
Diffstat (limited to 'source/gameengine/Ketsji/KX_GameObject.h')
-rw-r--r--source/gameengine/Ketsji/KX_GameObject.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h
index cc078e96e64..a35e6f1b2cd 100644
--- a/source/gameengine/Ketsji/KX_GameObject.h
+++ b/source/gameengine/Ketsji/KX_GameObject.h
@@ -475,6 +475,7 @@ public:
void NodeSetGlobalOrientation(const MT_Matrix3x3& rot );
void NodeSetLocalScale( const MT_Vector3& scale );
+ void NodeSetWorldScale( const MT_Vector3& scale );
void NodeSetRelativeScale( const MT_Vector3& scale );
@@ -968,8 +969,13 @@ public:
static PyObject* pyattr_get_localOrientation(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
static int pyattr_set_localOrientation(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
static PyObject* pyattr_get_worldScaling(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
+ static int pyattr_set_worldScaling(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
static PyObject* pyattr_get_localScaling(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
static int pyattr_set_localScaling(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
+ static PyObject* pyattr_get_localTransform(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
+ static int pyattr_set_localTransform(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
+ static PyObject* pyattr_get_worldTransform(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
+ static int pyattr_set_worldTransform(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
static PyObject* pyattr_get_worldLinearVelocity(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
static int pyattr_set_worldLinearVelocity(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
static PyObject* pyattr_get_localLinearVelocity(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);