[Csp-commits] svn:csp r1250 - in trunk/CSP/SimCore: Battlefield Util

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

Author: mkrose
Date: 2004-09-25 22:55:37 -0700 (Sat, 25 Sep 2004)
New Revision: 1250

Modified:
   trunk/CSP/SimCore/Battlefield/Battlefield.cpp
   trunk/CSP/SimCore/Battlefield/Battlefield.h
   trunk/CSP/SimCore/Battlefield/SceneManager.cpp
   trunk/CSP/SimCore/Battlefield/SceneManager.h
   trunk/CSP/SimCore/Battlefield/SimObject.cpp
   trunk/CSP/SimCore/Battlefield/SimObject.h
   trunk/CSP/SimCore/Util/Dispatch.h
   trunk/CSP/SimCore/Util/Log.h
   trunk/CSP/SimCore/Util/SynchronousUpdate.cpp
   trunk/CSP/SimCore/Util/SynchronousUpdate.h
Log:
Fix up include paths and a couple warnings.

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

Modified: trunk/CSP/SimCore/Battlefield/Battlefield.cpp
===================================================================
--- trunk/CSP/SimCore/Battlefield/Battlefield.cpp	2004-09-26 05:42:44 UTC (rev 1249)
+++ trunk/CSP/SimCore/Battlefield/Battlefield.cpp	2004-09-26 05:55:37 UTC (rev 1250)
@@ -22,8 +22,8 @@
  *
  */
 
-#include "Battlefield.h"
-#include "SceneManager.h"
+#include <SimCore/Battlefield/Battlefield.h>
+#include <SimCore/Battlefield/SceneManager.h>
 
 
 class Battlefield::ObjectWrapper: public Battlefield::QuadTreeChild {
@@ -307,7 +307,7 @@
 	m_StaticIndex->insert(*wrapper);
 }
 
-Battlefield::Unit Battlefield::getNextUnit(Unit const &unit, bool human, bool local, int category) {
+Battlefield::Unit Battlefield::getNextUnit(Unit const &unit, bool human, bool local, int /*category*/) {
 	UnitMap::iterator iter = m_UnitMap.find(unit->id());
 	if (iter == m_UnitMap.end()) return 0;
 	UnitMap::iterator scan = iter;
@@ -515,7 +515,7 @@
 	}
 }
 
