BGE: Renaming KX_GameObject.group_parent and group_children to groupObject and groupM...
authorMitchell Stokes <mogurijin@gmail.com>
Tue, 13 Nov 2012 04:38:34 +0000 (04:38 +0000)
committerMitchell Stokes <mogurijin@gmail.com>
Tue, 13 Nov 2012 04:38:34 +0000 (04:38 +0000)
source/gameengine/Ketsji/KX_GameObject.cpp
source/gameengine/Ketsji/KX_GameObject.h
source/gameengine/Ketsji/KX_MeshProxy.cpp

index 4f3d020a3d965944623633e63883f78648b2f338..cfccb8e8ced1b62fa80c8719f2c90b196b362da1 100644 (file)
@@ -1693,8 +1693,8 @@ PyMethodDef KX_GameObject::Methods[] = {
 PyAttributeDef KX_GameObject::Attributes[] = {
        KX_PYATTRIBUTE_RO_FUNCTION("name",              KX_GameObject, pyattr_get_name),
        KX_PYATTRIBUTE_RO_FUNCTION("parent",    KX_GameObject, pyattr_get_parent),
-       KX_PYATTRIBUTE_RO_FUNCTION("group_children",    KX_GameObject, pyattr_get_group_children),
-       KX_PYATTRIBUTE_RO_FUNCTION("group_parent",              KX_GameObject, pyattr_get_group_parent),
+       KX_PYATTRIBUTE_RO_FUNCTION("groupMembers",      KX_GameObject, pyattr_get_group_members),
+       KX_PYATTRIBUTE_RO_FUNCTION("groupObject",       KX_GameObject, pyattr_get_group_object),
        KX_PYATTRIBUTE_RO_FUNCTION("scene",             KX_GameObject, pyattr_get_scene),
        KX_PYATTRIBUTE_RO_FUNCTION("life",              KX_GameObject, pyattr_get_life),
        KX_PYATTRIBUTE_RW_FUNCTION("mass",              KX_GameObject, pyattr_get_mass,         pyattr_set_mass),
@@ -1991,7 +1991,7 @@ PyObject *KX_GameObject::pyattr_get_parent(void *self_v, const KX_PYATTRIBUTE_DE
        Py_RETURN_NONE;
 }
 
-PyObject *KX_GameObject::pyattr_get_group_children(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *KX_GameObject::pyattr_get_group_members(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        KX_GameObject* self = static_cast<KX_GameObject*>(self_v);
        CListValue* instances = self->GetInstanceObjects();
@@ -2012,7 +2012,7 @@ PyObject* KX_GameObject::pyattr_get_scene(void *self_v, const KX_PYATTRIBUTE_DEF
        Py_RETURN_NONE;
 }
 
-PyObject *KX_GameObject::pyattr_get_group_parent(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *KX_GameObject::pyattr_get_group_object(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
        KX_GameObject* self = static_cast<KX_GameObject*>(self_v);
        KX_GameObject* pivot = self->GetDupliGroupObject();
index d5ae13eb702fadf09a1aa8845f10e9f0fd280523..e71af674a79d6d8a5aebd1c9d4f5551c97d22d9a 100644 (file)
@@ -989,8 +989,8 @@ public:
        static PyObject*        pyattr_get_name(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
        static PyObject*        pyattr_get_parent(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 
-       static PyObject*        pyattr_get_group_parent(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
-       static PyObject*        pyattr_get_group_children(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
+       static PyObject*        pyattr_get_group_object(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
+       static PyObject*        pyattr_get_group_members(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
        static PyObject*        pyattr_get_scene(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 
        static PyObject*        pyattr_get_life(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
index 9430179e344cac93952035d9223e1cd669dcecdb..0188a7e15b8857943243c2e657503a70a1eeada6 100644 (file)
@@ -76,7 +76,7 @@ PyMethodDef KX_MeshProxy::Methods[] = {
        {"getVertex", (PyCFunction)KX_MeshProxy::sPyGetVertex,METH_VARARGS},
        {"getPolygon", (PyCFunction)KX_MeshProxy::sPyGetPolygon,METH_VARARGS},
        {"transform", (PyCFunction)KX_MeshProxy::sPyTransform,METH_VARARGS},
-       {"transform_uv", (PyCFunction)KX_MeshProxy::sPyTransformUV,METH_VARARGS},
+       {"transformUV", (PyCFunction)KX_MeshProxy::sPyTransformUV,METH_VARARGS},
        //{"getIndexArrayLength", (PyCFunction)KX_MeshProxy::sPyGetIndexArrayLength,METH_VARARGS},
        {NULL,NULL} //Sentinel
 };