griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

merge with trunk/2.5 at r23876

Browse Source 
[[Split portion of a mixed commit.]]
This commit is contained in:
Joseph Eagar
2009-10-22 23:22:05 +00:00
parent 36bb566d4e
commit 8f788c64db
1313 changed files with 104799 additions and 120780 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
source/gameengine/Ketsji/KX_PythonSeq.cpp
View File

@@ -28,9 +28,11 @@
* Readonly sequence wrapper for lookups on logic bricks
*/
#ifndef DISABLE_PYTHON
#include "KX_PythonSeq.h"
#include "KX_GameObject.h"
#include "BL_ArmatureObject.h"
#include "SCA_ISensor.h"
#include "SCA_IController.h"
#include "SCA_IActuator.h"
@@ -72,6 +74,10 @@ static Py_ssize_t KX_PythonSeq_len( PyObject * self )
return ((KX_GameObject *)self_plus)->GetControllers().size();
case KX_PYGENSEQ_OB_TYPE_ACTUATORS:
return ((KX_GameObject *)self_plus)->GetActuators().size();
case KX_PYGENSEQ_OB_TYPE_CONSTRAINTS:
return ((BL_ArmatureObject *)self_plus)->GetConstraintNumber();
case KX_PYGENSEQ_OB_TYPE_CHANNELS:
return ((BL_ArmatureObject *)self_plus)->GetChannelNumber();
default:
/* Should never happen */
PyErr_SetString(PyExc_SystemError, "invalid type, internal error");
@@ -139,6 +145,29 @@ static PyObject *KX_PythonSeq_getIndex(PyObject* self, int index)
}
return linkedactuators[index]->GetProxy();
}
case KX_PYGENSEQ_OB_TYPE_CONSTRAINTS:
{
int nb_constraint = ((BL_ArmatureObject *)self_plus)->GetConstraintNumber();
if(index<0)
index += nb_constraint;
if(index<0 || index>= nb_constraint) {
PyErr_SetString(PyExc_IndexError, "seq[i]: index out of range");
return NULL;
}
return ((BL_ArmatureObject *)self_plus)->GetConstraint(index)->GetProxy();
}
case KX_PYGENSEQ_OB_TYPE_CHANNELS:
{
int nb_channel = ((BL_ArmatureObject *)self_plus)->GetChannelNumber();
if(index<0)
index += nb_channel;
if(index<0 || index>= nb_channel) {
PyErr_SetString(PyExc_IndexError, "seq[i]: index out of range");
return NULL;
}
return ((BL_ArmatureObject *)self_plus)->GetChannel(index)->GetProxy();
}
}
PyErr_SetString(PyExc_SystemError, "invalid sequence type, this is a bug");
@@ -206,6 +235,14 @@ static PyObjectPlus * KX_PythonSeq_subscript__internal(PyObject *self, char *key
}
break;
}
case KX_PYGENSEQ_OB_TYPE_CONSTRAINTS:
{
return ((BL_ArmatureObject*)self_plus)->GetConstraint(key);
}
case KX_PYGENSEQ_OB_TYPE_CHANNELS:
{
return ((BL_ArmatureObject*)self_plus)->GetChannel(key);
}
}
return NULL;
@@ -472,3 +509,5 @@ PyTypeObject KX_PythonSeq_Type = {
NULL, /* PyObject *tp_weaklist; */
NULL
};
#endif // DISABLE_PYTHON