[Csp-commits] svn:csp r1547 - trunk/CSP/CSPSim/Source/Views

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

Author: delta
Date: 2005-05-15 01:13:23 -0700 (Sun, 15 May 2005)
New Revision: 1547

Modified:
   trunk/CSP/CSPSim/Source/Views/ExternalViews.cpp
   trunk/CSP/CSPSim/Source/Views/View.cpp
Log:
* Temporary fix for forward decalrations of class (vc++).

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

Modified: trunk/CSP/CSPSim/Source/Views/ExternalViews.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/Views/ExternalViews.cpp	2005-05-14 22:25:01 UTC (rev 1546)
+++ trunk/CSP/CSPSim/Source/Views/ExternalViews.cpp	2005-05-15 08:13:23 UTC (rev 1547)
@@ -27,8 +27,12 @@
 #include "Views/CameraAgent.h"
 #include "Views/CameraKinematics.h"
 
+// FIXME: why Animation class definition is needed here (vc++ error)
+#include "Animation.h"
 #include "CSPSim.h"
 #include "DynamicObject.h"
+// FIXME: why ObjetModel class definition is needed here (vc++ error)
+#include "ObjectModel.h"
 
 #include <SimData/Noise.h>
 
@@ -127,7 +131,7 @@
 		const float SAFETY = 2.0f;
 		TerrainObject::IntersectionHint camera_hint = 0;
 		float h = SAFETY + terrain->getGroundElevation(ep.x(), ep.y(), camera_hint);
-		float d = ep.z() - h;
+		float d = static_cast<float>(ep.z() - h);
 		if (d<0) ep.z() -= d;
 	}
 }

Modified: trunk/CSP/CSPSim/Source/Views/View.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/Views/View.cpp	2005-05-14 22:25:01 UTC (rev 1546)
+++ trunk/CSP/CSPSim/Source/Views/View.cpp	2005-05-15 08:13:23 UTC (rev 1547)
@@ -29,8 +29,12 @@
 #include "Views/InternalView.h"
 #include "Views/ExternalViews.h"
 
+// FIXME: why Animation class definition is needed here (vc++ error)
+#include "Animation.h"
 #include "CSPSim.h"
 #include "DynamicObject.h"
+// FIXME: why ObjetModel class definition is needed here (vc++ error)
+#include "ObjectModel.h"
 #include "VirtualScene.h"
 
 #include <SimCore/Battlefield/LocalBattlefield.h>
@@ -185,4 +189,4 @@
 	ca->attach(7, createView_7());
 	ca->attach(8, createView_8());
 	ca->attach(9, createView_9());
-}
+}
\ No newline at end of file