bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

use PyList_SET_ITEM instead of PyList_SetItem,

Browse Source 
PyList_SetItem does error checking and decref's existing values, PyList_SET_ITEM is a macro for direct assignment, only for use on new lists.
This commit is contained in:
Campbell Barton 2009-04-20 23:27:53 +00:00
parent 217bbb7800
commit 720f7a8b69
7 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/gameengine/Expressions/PyObjectPlus.cpp
View File

@ -240,14 +240,14 @@ PyObject *PyObjectPlus::py_get_attrdef(void *self, const PyAttributeDef *attrdef
{
bool *val = reinterpret_cast<bool*>(ptr);
ptr += sizeof(bool);
PyList_SetItem(resultlist,i,PyInt_FromLong(*val));
PyList_SET_ITEM(resultlist,i,PyInt_FromLong(*val));
break;
}
case KX_PYATTRIBUTE_TYPE_SHORT:
{
short int *val = reinterpret_cast<short int*>(ptr);
ptr += sizeof(short int);
PyList_SetItem(resultlist,i,PyInt_FromLong(*val));
PyList_SET_ITEM(resultlist,i,PyInt_FromLong(*val));
break;
}
case KX_PYATTRIBUTE_TYPE_ENUM:
@ -262,14 +262,14 @@ PyObject *PyObjectPlus::py_get_attrdef(void *self, const PyAttributeDef *attrdef
{
int *val = reinterpret_cast<int*>(ptr);
ptr += sizeof(int);
PyList_SetItem(resultlist,i,PyInt_FromLong(*val));
PyList_SET_ITEM(resultlist,i,PyInt_FromLong(*val));
break;
}
case KX_PYATTRIBUTE_TYPE_FLOAT:
{
float *val = reinterpret_cast<float*>(ptr);
ptr += sizeof(float);
PyList_SetItem(resultlist,i,PyFloat_FromDouble(*val));
PyList_SET_ITEM(resultlist,i,PyFloat_FromDouble(*val));
break;
}
default:

2
source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
View File

@ -694,7 +694,7 @@ PyObject* SCA_KeyboardSensor::pyattr_get_events(void *self_v, const KX_PYATTRIBU
{
PyObject* keypair = PyList_New(2);
PyList_SET_ITEM(keypair,0,PyInt_FromLong(i));
PyList_SetItem(keypair,1,PyInt_FromLong(inevent.m_status));
PyList_SET_ITEM(keypair,1,PyInt_FromLong(inevent.m_status));
PyList_Append(resultlist,keypair);
}
}

6
source/gameengine/Ketsji/KX_ConstraintActuator.cpp
View File

@ -754,9 +754,9 @@ PyObject* KX_ConstraintActuator::PyGetDirection(){
ShowDeprecationWarning("getDirection()", "the direction property");
PyObject *retVal = PyList_New(3);
PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_refDirection[0]));
PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_refDirection[1]));
PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_refDirection[2]));
PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_refDirection[0]));
PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_refDirection[1]));
PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_refDirection[2]));
return retVal;
}

72
source/gameengine/Ketsji/KX_ObjectActuator.cpp
View File

