Changeset 1617 for code

Timestamp:

Jun 22, 2008, 12:44:20 AM (16 years ago)

Author:

rgrieder

Message:

• some more fixes..

Location:

code/branches/hud/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• OrxonoxStableHeaders.h (modified) (1 diff)
• RadarViewable.cc (modified) (1 diff)
• overlays/OrxonoxOverlay.cc (modified) (1 diff)

code/branches/hud/src/orxonox/CMakeLists.txt

@@ -27 +27 @@
   tools/Mesh.cc
   tools/ParticleInterface.cc
+  tools/TextureGenerator.cc
   tools/Timer.cc
   tools/WindowEventListener.cc

code/branches/hud/src/orxonox/OrxonoxStableHeaders.h

@@ -37 +37 @@
 #include "util/OrxonoxPlatform.h"
 
-#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC && 0
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
 
 // including std headers here is useless since they're already precompiled

code/branches/hud/src/orxonox/RadarViewable.cc

@@ -40 +40 @@
     */
     RadarViewable::RadarViewable()
-        : radarObjectCamouflage_(0.0f)
+        : radarObject_(0)
+        , radarObjectCamouflage_(0.0f)
         , radarObjectType_(Dot)
-        , radarObject_(0)
         , radarObjectDescription_("staticObject")
     {

code/branches/hud/src/orxonox/overlays/OrxonoxOverlay.cc

@@ -207 +207 @@
     void OrxonoxOverlay::positionChanged()
     {
-        float angle = abs(this->angle_.valueRadians());
+        float angle = this->angle_.valueRadians();
+        if (angle < 0.0)
+            angle = -angle;
         angle -= Ogre::Math::PI * (int)(angle / (Ogre::Math::PI));
         if (angle > Ogre::Math::PI * 0.5)