diff options
author | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-07-17 09:28:23 +0400 |
---|---|---|
committer | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-07-17 09:28:23 +0400 |
commit | baa2f99f079920d404af65798a8df3e82bcc6a48 (patch) | |
tree | 2e8fb2bad0c3824e87e12cc0ebf3d4933eeb56f3 /source/gameengine/GameLogic | |
parent | 90fb63152628927d5d13b0101f4f2dcec025d2f7 (diff) |
Port Python updates from Tuhopuu2:
getType/setType to action/sound actuator (sgefant)
Use a more generic python -> math conversion.
Diffstat (limited to 'source/gameengine/GameLogic')
-rw-r--r-- | source/gameengine/GameLogic/SCA_IObject.cpp | 16 | ||||
-rw-r--r-- | source/gameengine/GameLogic/SCA_IObject.h | 5 |
2 files changed, 5 insertions, 16 deletions
diff --git a/source/gameengine/GameLogic/SCA_IObject.cpp b/source/gameengine/GameLogic/SCA_IObject.cpp index bd356f07cb9..2be5af034c9 100644 --- a/source/gameengine/GameLogic/SCA_IObject.cpp +++ b/source/gameengine/GameLogic/SCA_IObject.cpp @@ -231,7 +231,7 @@ void SCA_IObject::SetCurrentTime(float currentTime) { } - +#if 0 const MT_Point3& SCA_IObject::ConvertPythonPylist(PyObject* pylist) { bool error = false; @@ -273,19 +273,7 @@ const MT_Point3& SCA_IObject::ConvertPythonPylist(PyObject* pylist) } return m_sDummy; } - - - -const MT_Point3& SCA_IObject::ConvertPythonVectorArg(PyObject* args) -{ - - PyObject* pylist; - PyArg_ParseTuple(args,"O",&pylist); - m_sDummy = ConvertPythonPylist(pylist); - return m_sDummy; -} - - +#endif void SCA_IObject::Suspend(void) { diff --git a/source/gameengine/GameLogic/SCA_IObject.h b/source/gameengine/GameLogic/SCA_IObject.h index b1bb013abea..f57201ba59d 100644 --- a/source/gameengine/GameLogic/SCA_IObject.h +++ b/source/gameengine/GameLogic/SCA_IObject.h @@ -43,6 +43,8 @@ class SCA_ISensor; class SCA_IController; class SCA_IActuator; +template<class T> T PyVecTo(PyObject*); + typedef std::vector<SCA_ISensor *> SCA_SensorList; typedef std::vector<SCA_IController *> SCA_ControllerList; typedef std::vector<SCA_IActuator *> SCA_ActuatorList; @@ -110,8 +112,7 @@ public: */ void Resume(void); - const class MT_Point3& ConvertPythonPylist(PyObject* pylist); - const class MT_Point3& ConvertPythonVectorArg(PyObject* args); +// const class MT_Point3& ConvertPythonPylist(PyObject* pylist); // here come the python forwarded methods virtual PyObject* _getattr(const STR_String& attr); |