[Csp-commits] svn:csp r1529 - in trunk/CSP: CSPSim CSPSim/Source/F16 SimCore/Battlefield

[<sv...@ww...>]

Author: mkrose
Date: 2005-04-28 18:38:51 -0700 (Thu, 28 Apr 2005)
New Revision: 1529

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Source/F16/DataEntry.h
   trunk/CSP/CSPSim/Source/F16/F16HUD.cpp
   trunk/CSP/CSPSim/Source/F16/PageCNI.cpp
   trunk/CSP/SimCore/Battlefield/LocalBattlefield.cpp
Log:
Remove debugging cruft from stdout.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1529

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-04-29 01:37:10 UTC (rev 1528)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-04-29 01:38:51 UTC (rev 1529)
@@ -9,6 +9,8 @@
  * Move the m2k center of mass forward to put more weight on the nose
    gear, which was slipping/skidding far too easily.
 
+ * Remove debugging cruft from stdout.
+
 2005-04-27: onsight
  * Remove dead code from PhysicsModel and BaseDynamics.
 

Modified: trunk/CSP/CSPSim/Source/F16/DataEntry.h
===================================================================
--- trunk/CSP/CSPSim/Source/F16/DataEntry.h	2005-04-29 01:37:10 UTC (rev 1528)
+++ trunk/CSP/CSPSim/Source/F16/DataEntry.h	2005-04-29 01:38:51 UTC (rev 1529)
@@ -771,7 +771,7 @@
 			std::string::size_type colon = token.find(':');
 			if (colon != std::string::npos && colon < token.size()) {
 				m_LabelMap[token.substr(0, colon)] = token.substr(colon + 1);
-				std::cout << token.substr(0, colon) << " -> " << token.substr(colon + 1) << "\n";
+				//std::cout << token.substr(0, colon) << " -> " << token.substr(colon + 1) << "\n";
 			}
 		}
 	}

Modified: trunk/CSP/CSPSim/Source/F16/F16HUD.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/F16/F16HUD.cpp	2005-04-29 01:37:10 UTC (rev 1528)
+++ trunk/CSP/CSPSim/Source/F16/F16HUD.cpp	2005-04-29 01:38:51 UTC (rev 1529)
@@ -304,7 +304,7 @@
 	DEDReadout(simdata::Ref<const AlphaNumericDisplay> display, osg::ref_ptr<HUDFont> font): m_Display(display) {
 		assert(font.valid());
 		unsigned lines = m_Display->height();
-		std::cout << "DEDReadout: " << lines << " lines\n";
+		CSP_LOG(APP, DEBUG, "DEDReadout: " << lines << " lines");
 		m_Lines = new osgText::Text*[lines];
 		for (unsigned i = 0; i < lines; ++i) {
 			m_Lines[i] = addText();

Modified: trunk/CSP/CSPSim/Source/F16/PageCNI.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/F16/PageCNI.cpp	2005-04-29 01:37:10 UTC (rev 1528)
+++ trunk/CSP/CSPSim/Source/F16/PageCNI.cpp	2005-04-29 01:38:51 UTC (rev 1529)
@@ -85,7 +85,6 @@
 	ded.write(8, 4, "7500");
 	ded.write(16, 4, "MAN");
 	ded.write(21, 4, "T123X");
-	std::cout << "UPDATE\n";
 }
 
 double PageCNI::update() {

Modified: trunk/CSP/SimCore/Battlefield/LocalBattlefield.cpp
===================================================================
--- trunk/CSP/SimCore/Battlefield/LocalBattlefield.cpp	2005-04-29 01:37:10 UTC (rev 1528)
+++ trunk/CSP/SimCore/Battlefield/LocalBattlefield.cpp	2005-04-29 01:38:51 UTC (rev 1529)
@@ -295,7 +295,10 @@
 	// large jumps right after the connection is established), so we filter the offset
 	// to spread the jumps out over a few seconds.
 	m_ServerTimeOffset = m_ServerTimeOffset * (1.0 - filter) + filter * offset;
-	{ static int XXX = 0; if ((++XXX % 100) == 0) std::cout << "server time offset = " << m_ServerTimeOffset << "\n"; } // XXX
+	if (m_NetworkClient.valid()) {
+		static int XXX = 0;
+		if ((++XXX % 1000) == 0) std::cout << "LocalBattlefield.cpp: server time offset = " << m_ServerTimeOffset << "s\n";
+	}
 	m_CurrentTime = simdata::getCalibratedRealTime() + m_ServerTimeOffset;
 	m_CurrentTimeStamp = simcore::getTimeStamp(m_CurrentTime);
 	if (m_NetworkClient.valid()) {