[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38876] trunk/blender/source/gameengine/ Ketsji/KX_PyConstraintBinding.cpp: whitespace edits, had odd space/tab mix

Campbell Barton ideasman42 at gmail.com
Sun Jul 31 09:54:24 CEST 2011


Revision: 38876
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38876
Author:   campbellbarton
Date:     2011-07-31 07:54:24 +0000 (Sun, 31 Jul 2011)
Log Message:
-----------
whitespace edits, had odd space/tab mix

Modified Paths:
--------------
    trunk/blender/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp

Modified: trunk/blender/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp	2011-07-31 07:45:54 UTC (rev 38875)
+++ trunk/blender/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp	2011-07-31 07:54:24 UTC (rev 38876)
@@ -92,8 +92,8 @@
 
 
 static PyObject* gPySetGravity(PyObject* self,
-										 PyObject* args, 
-										 PyObject* kwds)
+                               PyObject* args,
+                               PyObject* kwds)
 {
 	float x,y,z;
 	if (PyArg_ParseTuple(args,"fff",&x,&y,&z))
@@ -109,8 +109,8 @@
 }
 
 static PyObject* gPySetDebugMode(PyObject* self,
-										 PyObject* args, 
-										 PyObject* kwds)
+                                 PyObject* args,
+                                 PyObject* kwds)
 {
 	int mode;
 	if (PyArg_ParseTuple(args,"i",&mode))
@@ -132,8 +132,8 @@
 
 
 static PyObject* gPySetNumTimeSubSteps(PyObject* self,
-										 PyObject* args, 
-										 PyObject* kwds)
+                                       PyObject* args,
+                                       PyObject* kwds)
 {
 	int substep;
 	if (PyArg_ParseTuple(args,"i",&substep))
@@ -151,8 +151,8 @@
 
 
 static PyObject* gPySetNumIterations(PyObject* self,
-										 PyObject* args, 
-										 PyObject* kwds)
+                                     PyObject* args,
+                                     PyObject* kwds)
 {
 	int iter;
 	if (PyArg_ParseTuple(args,"i",&iter))
@@ -169,10 +169,9 @@
 }
 
 
-
 static PyObject* gPySetDeactivationTime(PyObject* self,
-										 PyObject* args, 
-										 PyObject* kwds)
+                                        PyObject* args,
+                                        PyObject* kwds)
 {
 	float deactive_time;
 	if (PyArg_ParseTuple(args,"f",&deactive_time))
@@ -190,8 +189,8 @@
 
 
 static PyObject* gPySetDeactivationLinearTreshold(PyObject* self,
-										 PyObject* args, 
-										 PyObject* kwds)
+                                                  PyObject* args,
+                                                  PyObject* kwds)
 {
 	float linearDeactivationTreshold;
 	if (PyArg_ParseTuple(args,"f",&linearDeactivationTreshold))
@@ -209,8 +208,8 @@
 
 
 static PyObject* gPySetDeactivationAngularTreshold(PyObject* self,
-										 PyObject* args, 
-										 PyObject* kwds)
+                                                   PyObject* args,
+                                                   PyObject* kwds)
 {
 	float angularDeactivationTreshold;
 	if (PyArg_ParseTuple(args,"f",&angularDeactivationTreshold))
@@ -227,8 +226,8 @@
 }
 
 static PyObject* gPySetContactBreakingTreshold(PyObject* self,
-										 PyObject* args, 
-										 PyObject* kwds)
+                                               PyObject* args,
+                                               PyObject* kwds)
 {
 	float contactBreakingTreshold;
 	if (PyArg_ParseTuple(args,"f",&contactBreakingTreshold))
@@ -246,8 +245,8 @@
 
 
 static PyObject* gPySetCcdMode(PyObject* self,
-										 PyObject* args, 
-										 PyObject* kwds)
+                               PyObject* args,
+                               PyObject* kwds)
 {
 	float ccdMode;
 	if (PyArg_ParseTuple(args,"f",&ccdMode))
@@ -264,8 +263,8 @@
 }
 
 static PyObject* gPySetSorConstant(PyObject* self,
-										 PyObject* args, 
-										 PyObject* kwds)
+                                   PyObject* args,
+                                   PyObject* kwds)
 {
 	float sor;
 	if (PyArg_ParseTuple(args,"f",&sor))
@@ -282,8 +281,8 @@
 }
 
 static PyObject* gPySetSolverTau(PyObject* self,
-										 PyObject* args, 
-										 PyObject* kwds)
+                                 PyObject* args,
+                                 PyObject* kwds)
 {
 	float tau;
 	if (PyArg_ParseTuple(args,"f",&tau))
@@ -301,8 +300,8 @@
 
 
 static PyObject* gPySetSolverDamping(PyObject* self,
-										 PyObject* args, 
-										 PyObject* kwds)
+                                     PyObject* args,
+                                     PyObject* kwds)
 {
 	float damping;
 	if (PyArg_ParseTuple(args,"f",&damping))
@@ -319,8 +318,8 @@
 }
 
 static PyObject* gPySetLinearAirDamping(PyObject* self,
-										 PyObject* args, 
-										 PyObject* kwds)
+                                        PyObject* args,
+                                        PyObject* kwds)
 {
 	float damping;
 	if (PyArg_ParseTuple(args,"f",&damping))
@@ -338,8 +337,8 @@
 
 
 static PyObject* gPySetUseEpa(PyObject* self,
-										 PyObject* args, 
-										 PyObject* kwds)
+                              PyObject* args,
+                              PyObject* kwds)
 {
 	int	epa;
 	if (PyArg_ParseTuple(args,"i",&epa))
@@ -355,8 +354,8 @@
 	Py_RETURN_NONE;
 }
 static PyObject* gPySetSolverType(PyObject* self,
-										 PyObject* args, 
-										 PyObject* kwds)
+                                  PyObject* args,
+                                  PyObject* kwds)
 {
 	int	solverType;
 	if (PyArg_ParseTuple(args,"i",&solverType))
@@ -375,8 +374,8 @@
 
 
 static PyObject* gPyGetVehicleConstraint(PyObject* self,
-										 PyObject* args, 
-										 PyObject* kwds)
+                                         PyObject* args,
+                                         PyObject* kwds)
 {
 #if defined(_WIN64)
 	__int64 constraintid;
@@ -406,9 +405,6 @@
 }
 
 
