Changeset 2402

Timestamp:

Dec 10, 2008, 11:24:15 PM (16 years ago)

Author:

FelixSchulthess

Message:

i cannot convince svn

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>
 
@@ -71 +72 @@
         if(!this->isVisible())
             return;
-        
-        if(!activeCamera_) activeCamera_ = CameraManager::getInstance().getActiveCamera();
-        Real distance = this->getPosition().distance(activeCamera_->getWorldPosition() );
+            
+        Camera* activeCamera = CameraManager::getInstance().getActiveCamera();
+        Real distance = this->getPosition().distance( activeCamera->getWorldPosition() );
         COUT(2) << distance << std::endl;
         Real planetRadius = this->getScale();

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

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