Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2402


Ignore:
Timestamp:
Dec 10, 2008, 11:24:15 PM (15 years ago)
Author:
FelixSchulthess
Message:

i cannot convince svn

Location:
code/branches/lodfinal/src/orxonox/objects/worldentities
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/lodfinal/src/orxonox/objects/worldentities/Planet.cc

    r2395 r2402  
    3737#include "CameraManager.h"
    3838#include "objects/Scene.h"
     39#include "Camera.h"
    3940#include <math.h>
    4041
     
    7172        if(!this->isVisible())
    7273            return;
    73        
    74         if(!activeCamera_) activeCamera_ = CameraManager::getInstance().getActiveCamera();
    75         Real distance = this->getPosition().distance(activeCamera_->getWorldPosition() );
     74           
     75        Camera* activeCamera = CameraManager::getInstance().getActiveCamera();
     76        Real distance = this->getPosition().distance( activeCamera->getWorldPosition() );
    7677        COUT(2) << distance << std::endl;
    7778        Real planetRadius = this->getScale();
  • code/branches/lodfinal/src/orxonox/objects/worldentities/Planet.h

    r2394 r2402  
    3535#include "tools/Mesh.h"
    3636#include "objects/Tickable.h"
    37 #include "Camera.h"
    3837
    3938namespace orxonox
     
    110109            BillboardSet billboard_;
    111110            bool bCastShadows_;
    112                         Camera* activeCamera_;
    113111
    114112    };
Note: See TracChangeset for help on using the changeset viewer.