-
-
-
 static PyObject* gPyCreateConstraint(PyObject* self,
 										 PyObject* args, 
 										 PyObject* kwds)
@@ -433,48 +429,48 @@
 		success = PyArg_ParseTuple(args,"lli",&physicsid,&physicsid2,&constrainttype);
 #endif
 	}
-	else
-	if (len ==6)
-	{
+	else {
+		if (len ==6) {
 #if defined(_WIN64)
-		success = PyArg_ParseTuple(args,"LLifff",&physicsid,&physicsid2,&constrainttype,
-			&pivotX,&pivotY,&pivotZ);
+			success = PyArg_ParseTuple(args,"LLifff",&physicsid,&physicsid2,&constrainttype,
+			                           &pivotX,&pivotY,&pivotZ);
 #else
-		success = PyArg_ParseTuple(args,"llifff",&physicsid,&physicsid2,&constrainttype,
-								   &pivotX,&pivotY,&pivotZ);		
+			success = PyArg_ParseTuple(args,"llifff",&physicsid,&physicsid2,&constrainttype,
+			                           &pivotX,&pivotY,&pivotZ);
 #endif	
-	}
-	else if (len == 9)
-	{
+		}
+		else if (len == 9)
+		{
 #if defined(_WIN64)
-		success = PyArg_ParseTuple(args,"LLiffffff",&physicsid,&physicsid2,&constrainttype,
-			&pivotX,&pivotY,&pivotZ,&axisX,&axisY,&axisZ);
+			success = PyArg_ParseTuple(args,"LLiffffff",&physicsid,&physicsid2,&constrainttype,
+			                           &pivotX,&pivotY,&pivotZ,&axisX,&axisY,&axisZ);
 #else
-		success = PyArg_ParseTuple(args,"lliffffff",&physicsid,&physicsid2,&constrainttype,
-								   &pivotX,&pivotY,&pivotZ,&axisX,&axisY,&axisZ);
+			success = PyArg_ParseTuple(args,"lliffffff",&physicsid,&physicsid2,&constrainttype,
+			                           &pivotX,&pivotY,&pivotZ,&axisX,&axisY,&axisZ);
 #endif
-	
-	}
-	else if (len == 10)
-	{
+
+		}
+		else if (len == 10)
+		{
 #if defined(_WIN64)
-		success = PyArg_ParseTuple(args,"LLiffffffi",&physicsid,&physicsid2,&constrainttype,
-			&pivotX,&pivotY,&pivotZ,&axisX,&axisY,&axisZ,&flag);
+			success = PyArg_ParseTuple(args,"LLiffffffi",&physicsid,&physicsid2,&constrainttype,
+			                           &pivotX,&pivotY,&pivotZ,&axisX,&axisY,&axisZ,&flag);
 #else
-		success = PyArg_ParseTuple(args,"lliffffffi",&physicsid,&physicsid2,&constrainttype,
-								   &pivotX,&pivotY,&pivotZ,&axisX,&axisY,&axisZ,&flag);
+			success = PyArg_ParseTuple(args,"lliffffffi",&physicsid,&physicsid2,&constrainttype,
+			                           &pivotX,&pivotY,&pivotZ,&axisX,&axisY,&axisZ,&flag);
 #endif
-	}
-	else if (len==4)
-	{
+		}
+		else if (len==4)
+		{
 #if defined(_WIN64)
-		success = PyArg_ParseTuple(args,"LLii",&physicsid,&physicsid2,&constrainttype,&extrainfo);
+			success = PyArg_ParseTuple(args,"LLii",&physicsid,&physicsid2,&constrainttype,&extrainfo);
 #else
-		success = PyArg_ParseTuple(args,"llii",&physicsid,&physicsid2,&constrainttype,&extrainfo);
+			success = PyArg_ParseTuple(args,"llii",&physicsid,&physicsid2,&constrainttype,&extrainfo);
 #endif
-		pivotX=extrainfo;
+			pivotX=extrainfo;
+		}
 	}
-	
+
 	if (success)
 	{
 		if (PHY_GetActiveEnvironment())
@@ -498,20 +494,18 @@
 					MT_Vector3 axis0 = localCFrame.getColumn(0);
 					MT_Vector3 axis1 = localCFrame.getColumn(1);
 					MT_Vector3 axis2 = localCFrame.getColumn(2);
-						
-					constraintid = PHY_GetActiveEnvironment()->createConstraint(physctrl,physctrl2,(enum PHY_ConstraintType)constrainttype,
-						pivotX,pivotY,pivotZ,
-						(float)axis0.x(),(float)axis0.y(),(float)axis0.z(),
-						(float)axis1.x(),(float)axis1.y(),(float)axis1.z(),
-						(float)axis2.x(),(float)axis2.y(),(float)axis2.z(),flag);
 
-				} else
-				{
+					constraintid = PHY_GetActiveEnvironment()->createConstraint(physctrl,physctrl2,(enum PHY_ConstraintType)constrainttype,
+					                                                            pivotX,pivotY,pivotZ,
+					                                                            (float)axis0.x(),(float)axis0.y(),(float)axis0.z(),
+					                                                            (float)axis1.x(),(float)axis1.y(),(float)axis1.z(),
+					                                                            (float)axis2.x(),(float)axis2.y(),(float)axis2.z(),flag);
+				}
+				else {
 					constraintid = PHY_GetActiveEnvironment()->createConstraint(physctrl,physctrl2,(enum PHY_ConstraintType)constrainttype,pivotX,pivotY,pivotZ,axisX,axisY,axisZ,0);
 				}
 				
 				KX_ConstraintWrapper* wrap = new KX_ConstraintWrapper((enum PHY_ConstraintType)constrainttype,constraintid,PHY_GetActiveEnvironment());
-				
 
 				return wrap->NewProxy(true);
 			}
@@ -530,8 +524,8 @@
 
 
 static PyObject* gPyGetAppliedImpulse(PyObject* self,
-										 PyObject* args, 
-										 PyObject* kwds)
+                                      PyObject* args,
+                                      PyObject* kwds)
 {
 	float	appliedImpulse = 0.f;
 
@@ -557,8 +551,8 @@
 
 
 static PyObject* gPyRemoveConstraint(PyObject* self,
-										 PyObject* args, 
-										 PyObject* kwds)
+                                     PyObject* args,
+                                     PyObject* kwds)
 {
 #if defined(_WIN64)
 	__int64 constraintid;
@@ -585,7 +579,7 @@
 	char* filename;
 	if (!PyArg_ParseTuple(args,"s:exportBulletFile",&filename))
 		return NULL;
-		
+
 	if (PHY_GetActiveEnvironment())
 	{

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list