-void Battlefield::updateAggregationAgent(UnitWrapper *wrapper, GridPoint const &old_position, GridPoint const &new_position) {
+void Battlefield::updateAggregationAgent(UnitWrapper *wrapper, GridPoint const &/*old_position*/, GridPoint const &new_position) {
 	// only the owner of an object can update its aggregation state
 	if (wrapper->unit()->isRemote()) return;
 

Modified: trunk/CSP/SimCore/Battlefield/Battlefield.h
===================================================================
--- trunk/CSP/SimCore/Battlefield/Battlefield.h	2004-09-26 05:42:44 UTC (rev 1249)
+++ trunk/CSP/SimCore/Battlefield/Battlefield.h	2004-09-26 05:55:37 UTC (rev 1250)
@@ -27,10 +27,9 @@
  *  - implement a threaded scene manager
  **/
 
-#ifndef __BATTLEFIELD_H__
-#define __BATTLEFIELD_H__
+#ifndef __SIMCORE_BATTLEFIELD_BATTLEFIELD_H__
+#define __SIMCORE_BATTLEFIELD_BATTLEFIELD_H__
 
-#include <limits>
 #include <map>
 #include <vector>
 
@@ -38,8 +37,8 @@
 #include <SimData/ScopedPointer.h>
 #include <SpatialIndex/QuadTree.h>
 
-#include "SynchronousUpdate.h"
-#include "SimObject.h"
+#include <SimCore/Util/SynchronousUpdate.h>
+#include <SimCore/Battlefield/SimObject.h>
 
 
 class SceneManager;
@@ -483,6 +482,6 @@
 	GridPoint m_CameraGridPosition;
 };
 
-#endif // __BATTLEFIELD_H__
+#endif // __SIMCORE_BATTLEFIELD_BATTLEFIELD_H__
 
 

Modified: trunk/CSP/SimCore/Battlefield/SceneManager.cpp
===================================================================
--- trunk/CSP/SimCore/Battlefield/SceneManager.cpp	2004-09-26 05:42:44 UTC (rev 1249)
+++ trunk/CSP/SimCore/Battlefield/SceneManager.cpp	2004-09-26 05:55:37 UTC (rev 1250)
@@ -23,8 +23,8 @@
  **/
 
 
-#include "SceneManager.h"
-#include "SimObject.h"
+#include <SimCore/Battlefield/SceneManager.h>
+#include <SimCore/Battlefield/SimObject.h>
 
 
 void SceneManager::setVisible(ObjectRef const& object, bool visible) {

Modified: trunk/CSP/SimCore/Battlefield/SceneManager.h
===================================================================
--- trunk/CSP/SimCore/Battlefield/SceneManager.h	2004-09-26 05:42:44 UTC (rev 1249)
+++ trunk/CSP/SimCore/Battlefield/SceneManager.h	2004-09-26 05:55:37 UTC (rev 1250)
@@ -22,8 +22,8 @@
  *
  **/
 
-#ifndef __SCENEMANAGER_H__
-#define __SCENEMANAGER_H__
+#ifndef __SIMCORE_BATTLEFIELD_SCENEMANAGER_H__
+#define __SIMCORE_BATTLEFIELD_SCENEMANAGER_H__
 
 
 #include <SimData/Ref.h>
@@ -117,5 +117,5 @@
 };
 
 
-#endif // __SCENEMANAGER_H__
+#endif // __SIMCORE_BATTLEFIELD_SCENEMANAGER_H__
 

Modified: trunk/CSP/SimCore/Battlefield/SimObject.cpp
===================================================================
--- trunk/CSP/SimCore/Battlefield/SimObject.cpp	2004-09-26 05:42:44 UTC (rev 1249)
+++ trunk/CSP/SimCore/Battlefield/SimObject.cpp	2004-09-26 05:55:37 UTC (rev 1250)
@@ -23,8 +23,8 @@
  **/
 
 
-#include "SimObject.h"
-#include "Log.h"
+#include <SimCore/Battlefield/SimObject.h>
+#include <SimCore/Util/Log.h>
 
 #include <sstream>
 

Modified: trunk/CSP/SimCore/Battlefield/SimObject.h
===================================================================
--- trunk/CSP/SimCore/Battlefield/SimObject.h	2004-09-26 05:42:44 UTC (rev 1249)
+++ trunk/CSP/SimCore/Battlefield/SimObject.h	2004-09-26 05:55:37 UTC (rev 1250)
@@ -22,13 +22,13 @@
  *
  **/
 
-#ifndef __SIMOBJECT_H__
-#define __SIMOBJECT_H__
+#ifndef __SIMCORE_BATTLEFIELD_SIMOBJECT_H__
+#define __SIMCORE_BATTLEFIELD_SIMOBJECT_H__
 
 
-#include "SynchronousUpdate.h"
-#include "Dispatch.h"
-#include "Log.h"
+#include <SimCore/Util/SynchronousUpdate.h>
+#include <SimCore/Util/Dispatch.h>
+#include <SimCore/Util/Log.h>
 
 #include <SimData/Object.h>
 #include <SimData/Vector3.h>
@@ -224,7 +224,7 @@
 	 *  @returns sleep time between updates (return 0.0 for
 	 *           fastest possible updating).
 	 */
-	virtual double onUpdate(double dt) { return 10.0; }
+	virtual double onUpdate(double dt) { dt=dt; return 10.0; }
 
 public:
 
@@ -302,5 +302,5 @@
 	return os << object._debugId();
 }
 
