Changeset 1399 for code/trunk/src/orxonox/objects

Timestamp:

May 23, 2008, 10:27:52 PM (17 years ago)

Author:

FelixSchulthess

Message:

enhanced navigation with a target designation cursor

Location:

code/trunk/src/orxonox/objects

Files:

• Camera.h (modified) (2 diffs)
• SpaceShip.cc (modified) (3 diffs)
• SpaceShip.h (modified) (2 diffs)

code/trunk/src/orxonox/objects/Camera.h

@@ -50 +50 @@
         void setTargetNode(Ogre::SceneNode* obj);
 
+        Ogre::Camera* cam_;
+
         void tick(float dt);
         void update();
@@ -63 +65 @@
         Ogre::SceneNode* cameraNode_;
         Ogre::Vector3 oldPos;
-        Ogre::Camera* cam_;
         bool bHasFocus_;
     };

code/trunk/src/orxonox/objects/SpaceShip.cc

@@ -69 +69 @@
       return NULL;
     }
-    
+
     SpaceShip::SpaceShip() :
       //testvector_(0,0,0),
@@ -239 +239 @@
     }
 
+    Camera* SpaceShip::getCamera(){
+        return cam_;
+    }
+
     void SpaceShip::createCamera(){
 //       COUT(4) << "begin camera creation" << std::endl;
@@ -422 +426 @@
         if (this->bLMousePressed_ && this->timeToReload_ <= 0)
         {
-          
+
             Projectile *p = new Projectile(this);
-            
+
             p->setBacksync(true);
             this->timeToReload_ = this->reloadTime_;

code/trunk/src/orxonox/objects/SpaceShip.h

@@ -44 +44 @@
     {
         public:
-          
+
             static SpaceShip *getLocalShip();
-            
+
             SpaceShip();
             ~SpaceShip();
@@ -66 +66 @@
 
             void getFocus();
+            Camera* getCamera();
             static SpaceShip* instance_s;
             static Vector3 getSPosition();