Revision: 15367
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15367
Author: campbellbarton
Date: 2008-06-27 13:35:55 +0200 (Fri, 27 Jun 2008)
Log Message:
-----------
patch [#15865] BGE API call to delete objects
from Dalai Felinto (dfelinto)
renamed deleteObject to endObject() to match the user interface.
Modified Paths:
--------------
trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
trunk/blender/source/gameengine/Ketsji/KX_GameObject.h
trunk/blender/source/gameengine/PyDoc/KX_GameObject.py
Modified: trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp 2008-06-27
01:23:26 UTC (rev 15366)
+++ trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp 2008-06-27
11:35:55 UTC (rev 15367)
@@ -825,6 +825,7 @@
{"getMesh", (PyCFunction)KX_GameObject::sPyGetMesh,METH_VARARGS},
{"getPhysicsId",
(PyCFunction)KX_GameObject::sPyGetPhysicsId,METH_VARARGS},
{"getPropertyNames",
(PyCFunction)KX_GameObject::sPyGetPropertyNames,METH_VARARGS},
+ {"endObject",(PyCFunction) KX_GameObject::sPyEndObject, METH_VARARGS},
KX_PYMETHODTABLE(KX_GameObject, getDistanceTo),
KX_PYMETHODTABLE(KX_GameObject, rayCastTo),
KX_PYMETHODTABLE(KX_GameObject, rayCast),
@@ -858,7 +859,19 @@
}
+PyObject* KX_GameObject::PyEndObject(PyObject* self,
+
PyObject* args,
+
PyObject* kwds)
+{
+ KX_Scene *scene = PHY_GetActiveScene();
+ scene->DelayedRemoveObject(this);
+
+ return Py_None;
+
+}
+
+
PyObject* KX_GameObject::PyGetPosition(PyObject* self,
PyObject* args,
PyObject* kwds)
Modified: trunk/blender/source/gameengine/Ketsji/KX_GameObject.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_GameObject.h 2008-06-27
01:23:26 UTC (rev 15366)
+++ trunk/blender/source/gameengine/Ketsji/KX_GameObject.h 2008-06-27
11:35:55 UTC (rev 15367)
@@ -710,7 +710,7 @@
PyObject* args,
PyObject* kwds
);
-
+
KX_PYMETHOD(KX_GameObject,GetPosition);
KX_PYMETHOD(KX_GameObject,GetLinearVelocity);
KX_PYMETHOD(KX_GameObject,GetVelocity);
@@ -733,6 +733,7 @@
KX_PYMETHOD(KX_GameObject,RemoveParent);
KX_PYMETHOD(KX_GameObject,GetPhysicsId);
KX_PYMETHOD(KX_GameObject,GetPropertyNames);
+ KX_PYMETHOD(KX_GameObject,EndObject);
KX_PYMETHOD_DOC(KX_GameObject,rayCastTo);
KX_PYMETHOD_DOC(KX_GameObject,rayCast);
KX_PYMETHOD_DOC(KX_GameObject,getDistanceTo);
Modified: trunk/blender/source/gameengine/PyDoc/KX_GameObject.py
===================================================================
--- trunk/blender/source/gameengine/PyDoc/KX_GameObject.py 2008-06-27
01:23:26 UTC (rev 15366)
+++ trunk/blender/source/gameengine/PyDoc/KX_GameObject.py 2008-06-27
11:35:55 UTC (rev 15367)
@@ -25,6 +25,11 @@
@ivar timeOffset: adjust the slowparent delay at runtime.
@type timeOffset: float
"""
+ def endObject(visible):
+ """
+ Delete this object, can be used inpace of the EndObject
Actuator.
+ The actual removal of the object from the scene is delayed.
+ """
def getVisible(visible):
"""
Gets the game object's visible flag.
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
