Changeset 929 for code/branches/network/src/orxonox/objects

Timestamp:

Mar 26, 2008, 11:39:55 PM (18 years ago)

Author:

rgrieder

Message:

• removed getRoot() from GaphicsEngine —> added getRenderWindow() —> added 3 function to control render loop
• rearranged the sequence of methods in Orxonox.cc to make it a little bit more logical
• added deletion code in Orxonox.cc destructor
• fixed a bug in AudioManger destructor
• fixed a bug in InputHandler destroy()

Location:

code/branches/network/src/orxonox/objects

Files:

• Camera.cc (modified) (2 diffs)
• Fighter.cc (modified) (1 diff)
• SpaceShip.cc (modified) (1 diff)

code/branches/network/src/orxonox/objects/Camera.cc

@@ -6 +6 @@
 #include <OgreSceneManager.h>
 #include <OgreSceneNode.h>
-#include <OgreRoot.h>
 #include <OgreRenderWindow.h>
 #include <OgreViewport.h>
@@ -69 +68 @@
 
         // FIXME: unused var
-        Ogre::Viewport* vp = orxonox::Orxonox::getSingleton()->getOgrePointer()->getRoot()->getAutoCreatedWindow()->addViewport(cam);
+        Ogre::Viewport* vp = orxonox::Orxonox::getSingleton()->getOgrePointer()->getRenderWindow()->addViewport(cam);
 
 

code/branches/network/src/orxonox/objects/Fighter.cc

@@ -208 +208 @@
 
             node->attachObject(cam);
-            Orxonox::getSingleton()->getOgrePointer()->getRoot()->getAutoCreatedWindow()->addViewport(cam);
+            Orxonox::getSingleton()->getOgrePointer()->getRenderWindow()->addViewport(cam);
         }
     }

code/branches/network/src/orxonox/objects/SpaceShip.cc

@@ -286 +286 @@
 
         this->camNode_->attachObject(cam);
-        Orxonox::getSingleton()->getOgrePointer()->getRoot()->getAutoCreatedWindow()->addViewport(cam);
+        Orxonox::getSingleton()->getOgrePointer()->getRenderWindow()->addViewport(cam);
     }