UPBGE: Remove commented debug messages.

panzergame · panzergame · commit 14eb89061f07 · 2016-10-29T14:27:23.000+02:00
These message are removed for some reasons:
- they doesn't use a standardized message format.
- they are no lounguer usefull
- removing these message will obligate to rewrite them
  with a standardized format later if needed.
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -1204,7 +1204,7 @@ static void UNUSED_FUNCTION(print_active_constraints2)(Object *ob) //not used, u
 
 	if (conlist) {
 		for (curcon = (bConstraint *)conlist->first; curcon; curcon = (bConstraint *)curcon->next) {
-			printf("%i\n",curcon->type);
+			CM_Debug(curcon->type);
 		}
 	}
 }
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.h b/source/gameengine/Converter/KX_BlenderSceneConverter.h
@@ -172,7 +172,6 @@ class KX_BlenderSceneConverter : public KX_ISceneConverter
 #ifdef WITH_CXX_GUARDEDALLOC
 		MEM_printmemlist_pydict();
 #endif
-//		/printf("\t m_ketsjiEngine->m_scenes: %d\n", m_ketsjiEngine->CurrentScenes()->GetCount());
 	}
 	
 	/* LibLoad Options */
diff --git a/source/gameengine/Converter/KX_ConvertActuators.cpp b/source/gameengine/Converter/KX_ConvertActuators.cpp
@@ -1107,8 +1107,6 @@ void BL_ConvertActuators(const char* maggiename,
 																		mouAct->limit_x,
 																		mouAct->limit_y);
 					baseact = tmpbaseact;
-				} else {
-					//cout << "\n Couldn't find mouse event manager..."; - should throw an error here...
 				}
 				break;
 			}
diff --git a/source/gameengine/Converter/KX_ConvertSensors.cpp b/source/gameengine/Converter/KX_ConvertSensors.cpp
@@ -343,8 +343,6 @@ void BL_ConvertSensors(struct Object* blenderobject,
 								kxengine,
 								gameobj);
 						}
-					} else {
-						//				cout << "\n Could't find mouse event manager..."; - should throw an error here...
 					}
 					break;
 				}
diff --git a/source/gameengine/Expressions/intern/IntValue.cpp b/source/gameengine/Expressions/intern/IntValue.cpp
@@ -15,15 +15,15 @@
  *
  */
 
-#include <stdio.h>
-
 #include "EXP_IntValue.h"
 #include "EXP_ErrorValue.h"
 #include "EXP_FloatValue.h"
 #include "EXP_BoolValue.h"
 #include "EXP_StringValue.h"
 #include "EXP_VoidValue.h"
 
+#include "CM_Message.h"
+
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
@@ -176,7 +176,7 @@ CValue* CIntValue::CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue *v
 					ret = new CBoolValue(m_int == 0);
 					break;
 				default:
-					printf("Found op: %d\n", op);
+					CM_Error("found op: " << op);
 					ret = new CErrorValue("illegal operator. please send a bug report.");
 					break;
 			}
diff --git a/source/gameengine/Expressions/intern/PyObjectPlus.cpp b/source/gameengine/Expressions/intern/PyObjectPlus.cpp
@@ -1136,9 +1136,7 @@ PyObject *PyObjectPlus::GetProxyPlus_Ext(PyObjectPlus *self, PyTypeObject *tp, v
 		BGE_PROXY_WKREF(self->m_proxy) = NULL;
 #endif
 	}
-	//PyObject_Print(self->m_proxy, stdout, 0);
-	//printf("ref %d\n", self->m_proxy->ob_refcnt);
-	
+
 	BGE_PROXY_REF(self->m_proxy) = self; /* Its possible this was set to NULL, so set it back here */
 	BGE_PROXY_PTR(self->m_proxy) = ptr;
 	Py_INCREF(self->m_proxy); /* we own one, thos ones fore the return */
