Changeset 1212 for code/branches/network3/src/orxonox/objects/SpaceShip.h

Timestamp:

May 1, 2008, 6:09:54 PM (17 years ago)

Author:

scheusso

Message:

merged camera branch changes from 1101 to 1202 into network branch (we have now a camera manager)

File:

• code/branches/network3/src/orxonox/objects/SpaceShip.h (modified) (3 diffs)

code/branches/network3/src/orxonox/objects/SpaceShip.h

@@ -23 +23 @@
  *      Fabian 'x3n' Landau
  *   Co-authors:
- *      ...
+ *      Benjamin Knecht
  *
  */
@@ -35 +35 @@
 #include <OIS/OISMouse.h>
 
+#include "Camera.h"
 #include "Model.h"
 #include "../tools/BillboardSet.h"
+
 
 namespace orxonox
@@ -81 +83 @@
 
             Ogre::SceneNode* camNode_;
+            Camera* cam_;
 
             ParticleInterface* tt_;