Changeset 2394

Timestamp:

Dec 10, 2008, 6:02:42 PM (16 years ago)

Author:

FelixSchulthess

Message:

messing up planet so it will work in client mode

Location:

code/branches/lodfinal/src/orxonox/objects/worldentities

Files:

• Planet.cc (modified) (2 diffs)
• Planet.h (modified) (2 diffs)

code/branches/lodfinal/src/orxonox/objects/worldentities/Planet.cc

@@ -37 +37 @@
 #include "CameraManager.h"
 #include "objects/Scene.h"
-#include "Camera.h"
 #include <math.h>
 
@@ -72 +71 @@
         if(!this->isVisible())
             return;
-            
-        Camera* activeCamera = CameraManager::getInstance().getActiveCamera();
+        
+        if(!activeCamera_) activeCamera_ = CameraManager::getInstance().getActiveCamera();
         Real distance = this->getPosition().distance( activeCamera->getWorldPosition() );
         COUT(2) << distance << std::endl;

code/branches/lodfinal/src/orxonox/objects/worldentities/Planet.h

@@ -35 +35 @@
 #include "tools/Mesh.h"
 #include "objects/Tickable.h"
+#include "Camera.h"
 
 namespace orxonox
@@ -109 +110 @@
             BillboardSet billboard_;
             bool bCastShadows_;
+                        Camera* activeCamera_;
 
     };