@ -352,10 +352,10 @@ PyObject* KX_ObjectActuator::PyGetForce()
{
PyObject *retVal = PyList_New(4);
PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_force[0]));
PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_force[1]));
PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_force[2]));
PyList_SetItem(retVal, 3, BoolToPyArg(m_bitLocalFlag.Force));
PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_force[0]));
PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_force[1]));
PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_force[2]));
PyList_SET_ITEM(retVal, 3, BoolToPyArg(m_bitLocalFlag.Force));
return retVal;
}
@ -379,10 +379,10 @@ PyObject* KX_ObjectActuator::PyGetTorque()
{
PyObject *retVal = PyList_New(4);
PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_torque[0]));
PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_torque[1]));
PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_torque[2]));
PyList_SetItem(retVal, 3, BoolToPyArg(m_bitLocalFlag.Torque));
PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_torque[0]));
PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_torque[1]));
PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_torque[2]));
PyList_SET_ITEM(retVal, 3, BoolToPyArg(m_bitLocalFlag.Torque));
return retVal;
}
@ -406,10 +406,10 @@ PyObject* KX_ObjectActuator::PyGetDLoc()
{
PyObject *retVal = PyList_New(4);
PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_dloc[0]));
PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_dloc[1]));
PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_dloc[2]));
PyList_SetItem(retVal, 3, BoolToPyArg(m_bitLocalFlag.DLoc));
PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_dloc[0]));
PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_dloc[1]));
PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_dloc[2]));
PyList_SET_ITEM(retVal, 3, BoolToPyArg(m_bitLocalFlag.DLoc));
return retVal;
}
@ -433,10 +433,10 @@ PyObject* KX_ObjectActuator::PyGetDRot()
{
PyObject *retVal = PyList_New(4);
PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_drot[0]));
PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_drot[1]));
PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_drot[2]));
PyList_SetItem(retVal, 3, BoolToPyArg(m_bitLocalFlag.DRot));
PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_drot[0]));
PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_drot[1]));
PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_drot[2]));
PyList_SET_ITEM(retVal, 3, BoolToPyArg(m_bitLocalFlag.DRot));
return retVal;
}
@ -459,10 +459,10 @@ PyObject* KX_ObjectActuator::PySetDRot(PyObject* args)
PyObject* KX_ObjectActuator::PyGetLinearVelocity() {
PyObject *retVal = PyList_New(4);
PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_linear_velocity[0]));
PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_linear_velocity[1]));
PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_linear_velocity[2]));
PyList_SetItem(retVal, 3, BoolToPyArg(m_bitLocalFlag.LinearVelocity));
PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_linear_velocity[0]));
PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_linear_velocity[1]));
PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_linear_velocity[2]));
PyList_SET_ITEM(retVal, 3, BoolToPyArg(m_bitLocalFlag.LinearVelocity));
return retVal;
}
@ -486,10 +486,10 @@ PyObject* KX_ObjectActuator::PySetLinearVelocity(PyObject* args) {
PyObject* KX_ObjectActuator::PyGetAngularVelocity() {
PyObject *retVal = PyList_New(4);
PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_angular_velocity[0]));
PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_angular_velocity[1]));
PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_angular_velocity[2]));
PyList_SetItem(retVal, 3, BoolToPyArg(m_bitLocalFlag.AngularVelocity));
PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_angular_velocity[0]));
PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_angular_velocity[1]));
PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_angular_velocity[2]));
PyList_SET_ITEM(retVal, 3, BoolToPyArg(m_bitLocalFlag.AngularVelocity));
return retVal;
}
@ -526,9 +526,9 @@ PyObject* KX_ObjectActuator::PyGetForceLimitX()
{
PyObject *retVal = PyList_New(3);
PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_drot[0]));
PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_dloc[0]));
PyList_SetItem(retVal, 2, BoolToPyArg(m_bitLocalFlag.Torque));
PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_drot[0]));
PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_dloc[0]));
PyList_SET_ITEM(retVal, 2, BoolToPyArg(m_bitLocalFlag.Torque));
return retVal;
}
@ -551,9 +551,9 @@ PyObject* KX_ObjectActuator::PyGetForceLimitY()
{
PyObject *retVal = PyList_New(3);
PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_drot[1]));
PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_dloc[1]));
PyList_SetItem(retVal, 2, BoolToPyArg(m_bitLocalFlag.DLoc));
PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_drot[1]));
PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_dloc[1]));
PyList_SET_ITEM(retVal, 2, BoolToPyArg(m_bitLocalFlag.DLoc));
return retVal;
}
@ -576,9 +576,9 @@ PyObject* KX_ObjectActuator::PyGetForceLimitZ()
{
PyObject *retVal = PyList_New(3);
PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_drot[2]));
PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_dloc[2]));
PyList_SetItem(retVal, 2, BoolToPyArg(m_bitLocalFlag.DRot));
PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_drot[2]));
PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_dloc[2]));
PyList_SET_ITEM(retVal, 2, BoolToPyArg(m_bitLocalFlag.DRot));
return retVal;
}
@ -601,9 +601,9 @@ PyObject* KX_ObjectActuator::PyGetPID()
{
PyObject *retVal = PyList_New(3);
PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_torque[0]));
PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_torque[1]));
PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_torque[2]));
PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_torque[0]));
PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_torque[1]));
PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_torque[2]));
return retVal;
}

4
source/gameengine/Ketsji/KX_PythonInit.cpp
View File

@ -216,13 +216,13 @@ static PyObject* gPyGetSpectrum(PyObject*)
for (int index = 0; index < 512; index++)
{
PyList_SetItem(resultlist, index, PyFloat_FromDouble(spectrum[index]));
PyList_SET_ITEM(resultlist, index, PyFloat_FromDouble(spectrum[index]));
}
}
else {
for (int index = 0; index < 512; index++)
{
PyList_SetItem(resultlist, index, PyFloat_FromDouble(0.0));
PyList_SET_ITEM(resultlist, index, PyFloat_FromDouble(0.0));
}
}

12
source/gameengine/Ketsji/KX_RadarSensor.cpp
View File

@ -212,9 +212,9 @@ PyObject* KX_RadarSensor::PyGetConeOrigin() {
PyObject *retVal = PyList_New(3);
PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_cone_origin[0]));
PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_cone_origin[1]));
PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_cone_origin[2]));
PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_cone_origin[0]));
PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_cone_origin[1]));
PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_cone_origin[2]));
return retVal;
}
@ -228,9 +228,9 @@ PyObject* KX_RadarSensor::PyGetConeTarget() {
PyObject *retVal = PyList_New(3);
PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_cone_target[0]));
PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_cone_target[1]));
PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_cone_target[2]));
PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_cone_target[0]));
PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_cone_target[1]));
PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_cone_target[2]));
return retVal;
}

18
source/gameengine/Ketsji/KX_RaySensor.cpp
View File

@ -404,9 +404,9 @@ PyObject* KX_RaySensor::PyGetHitPosition()
PyObject *retVal = PyList_New(3);
PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_hitPosition[0]));
PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_hitPosition[1]));
PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_hitPosition[2]));
PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_hitPosition[0]));
PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_hitPosition[1]));
PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_hitPosition[2]));
return retVal;
}
@ -420,9 +420,9 @@ PyObject* KX_RaySensor::PyGetRayDirection()
PyObject *retVal = PyList_New(3);
PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_rayDirection[0]));
PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_rayDirection[1]));
PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_rayDirection[2]));
PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_rayDirection[0]));
PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_rayDirection[1]));
PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_rayDirection[2]));
return retVal;
}
@ -436,9 +436,9 @@ PyObject* KX_RaySensor::PyGetHitNormal()
PyObject *retVal = PyList_New(3);
PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_hitNormal[0]));
PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_hitNormal[1]));
PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_hitNormal[2]));
PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_hitNormal[0]));
PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_hitNormal[1]));
PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_hitNormal[2]));
return retVal;
}