diff --git a/source/gameengine/GameLogic/SCA_PropertySensor.cpp b/source/gameengine/GameLogic/SCA_PropertySensor.cpp
@@ -172,22 +172,6 @@ bool	SCA_PropertySensor::CheckPropertyCondition()
 
 	case KX_PROPSENSOR_EXPRESSION:
 		{
-#if 0
-			if (m_rightexpr)
-			{
-				CValue* resultval = m_rightexpr->Calculate();
-				if (resultval->IsError())
-				{
-					int i=0;
-					STR_String errortest = resultval->GetText();
-					printf(errortest);
-
-				} else
-				{
-					result = resultval->GetNumber() != 0;
-				}
-			}
-#endif
 			break;
 		}
 	case KX_PROPSENSOR_INTERVAL:
@@ -226,7 +210,6 @@ bool	SCA_PropertySensor::CheckPropertyCondition()
 			}
 			orgprop->Release();
 
-			//cout << " \nSens:Prop:changed!"; /* need implementation here!!! */
 			break;
 		}
 	case KX_PROPSENSOR_LESSTHAN:
diff --git a/source/gameengine/GameLogic/SCA_PythonController.cpp b/source/gameengine/GameLogic/SCA_PythonController.cpp
@@ -67,26 +67,10 @@ SCA_PythonController::SCA_PythonController(SCA_IObject* gameobj, int mode)
 	
 }
 
