Revision: 19426
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19426
Author: ben2610
Date: 2009-03-27 22:54:16 +0100 (Fri, 27 Mar 2009)
Log Message:
-----------
BGE API cleanup: AddObject, DeleteObject and Scene actuator added.
Modified Paths:
--------------
trunk/blender/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
trunk/blender/source/gameengine/Ketsji/KX_SceneActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_SceneActuator.h
trunk/blender/source/gameengine/PyDoc/KX_SCA_AddObjectActuator.py
trunk/blender/source/gameengine/PyDoc/KX_SceneActuator.py
Modified: trunk/blender/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
2009-03-27 16:27:48 UTC (rev 19425)
+++ trunk/blender/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
2009-03-27 21:54:16 UTC (rev 19426)
@@ -38,7 +38,7 @@
#include "SCA_IScene.h"
#include "KX_GameObject.h"
#include "KX_IPhysicsController.h"
-
+#include "blendef.h"
#include "PyObjectPlus.h"
#ifdef HAVE_CONFIG_H
@@ -53,9 +53,9 @@
SCA_IObject *original,
int time,
SCA_IScene* scene,
-
const MT_Vector3& linvel,
+
const float *linvel,
bool linv_local,
-
const MT_Vector3& angvel,
+
const float *angvel,
bool angv_local,
PyTypeObject* T)
:
@@ -63,12 +63,16 @@
m_OriginalObject(original),
m_scene(scene),
- m_linear_velocity(linvel),
m_localLinvFlag(linv_local),
-
- m_angular_velocity(angvel),
m_localAngvFlag(angv_local)
{
+ m_linear_velocity[0] = linvel[0];
+ m_linear_velocity[1] = linvel[1];
+ m_linear_velocity[2] = linvel[2];
+ m_angular_velocity[0] = angvel[0];
+ m_angular_velocity[1] = angvel[1];
+ m_angular_velocity[2] = angvel[2];
+
if (m_OriginalObject)
m_OriginalObject->RegisterActuator(this);
@@ -188,6 +192,7 @@
NULL
};
PyMethodDef KX_SCA_AddObjectActuator::Methods[] = {
+ // ---> deprecated
{"setTime", (PyCFunction) KX_SCA_AddObjectActuator::sPySetTime, METH_O,
(PY_METHODCHAR)SetTime_doc},
{"getTime", (PyCFunction) KX_SCA_AddObjectActuator::sPyGetTime, METH_NOARGS,
(PY_METHODCHAR)GetTime_doc},
{"getLinearVelocity", (PyCFunction)
KX_SCA_AddObjectActuator::sPyGetLinearVelocity, METH_NOARGS,
(PY_METHODCHAR)GetLinearVelocity_doc},
@@ -196,8 +201,6 @@
{"setAngularVelocity", (PyCFunction)
KX_SCA_AddObjectActuator::sPySetAngularVelocity, METH_VARARGS,
(PY_METHODCHAR)SetAngularVelocity_doc},
{"getLastCreatedObject", (PyCFunction)
KX_SCA_AddObjectActuator::sPyGetLastCreatedObject,
METH_NOARGS,"getLastCreatedObject() : get the object handle to the last created
object\n"},
{"instantAddObject", (PyCFunction)
KX_SCA_AddObjectActuator::sPyInstantAddObject, METH_NOARGS,"instantAddObject()
: immediately add object without delay\n"},
-
- // ---> deprecated
{"setObject", (PyCFunction) KX_SCA_AddObjectActuator::sPySetObject, METH_O,
(PY_METHODCHAR)SetObject_doc},
{"getObject", (PyCFunction) KX_SCA_AddObjectActuator::sPyGetObject,
METH_VARARGS, (PY_METHODCHAR)GetObject_doc},
@@ -205,41 +208,65 @@
};
PyAttributeDef KX_SCA_AddObjectActuator::Attributes[] = {
+
KX_PYATTRIBUTE_RW_FUNCTION("object",KX_SCA_AddObjectActuator,pyattr_get_object,pyattr_set_object),
+
KX_PYATTRIBUTE_RO_FUNCTION("objectLastCreated",KX_SCA_AddObjectActuator,pyattr_get_objectLastCreated),
+
KX_PYATTRIBUTE_INT_RW("time",0,2000,true,KX_SCA_AddObjectActuator,m_timeProp),
+
KX_PYATTRIBUTE_FLOAT_ARRAY_RW("linearVelocity",-MAXFLOAT,MAXFLOAT,KX_SCA_AddObjectActuator,m_linear_velocity,3),
+
KX_PYATTRIBUTE_FLOAT_ARRAY_RW("angularVelocity",-MAXFLOAT,MAXFLOAT,KX_SCA_AddObjectActuator,m_angular_velocity,3),
{ NULL } //Sentinel
};
-PyObject* KX_SCA_AddObjectActuator::_getattr(const char *attr)
+PyObject* KX_SCA_AddObjectActuator::pyattr_get_object(void *self, const struct
KX_PYATTRIBUTE_DEF *attrdef)
{
- if (!strcmp(attr, "object")) {
- if (!m_OriginalObject) Py_RETURN_NONE;
- else return
m_OriginalObject->AddRef();
- } else if (!strcmp(attr, "objectLastCreated")) {
- if (!m_OriginalObject) Py_RETURN_NONE;
- else return
m_lastCreatedObject->AddRef();
- }
-
- _getattr_up(SCA_IActuator);
+ KX_SCA_AddObjectActuator* actuator =
static_cast<KX_SCA_AddObjectActuator*>(self);
+ if (!actuator->m_OriginalObject)
+ Py_RETURN_NONE;
+ else
+ return actuator->m_OriginalObject->AddRef();
}
-int KX_SCA_AddObjectActuator::_setattr(const char *attr, PyObject* value) {
-
- if (!strcmp(attr, "object")) {
- KX_GameObject *gameobj;
+int KX_SCA_AddObjectActuator::pyattr_set_object(void *self, const struct
KX_PYATTRIBUTE_DEF *attrdef, PyObject *value)
+{
+ KX_SCA_AddObjectActuator* actuator =
static_cast<KX_SCA_AddObjectActuator*>(self);
+ KX_GameObject *gameobj;
- if (!ConvertPythonToGameObject(value, &gameobj, true))
- return 1; // ConvertPythonToGameObject sets the error
+ if (!ConvertPythonToGameObject(value, &gameobj, true))
+ return 1; // ConvertPythonToGameObject sets the error
- if (m_OriginalObject != NULL)
- m_OriginalObject->UnregisterActuator(this);
+ if (actuator->m_OriginalObject != NULL)
+ actuator->m_OriginalObject->UnregisterActuator(actuator);
- m_OriginalObject = (SCA_IObject*)gameobj;
+ actuator->m_OriginalObject = (SCA_IObject*)gameobj;
- if (m_OriginalObject)
- m_OriginalObject->RegisterActuator(this);
+ if (actuator->m_OriginalObject)
+ actuator->m_OriginalObject->RegisterActuator(actuator);
- return 0;
- }
-
+ return 0;
+}
+
+PyObject* KX_SCA_AddObjectActuator::pyattr_get_objectLastCreated(void *self,
const struct KX_PYATTRIBUTE_DEF *attrdef)
+{
+ KX_SCA_AddObjectActuator* actuator =
static_cast<KX_SCA_AddObjectActuator*>(self);
+ if (!actuator->m_lastCreatedObject)
+ Py_RETURN_NONE;
+ else
+ return actuator->m_lastCreatedObject->AddRef();
+}
+
+
+PyObject* KX_SCA_AddObjectActuator::_getattr(const char *attr)
+{
+ PyObject* object = _getattr_self(Attributes, this, attr);
+ if (object != NULL)
+ return object;
+ _getattr_up(SCA_IActuator);
+}
+
+int KX_SCA_AddObjectActuator::_setattr(const char *attr, PyObject* value)
+{
+ int ret = _setattr_self(Attributes, this, attr, value);
+ if (ret >= 0)
+ return ret;
return SCA_IActuator::_setattr(attr, value);
}
@@ -280,6 +307,7 @@
PyObject* KX_SCA_AddObjectActuator::PySetTime(PyObject* self, PyObject* value)
{
+ ShowDeprecationWarning("setTime()", "the time property");
int deltatime = PyInt_AsLong(value);
if (deltatime==-1 && PyErr_Occurred()) {
PyErr_SetString(PyExc_TypeError, "expected an int");
@@ -296,12 +324,13 @@
/* 3. getTime */
const char KX_SCA_AddObjectActuator::GetTime_doc[] =
-"GetTime()\n"
+"getTime()\n"
"\tReturns the lifetime of the object that will be added.\n";
PyObject* KX_SCA_AddObjectActuator::PyGetTime(PyObject* self)
{
+ ShowDeprecationWarning("getTime()", "the time property");
return PyInt_FromLong(m_timeProp);
}
@@ -339,6 +368,7 @@
PyObject* KX_SCA_AddObjectActuator::PyGetLinearVelocity(PyObject* self)
{
+ ShowDeprecationWarning("getLinearVelocity()", "the linearVelocity
property");
PyObject *retVal = PyList_New(3);
PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_linear_velocity[0]));
@@ -361,12 +391,15 @@
PyObject* KX_SCA_AddObjectActuator::PySetLinearVelocity(PyObject* self,
PyObject* args)
{
+ ShowDeprecationWarning("setLinearVelocity()", "the linearVelocity
property");
float vecArg[3];
if (!PyArg_ParseTuple(args, "fff", &vecArg[0], &vecArg[1], &vecArg[2]))
return NULL;
- m_linear_velocity.setValue(vecArg);
+ m_linear_velocity[0] = vecArg[0];
+ m_linear_velocity[1] = vecArg[1];
+ m_linear_velocity[2] = vecArg[2];
Py_RETURN_NONE;
}
@@ -378,6 +411,7 @@
PyObject* KX_SCA_AddObjectActuator::PyGetAngularVelocity(PyObject* self)
{
+ ShowDeprecationWarning("getAngularVelocity()", "the angularVelocity
property");
PyObject *retVal = PyList_New(3);
PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_angular_velocity[0]));
@@ -400,12 +434,15 @@
PyObject* KX_SCA_AddObjectActuator::PySetAngularVelocity(PyObject* self,
PyObject* args)
{
+ ShowDeprecationWarning("setAngularVelocity()", "the angularVelocity
property");
float vecArg[3];
if (!PyArg_ParseTuple(args, "fff", &vecArg[0], &vecArg[1], &vecArg[2]))
return NULL;
- m_angular_velocity.setValue(vecArg);
+ m_angular_velocity[0] = vecArg[0];
+ m_angular_velocity[1] = vecArg[1];
+ m_angular_velocity[2] = vecArg[2];
Py_RETURN_NONE;
}
@@ -417,7 +454,7 @@
// Now it needs to be added to the current scene.
SCA_IObject* replica =
m_scene->AddReplicaObject(m_OriginalObject,GetParent(),m_timeProp );
KX_GameObject * game_obj = static_cast<KX_GameObject
*>(replica);
- game_obj->setLinearVelocity(m_linear_velocity,m_localLinvFlag);
+ game_obj->setLinearVelocity(m_linear_velocity ,m_localLinvFlag);
game_obj->setAngularVelocity(m_angular_velocity,m_localAngvFlag);
game_obj->ResolveCombinedVelocities(m_linear_velocity,
m_angular_velocity, m_localLinvFlag, m_localAngvFlag);
@@ -453,6 +490,7 @@
PyObject* KX_SCA_AddObjectActuator::PyGetLastCreatedObject(PyObject* self)
{
+ ShowDeprecationWarning("getLastCreatedObject()", "the objectLastCreated
property");
SCA_IObject* result = this->GetLastCreatedObject();
// if result->GetSGNode() is NULL
Modified: trunk/blender/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
2009-03-27 16:27:48 UTC (rev 19425)
+++ trunk/blender/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
2009-03-27 21:54:16 UTC (rev 19426)
@@ -59,12 +59,12 @@
SCA_IScene* m_scene;
/// Linear velocity upon creation of the object.
- MT_Vector3 m_linear_velocity;
+ float m_linear_velocity[3];
/// Apply the velocity locally
bool m_localLinvFlag;
/// Angular velocity upon creation of the object.
- MT_Vector3 m_angular_velocity;
+ float m_angular_velocity[3];
/// Apply the velocity locally
bool m_localAngvFlag;
@@ -85,9 +85,9 @@
SCA_IObject *original,
int time,
SCA_IScene* scene,
- const MT_Vector3& linvel,
+ const float *linvel,
bool linv_local,
- const MT_Vector3& angvel,
+ const float *angvel,
bool angv_local,
PyTypeObject* T=&Type
);
@@ -140,6 +140,9 @@
/* 10. instantAddObject*/
KX_PYMETHOD_DOC_NOARGS(KX_SCA_AddObjectActuator,InstantAddObject);
+ static PyObject* pyattr_get_object(void *self, const struct
KX_PYATTRIBUTE_DEF *attrdef);
+ static int pyattr_set_object(void *self, const struct
KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
+ static PyObject* pyattr_get_objectLastCreated(void *self, const struct
KX_PYATTRIBUTE_DEF *attrdef);
}; /* end of class KX_SCA_AddObjectActuator : public KX_EditObjectActuator */
Modified: trunk/blender/source/gameengine/Ketsji/KX_SceneActuator.cpp
===================================================================
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
