Changeset 6994 for code/branches/presentation3/src/orxonox

Timestamp:

May 27, 2010, 10:31:25 PM (14 years ago)

Author:

scheusso

Message:

merged skybox2 branch to presentation merger branch

Location:

code/branches/presentation3

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/AIController.cc (modified) (1 prop)
• src/orxonox/worldentities/ControllableEntity.h (modified) (1 diff)

code/branches/presentation3/src/orxonox/worldentities/ControllableEntity.h

@@ -137 +137 @@
             inline float getMouseLookSpeed() const
                 { return this->mouseLookSpeed_; }
+            inline CameraPosition* getCurrentCameraPosition()
+                { return this->currentCameraPosition_; }
 
             inline Controller* getXMLController() const