Changeset 1264 for code/branches/merge/src/orxonox/objects/SpaceShip.h

Timestamp:

May 13, 2008, 5:01:10 PM (17 years ago)

Author:

scheusso

Message:

merge network3 and camera branch into merge branch

File:

• code/branches/merge/src/orxonox/objects/SpaceShip.h (modified) (6 diffs)

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

@@ -23 +23 @@
  *      Fabian 'x3n' Landau
  *   Co-authors:
- *      ...
+ *      Benjamin Knecht
  *
  */
@@ -35 +35 @@
 
 #include "core/InputHandler.h"
+#include "Camera.h"
 #include "Model.h"
 #include "../tools/BillboardSet.h"
@@ -62 +63 @@
             void setRotDamp(float value);
 
+            void getFocus();
+
             static void setMaxSpeedTest(float value)
                 { SpaceShip::instance_s->setMaxSpeed(value); }
@@ -72 +75 @@
 
         private:
+            void createCamera();
             static SpaceShip* instance_s;
 
@@ -81 +85 @@
 
             Ogre::SceneNode* camNode_;
+            Camera* cam_;  
+            std::string camName_;
+
 
             ParticleInterface* tt_;
@@ -117 +124 @@
 
             float emitterRate_;
+            bool server_;
     };
 }