-#if 0
-//debugging
-CValue *SCA_PythonController::AddRef()
-{
-	//printf("AddRef refcount = %i\n",GetRefCount());
-	return CValue::AddRef();
-}
-int SCA_PythonController::Release()
-{
-	//printf("Release refcount = %i\n",GetRefCount());
-	return CValue::Release();
-}
-#endif
-
 SCA_PythonController::~SCA_PythonController()
 {
 
 #ifdef WITH_PYTHON
-	//printf("released python byte script\n");
-	
 	Py_XDECREF(m_bytecode);
 	Py_XDECREF(m_function);
 	
@@ -278,7 +262,6 @@ void SCA_PythonController::ErrorPrint(const char *error_msg)
 
 bool SCA_PythonController::Compile()
 {
-	//printf("py script modified '%s'\n", m_scriptName.Ptr());
 	m_bModified= false;
 	
 	// if a script already exists, decref it before replace the pointer to a new script
@@ -300,7 +283,6 @@ bool SCA_PythonController::Compile()
 
 bool SCA_PythonController::Import()
 {
-	//printf("py module modified '%s'\n", m_scriptName.Ptr());
 	m_bModified= false;
 
 	/* in case we re-import */
diff --git a/source/gameengine/GamePlayer/GPG_ghost.cpp b/source/gameengine/GamePlayer/GPG_ghost.cpp
@@ -524,7 +524,6 @@ static void get_filename(int argc, char **argv, char *filename)
 		gamefile = new char [len + 1];
 		::strcpy(gamefile, argv[0]);
 		::strcpy(gamefile + srclen, "Resources/game.blend");
-		//::printf("looking for file: %s\n", filename);
 		
 		if (BLI_exists(gamefile))
 			BLI_strncpy(filename, gamefile, FILE_MAX);
@@ -814,7 +813,7 @@ int main(
 				else if (strcmp(argv[i], "memory") == 0) {
 					G.debug |= G_DEBUG;
 
-					std::cout << "Switching to fully guarded memory allocator." << std::endl;
+					CM_Debug("Switching to fully guarded memory allocator.");
 					MEM_use_guarded_allocator();
 
 					MEM_set_memory_debug();
@@ -824,7 +823,7 @@ int main(
 					++i;
 				}
 				else {
-					std::cout << "error: debug mode '" << argv[i] << "' unrecognized."  << std::endl;
+					CM_Error("debug mode '" << argv[i] << "' unrecognized.");
 				}
 
 				break;
@@ -1125,7 +1124,6 @@ int main(
 						if ((!fullScreenParFound) && (!windowParFound)) {
 							// Only use file settings when command line did not override
 							if ((scene->gm.playerflag & GAME_PLAYER_FULLSCREEN)) {
-								//printf("fullscreen option found in Blender file\n");
 								fullScreen = true;
 								fullScreenWidth= scene->gm.xplay;
 								fullScreenHeight= scene->gm.yplay;
diff --git a/source/gameengine/Ketsji/BL_Action.cpp b/source/gameengine/Ketsji/BL_Action.cpp
@@ -367,16 +367,12 @@ void BL_Action::BlendShape(Key* key, float srcweight, std::vector<float>& blends
 	KeyBlock *kb;
 	
 	dstweight = 1.0F - srcweight;
-	//printf("Dst: %f\tSrc: %f\n", srcweight, dstweight);
 	for (it=blendshape.begin(), kb = (KeyBlock *)key->block.first; 
 	     kb && it != blendshape.end();
 	     kb = (KeyBlock *)kb->next, it++)
 	{
-		//printf("OirgKeys: %f\t%f\n", kb->curval, (*it));
 		kb->curval = kb->curval * dstweight + (*it) * srcweight;
-		//printf("NewKey: %f\n", kb->curval);
 	}
-	//printf("\n");
 }
 
 void BL_Action::Update(float curtime, bool applyToObject)
diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
@@ -59,15 +59,12 @@ KX_NetworkMessageActuator::~KX_NetworkMessageActuator()
 /// returns true if the actuators needs to be running over several frames
 bool KX_NetworkMessageActuator::Update()
 {
-	//printf("update messageactuator\n");
 	bool bNegativeEvent = IsNegativeEvent();
 	RemoveAllEvents();
 
 	if (bNegativeEvent) {
 		return false; // do nothing on negative events
-		//printf("messageactuator false event\n");
 	}
-	//printf("messageactuator true event\n");
 
 	// ACT_MESG_PROP in DNA_actuator_types.h
 	if (m_bPropBody) {
diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
@@ -110,7 +110,7 @@ bool KX_NetworkMessageSensor::Evaluate()
 
 	if (!messages.empty()) {
 #ifdef NAN_NET_DEBUG
-		printf("KX_NetworkMessageSensor found one or more messages\n");
+		std::cout << "KX_NetworkMessageSensor found one or more messages" << std::endl;
 #endif
 		m_IsUp = true;
 		m_BodyList = new CListValue();
@@ -146,7 +146,6 @@ bool KX_NetworkMessageSensor::Evaluate()
 /// return true for being up (no flank needed)
 bool KX_NetworkMessageSensor::IsPositiveTrigger()
 {
-//	printf("KX_NetworkMessageSensor IsPositiveTrigger\n");
 	//attempt to fix [ #3809 ] IPO Actuator does not work with some Sensors
 	//a better solution is to properly introduce separate Edge and Level triggering concept
 
diff --git a/source/gameengine/Ketsji/KX_CollisionSensor.cpp b/source/gameengine/Ketsji/KX_CollisionSensor.cpp
@@ -291,7 +291,6 @@ bool	KX_CollisionSensor::NewHandleCollision(void*object1,void*object2,const PHY_
 			m_bTriggered = true;
 			m_hitObject = gameobj;
 			m_hitMaterial = hitMaterial;
-			//printf("KX_CollisionSensor::HandleCollision\n");
 		}
 		
 	} 
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp
@@ -3739,7 +3739,6 @@ KX_PYMETHODDEF_DOC_O(KX_GameObject, getVectTo,
 
 	if (MT_fuzzyZero(distance))
 	{
-		//cout << "getVectTo() Error: Null vector!\n";
 		locToDir = toDir = MT_Vector3(0.0f,0.0f,0.0f);
 		distance = 0.0f;
 	} else {
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
@@ -370,12 +370,7 @@ bool KX_KetsjiEngine::NextFrame()
 		frames = int(deltatime * m_ticrate / m_timescale + 1e-6);
 	}
 
-//	if (frames>1)
-//		printf("****************************************");
-//	printf("dt = %f, deltatime = %f, frames = %d\n",dt, deltatime,frames);
-	
-//	if (!frames)
-//		PIL_sleep_ms(1);
+//	CM_Debug("dt = " << dt << ", deltatime = " << deltatime << ", frames = " << frames);
 
 	double framestep = timestep;
 
@@ -812,7 +807,7 @@ void KX_KetsjiEngine::UpdateAnimations(KX_Scene *scene)
 		double anim_timestep = 1.0 / scene->GetAnimationFPS();
 		if (m_frameTime - m_previousAnimTime > anim_timestep || m_frameTime == m_previousAnimTime) {
 			// Sanity/debug print to make sure we're actually going at the fps we want (should be close to anim_timestep)
-			// printf("Anim fps: %f\n", 1.0/(m_frameTime - m_previousAnimTime));
+			// CM_Debug("Anim fps: " << 1.0/(m_frameTime - m_previousAnimTime));
 			m_previousAnimTime = m_frameTime;
 			for (CListValue::iterator sceneit = m_scenes->GetBegin(); sceneit != m_scenes->GetEnd(); ++sceneit)
 				((KX_Scene *)*sceneit)->UpdateAnimations(m_frameTime);
diff --git a/source/gameengine/Ketsji/KX_MouseActuator.cpp b/source/gameengine/Ketsji/KX_MouseActuator.cpp
@@ -287,9 +287,6 @@ bool KX_MouseActuator::Update()
 				m_oldposition[1] = position[1];
 
 			}
-			else {
-				//printf("\nNo input device detected for mouse actuator\n");
-			}
 			break;
 		}
 		default:
diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
@@ -103,7 +103,6 @@ bool KX_MouseFocusSensor::Evaluate()
 	bool obHasFocus = false;
 	bool reset = m_reset && m_level;
 
-//  	cout << "evaluate focus mouse sensor "<<endl;
 	m_reset = false;
 	if (m_focusmode) {
 		/* Focus behavior required. Test mouse-on. The rest is
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -1865,8 +1865,6 @@ static void initPySysObjects__append(PyObject *sys_path, const char *filename)
 	BLI_cleanup_file(KX_GetMainPath().ReadPtr(), expanded); /* Don't use BLI_cleanup_dir because it adds a slash - BREAKS WIN32 ONLY */
 	item = PyC_UnicodeFromByte(expanded);
 	
-//	printf("SysPath - '%s', '%s', '%s'\n", expanded, filename, KX_GetMainPath().ReadPtr());
-	
 	if (PySequence_Index(sys_path, item) == -1) {
 		PyErr_Clear(); /* PySequence_Index sets a ValueError */
 		PyList_Insert(sys_path, 0, item);
@@ -1899,9 +1897,6 @@ static void initPySysObjects(Main *maggie)
 	}
 	
 	initPySysObjects__append(sys_path, KX_GetMainPath().ReadPtr());
-	
-//	fprintf(stderr, "\nNew Path: %d ", PyList_GET_SIZE(sys_path));
-//	PyObject_Print(sys_path, stderr, 0);
 }
 
 static void restorePySysObjects(void)
@@ -1930,10 +1925,6 @@ static void restorePySysObjects(void)
 	PyDict_Update(sys_mods, gp_sys_backup.modules);
 	Py_DECREF(gp_sys_backup.modules);
 	gp_sys_backup.modules = NULL;
-	
-	
-//	fprintf(stderr, "\nRestore Path: %d ", PyList_GET_SIZE(sys_path));
-//	PyObject_Print(sys_path, stderr, 0);
 }
 
 void addImportMain(struct Main *maggie)
diff --git a/source/gameengine/Ketsji/KX_PythonInitTypes.cpp b/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
@@ -137,9 +137,6 @@ static void PyType_Ready_ADD(PyObject *dict, PyTypeObject *tp, PyAttributeDef *a
 		/* we need to do this for all types before calling PyType_Ready
 		 * since they will call the parents PyType_Ready and those might not have initialized vars yet */
 
-		//if (tp->tp_base==NULL)
-		//	printf("Debug: No Parents - '%s'\n" , tp->tp_name);
-
 		if (tp->tp_getset==NULL && ((attributes && attributes->m_name) || (attributesPtr && attributesPtr->m_name))) {
 			PyGetSetDef *attr_getset;
 			int attr_tot= 0;
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
@@ -1083,7 +1083,6 @@ void CcdPhysicsController::SetScaling(const MT_Vector3& scale)
 			m_object->activate(true); // without this, sleeping objects scale wont be applied in bullet if python changes the scale - Campbell.
 			m_object->getCollisionShape()->setLocalScaling(m_cci.m_scaling);
 
-			//printf("no inertia recalc for fixed objects with mass=0\n");
 			btRigidBody *body = GetRigidBody();
 			if (body && m_cci.m_mass) {
 				body->getCollisionShape()->calculateLocalInertia(m_cci.m_mass, m_cci.m_localInertiaTensor);
@@ -2050,16 +2049,16 @@ bool CcdShapeConstructionInfo::SetMesh(RAS_MeshObject *meshobj, DerivedMesh *dm,
 			}
 		}
 
-		// If this ever gets confusing, print out an OBJ file for debugging
+	// If this ever gets confusing, print out an OBJ file for debugging
 #if 0
-		printf("# vert count %d\n", m_vertexArray.size());
+		CM_Debug("# vert count " << m_vertexArray.size());
 		for (i = 0; i < m_vertexArray.size(); i += 1) {
-			printf("v %.6f %.6f %.6f\n", m_vertexArray[i].x(), m_vertexArray[i].y(), m_vertexArray[i].z());
+			CM_Debug("v " << m_vertexArray[i].x() << " " << m_vertexArray[i].y() << " " << m_vertexArray[i].z());
 		}
 
-		printf("# face count %d\n", m_triFaceArray.size());
+		CM_Debug("# face count " << m_triFaceArray.size());
 		for (i = 0; i < m_triFaceArray.size(); i += 3) {
-			printf("f %d %d %d\n", m_triFaceArray[i] + 1, m_triFaceArray[i + 1] + 1, m_triFaceArray[i + 2] + 1);
+			CM_Debug("f " << m_triFaceArray[i] + 1 << " " <<  m_triFaceArray[i + 1] + 1 << " " <<  m_triFaceArray[i + 2] + 1);
 		}
 #endif
 	}
@@ -2386,15 +2385,14 @@ bool CcdShapeConstructionInfo::UpdateMesh(class KX_GameObject *gameobj, class RA
 	}
 
 #if 0
-	/* needs #include <cstdio> */
-	printf("# vert count %d\n", m_vertexArray.size());
+	CM_Debug("# vert count " << m_vertexArray.size());
 	for (int i = 0; i < m_vertexArray.size(); i += 3) {
-		printf("v %.6f %.6f %.6f\n", m_vertexArray[i], m_vertexArray[i + 1], m_vertexArray[i + 2]);
+		CM_Debug("v " << m_vertexArray[i] << " " << m_vertexArray[i + 1] << " " << m_vertexArray[i + 2]);
 	}
 
-	printf("# face count %d\n", m_triFaceArray.size());
+	CM_Debug("# face count " << m_triFaceArray.size());
 	for (int i = 0; i < m_triFaceArray.size(); i += 3) {
-		printf("f %d %d %d\n", m_triFaceArray[i] + 1, m_triFaceArray[i + 1] + 1, m_triFaceArray[i + 2] + 1);
+		CM_Debug("f " << m_triFaceArray[i] + 1 << " " << m_triFaceArray[i + 1] + 1 << " " << m_triFaceArray[i + 2] + 1);
 	}
 #endif
 
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
@@ -799,7 +799,6 @@ void CcdPhysicsEnvironment::ProcessFhSprings(double curTime, float interval)
 		btRigidBody *body = ctrl->GetRigidBody();
 
 		if (body && (ctrl->GetConstructionInfo().m_do_fh || ctrl->GetConstructionInfo().m_do_rot_fh)) {
-			//printf("has Fh or RotFh\n");
 			//re-implement SM_FhObject.cpp using btCollisionWorld::rayTest and info from ctrl->getConstructionInfo()
 			//send a ray from {0.0, 0.0, 0.0} towards {0.0, 0.0, -10.0}, in local coordinates
 			CcdPhysicsController *parentCtrl = ctrl->GetParentCtrl();

Original file line number	Diff line number	Diff line change
`@@ -1204,7 +1204,7 @@ static void UNUSED_FUNCTION(print_active_constraints2)(Object *ob) //not used, u`
`1204`	`1204`
`1205`	`1205`	`if (conlist) {`
`1206`	`1206`	`for (curcon = (bConstraint )conlist->first; curcon; curcon = (bConstraint )curcon->next) {`
`1207`		`- printf("%i\n",curcon->type);`
	`1207`	`+ CM_Debug(curcon->type);`
`1208`	`1208`	`}`
`1209`	`1209`	`}`
`1210`	`1210`	`}`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,6 @@ class KX_BlenderSceneConverter : public KX_ISceneConverter`
`172`	`172`	`#ifdef WITH_CXX_GUARDEDALLOC`
`173`	`173`	`MEM_printmemlist_pydict();`
`174`	`174`	`#endif`
`175`		`-// /printf("\t m_ketsjiEngine->m_scenes: %d\n", m_ketsjiEngine->CurrentScenes()->GetCount());`
`176`	`175`	`}`
`177`	`176`
`178`	`177`	`/* LibLoad Options */`
Original file line number	Diff line number	Diff line change
`@@ -1107,8 +1107,6 @@ void BL_ConvertActuators(const char* maggiename,`
`1107`	`1107`	`mouAct->limit_x,`
`1108`	`1108`	`mouAct->limit_y);`
`1109`	`1109`	`baseact = tmpbaseact;`
`1110`		`- } else {`
`1111`		`- //cout << "\n Couldn't find mouse event manager..."; - should throw an error here...`
`1112`	`1110`	`}`
`1113`	`1111`	`break;`
`1114`	`1112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -343,8 +343,6 @@ void BL_ConvertSensors(struct Object* blenderobject,`
`343`	`343`	`kxengine,`
`344`	`344`	`gameobj);`
`345`	`345`	`}`
`346`		`- } else {`
`347`		`- // cout << "\n Could't find mouse event manager..."; - should throw an error here...`
`348`	`346`	`}`
`349`	`347`	`break;`
`350`	`348`	`}`
Original file line number	Diff line number	Diff line change
`@@ -367,16 +367,12 @@ void BL_Action::BlendShape(Key* key, float srcweight, std::vector<float>& blends`
`367`	`367`	`KeyBlock *kb;`
`368`	`368`
`369`	`369`	`dstweight = 1.0F - srcweight;`
`370`		`- //printf("Dst: %f\tSrc: %f\n", srcweight, dstweight);`
`371`	`370`	`for (it=blendshape.begin(), kb = (KeyBlock *)key->block.first;`
`372`	`371`	`kb && it != blendshape.end();`
`373`	`372`	`kb = (KeyBlock *)kb->next, it++)`
`374`	`373`	`{`
`375`		`- //printf("OirgKeys: %f\t%f\n", kb->curval, (*it));`
`376`	`374`	`kb->curval = kb->curval * dstweight + (it) srcweight;`
`377`		`- //printf("NewKey: %f\n", kb->curval);`
`378`	`375`	`}`
`379`		`- //printf("\n");`
`380`	`376`	`}`
`381`	`377`
`382`	`378`	`void BL_Action::Update(float curtime, bool applyToObject)`