[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19827] trunk/blender/source/gameengine: use PyList_SET_ITEM instead of PyList_SetItem,

Campbell Barton ideasman42 at gmail.com
Tue Apr 21 01:27:53 CEST 2009


Revision: 19827
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19827
Author:   campbellbarton
Date:     2009-04-21 01:27:53 +0200 (Tue, 21 Apr 2009)

Log Message:
-----------
use PyList_SET_ITEM instead of PyList_SetItem,

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.

Modified Paths:
--------------
    trunk/blender/source/gameengine/Expressions/PyObjectPlus.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    trunk/blender/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
    trunk/blender/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
    trunk/blender/source/gameengine/Ketsji/KX_RadarSensor.cpp
    trunk/blender/source/gameengine/Ketsji/KX_RaySensor.cpp

Modified: trunk/blender/source/gameengine/Expressions/PyObjectPlus.cpp
===================================================================
--- trunk/blender/source/gameengine/Expressions/PyObjectPlus.cpp	2009-04-20 23:17:52 UTC (rev 19826)
+++ trunk/blender/source/gameengine/Expressions/PyObjectPlus.cpp	2009-04-20 23:27:53 UTC (rev 19827)
@@ -199,7 +199,7 @@
 	}
 }
 
-PyObject* PyObjectPlus::py_getattro_dict() {
+PyObject* CValue::py_getattro_dict() {
 	return py_getattr_dict(NULL, Type.tp_dict);
 }
 
@@ -240,14 +240,14 @@
 				{
 					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 @@
 				{
 					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:

Modified: trunk/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp	2009-04-20 23:17:52 UTC (rev 19826)
+++ trunk/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp	2009-04-20 23:27:53 UTC (rev 19827)
@@ -694,7 +694,7 @@
 		{
 			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);
 		}
 	}	

Modified: trunk/blender/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_ConstraintActuator.cpp	2009-04-20 23:17:52 UTC (rev 19826)
+++ trunk/blender/source/gameengine/Ketsji/KX_ConstraintActuator.cpp	2009-04-20 23:27:53 UTC (rev 19827)
@@ -754,9 +754,9 @@
 	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;
 }
 

Modified: trunk/blender/source/gameengine/Ketsji/KX_ObjectActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_ObjectActuator.cpp	2009-04-20 23:17:52 UTC (rev 19826)
+++ trunk/blender/source/gameengine/Ketsji/KX_ObjectActuator.cpp	2009-04-20 23:27:53 UTC (rev 19827)
@@ -352,10 +352,10 @@
 {
 	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 *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 *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 *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::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::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 *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 *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 *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 *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;
 }

Modified: trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp	2009-04-20 23:17:52 UTC (rev 19826)
+++ trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp	2009-04-20 23:27:53 UTC (rev 19827)
@@ -216,13 +216,13 @@
 
 		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));
 		}
 	}
 

Modified: trunk/blender/source/gameengine/Ketsji/KX_RadarSensor.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_RadarSensor.cpp	2009-04-20 23:17:52 UTC (rev 19826)
+++ trunk/blender/source/gameengine/Ketsji/KX_RadarSensor.cpp	2009-04-20 23:27:53 UTC (rev 19827)
@@ -212,9 +212,9 @@
 
 	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]));

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list