-#endif // __SIMOBJECT_H__
+#endif // __SIMCORE_BATTLEFIELD_SIMOBJECT_H__
 

Modified: trunk/CSP/SimCore/Util/Dispatch.h
===================================================================
--- trunk/CSP/SimCore/Util/Dispatch.h	2004-09-26 05:42:44 UTC (rev 1249)
+++ trunk/CSP/SimCore/Util/Dispatch.h	2004-09-26 05:55:37 UTC (rev 1250)
@@ -62,8 +62,8 @@
  **/
 
 
-#ifndef __DISPATCH_H__
-#define __DISPATCH_H__
+#ifndef __SIMCORE_UTIL_DISPATCH_H__
+#define __SIMCORE_UTIL_DISPATCH_H__
 
 
 #include <SimData/TaggedRecord.h>
@@ -98,7 +98,7 @@
 	}
 
 protected:
-	virtual bool childDispatch(simdata::Ref<simdata::TaggedRecord> const &record) {
+	virtual bool childDispatch(simdata::Ref<simdata::TaggedRecord> const &/*record*/) {
 		return false;
 	}
 
@@ -107,5 +107,5 @@
 };
 
 
-#endif // __DISPATCH_H__
+#endif // __SIMCORE_UTIL_DISPATCH_H__
 

Modified: trunk/CSP/SimCore/Util/Log.h
===================================================================
--- trunk/CSP/SimCore/Util/Log.h	2004-09-26 05:42:44 UTC (rev 1249)
+++ trunk/CSP/SimCore/Util/Log.h	2004-09-26 05:55:37 UTC (rev 1250)
@@ -23,8 +23,8 @@
  **/
 
 
-#ifndef __CSP_LOG_H__
-#define __CSP_LOG_H__
+#ifndef __SIMCORE_UTIL_LOG_H__
+#define __SIMCORE_UTIL_LOG_H__
 
 #include <SimData/Log.h>
 
@@ -87,6 +87,6 @@
 		::csplog().entry(simdata::LOG_##P, CSP_##C, __FILE__, __LINE__) << M << std::endl
 
 
-#endif // __CSP_LOG_H__
+#endif // __SIMCORE_UTIL_LOG_H__
 
 

Modified: trunk/CSP/SimCore/Util/SynchronousUpdate.cpp
===================================================================
--- trunk/CSP/SimCore/Util/SynchronousUpdate.cpp	2004-09-26 05:42:44 UTC (rev 1249)
+++ trunk/CSP/SimCore/Util/SynchronousUpdate.cpp	2004-09-26 05:55:37 UTC (rev 1250)
@@ -22,8 +22,8 @@
  *
  **/
 
-#include "SynchronousUpdate.h"
-#include "Log.h"
+#include <SimCore/Util/SynchronousUpdate.h>
+#include <SimCore/Util/Log.h>
 
 
 int UpdateProxy::update(double time) {

Modified: trunk/CSP/SimCore/Util/SynchronousUpdate.h
===================================================================
--- trunk/CSP/SimCore/Util/SynchronousUpdate.h	2004-09-26 05:42:44 UTC (rev 1249)
+++ trunk/CSP/SimCore/Util/SynchronousUpdate.h	2004-09-26 05:55:37 UTC (rev 1250)
@@ -23,8 +23,8 @@
  **/
 
 
-#ifndef __SYNCHRONOUSUPDATE_H__
-#define __SYNCHRONOUSUPDATE_H__
+#ifndef __SIMCORE_UTIL_SYNCHRONOUSUPDATE_H__
+#define __SIMCORE_UTIL_SYNCHRONOUSUPDATE_H__
 
 
 #include <SimData/Ref.h>
@@ -234,5 +234,5 @@
 };
 
 
-#endif // __SYNCHRONOUSUPDATE_H__
+#endif // __SIMCORE_UTIL_SYNCHRONOUSUPDATE_H__