Changeset 5924 for code/branches/core5/src/modules

Timestamp:

Oct 9, 2009, 6:04:16 PM (15 years ago)

Author:

scheusso

Message:

reverted r5911 partially and removed fallbackcamera
level scene now gets deleted after all when changing from level to mainmenu

File:

• code/branches/core5/src/modules/objects/Planet.cc (modified) (2 diffs)

code/branches/core5/src/modules/objects/Planet.cc

@@ -47 +47 @@
      * @brief Constructor
      */
-    Planet::Planet(BaseObject* creator) : MovableEntity(creator)
+    Planet::Planet(BaseObject* creator): MovableEntity(creator)
     {
         RegisterObject(Planet);
@@ -64 +64 @@
     void Planet::tick(float dt)
     {
-        if (!this->isVisible())
+        if(!this->isVisible())
             return;
 
         if (GameMode::showsGraphics())
         {
-            Camera* activeCamera = this->getScene()->getCameraManager()->getActiveCamera();
-            if (activeCamera)
+            Camera* activeCamera = CameraManager::getInstance().getActiveCamera();
+            if(activeCamera)
             {
                 float distance = this->getPosition().distance( activeCamera->getWorldPosition() );