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

Timestamp:

May 22, 2008, 2:56:48 PM (17 years ago)

Author:

scheusso

Message:

merged hud3 branch into trunk and changed camera orientation

Location:

code/trunk/src/orxonox/objects

Files:

• SpaceShip.cc (modified) (7 diffs)
• SpaceShip.h (modified) (4 diffs)

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

@@ -30 +30 @@
 #include "SpaceShip.h"
 
-#include <string>
-
 #include <OgreCamera.h>
 #include <OgreRenderWindow.h>
@@ -38 +36 @@
 
 #include "CameraHandler.h"
-//#include "util/Convert.h"
+#include "util/Convert.h"
 #include "util/Math.h"
 #include "core/CoreIncludes.h"
@@ -54 +52 @@
 {
     ConsoleCommand(SpaceShip, setMaxSpeedTest, AccessLevel::Debug, false);
+    ConsoleCommand(SpaceShip, whereAmI, AccessLevel::User, true);
     ConsoleCommandGeneric(test1, SpaceShip, createExecutor(createFunctor(&SpaceShip::setMaxSpeedTest), "setMaxSpeed", AccessLevel::Debug), false);
     ConsoleCommandGeneric(test2, SpaceShip, createExecutor(createFunctor(&SpaceShip::setMaxSpeedTest), "setMaxBlubber", AccessLevel::Debug), false);
@@ -232 +231 @@
       // change camera attributes here, if you want to ;)
     }
-    
+
     void SpaceShip::getFocus(){
       COUT(4) << "requesting focus" << std::endl;
       if(network::Client::getSingleton()==0 || network::Client::getSingleton()->getShipID()==objectID)
         CameraHandler::getInstance()->requestFocus(cam_);
-      
-    }
-    
+
+    }
+
     void SpaceShip::createCamera(){
 //       COUT(4) << "begin camera creation" << std::endl;
@@ -245 +244 @@
       COUT(4) << "position: (this)" << this->getNode()->getPosition() << std::endl;
       this->camNode_->setPosition(Vector3(-50,0,10));
-      Quaternion q1 = Quaternion(Radian(Degree(90)),Vector3(0,-1,0));
-      Quaternion q2 = Quaternion(Radian(Degree(90)),Vector3(0,0,-1));
-      camNode_->setOrientation(q1*q2);
+//      Quaternion q1 = Quaternion(Radian(Degree(90)),Vector3(0,-1,0));
+//      Quaternion q2 = Quaternion(Radian(Degree(90)),Vector3(0,0,-1));
+//      camNode_->setOrientation(q1*q2);
       COUT(4) << "position: (cam)" << this->camNode_->getPosition() << std::endl;
       cam_ = new Camera(this->camNode_);
@@ -253 +252 @@
       cam_->setTargetNode(this->getNode());
 //        cam->setPosition(Vector3(0,-350,0));
+      Quaternion q1 = Quaternion(Radian(Degree(90)),Vector3(0,-1,0));
+      Quaternion q2 = Quaternion(Radian(Degree(90)),Vector3(1,0,0));
+      camNode_->setOrientation(q2*q1);
       if(network::Client::getSingleton()!=0 && network::Client::getSingleton()->getShipID()==objectID){
         this->setBacksync(true);
@@ -383 +385 @@
     }
 
+    std::string SpaceShip::whereAmI() {
+        return getConvertedValue<float, std::string>(SpaceShip::getLocalShip()->getPosition().x)
+        + "  " + getConvertedValue<float, std::string>(SpaceShip::getLocalShip()->getPosition().y)
+        + "  " + getConvertedValue<float, std::string>(SpaceShip::getLocalShip()->getPosition().z);
+    }
+
+    Vector3 SpaceShip::getSPosition() {
+        return SpaceShip::getLocalShip()->getPosition();
+    }
+
+    Quaternion SpaceShip::getSOrientation() {
+        return SpaceShip::getLocalShip()->getOrientation();
+    }
+
+    float SpaceShip::getMaxSpeed() { return maxSpeed_; }
+
     void SpaceShip::tick(float dt)
     {

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

@@ -29 +29 @@
 #ifndef _SpaceShip_H__
 #define _SpaceShip_H__
-
+#include <string>
 #include "OrxonoxPrereqs.h"
-
 #include <OgrePrerequisites.h>
 
+#include "util/Math.h"
 #include "core/InputInterfaces.h"
 #include "Camera.h"
@@ -66 +66 @@
 
             void getFocus();
-
+            static SpaceShip* instance_s;
+            static Vector3 getSPosition();
+            static Quaternion getSOrientation();
+            static std::string whereAmI();
             static void setMaxSpeedTest(float value)
                 { SpaceShip::instance_s->setMaxSpeed(value); }
@@ -76 +79 @@
             void mouseScrolled      (int abs, int rel) { }
 
+            float getMaxSpeed();
 
         private:
             void createCamera();
-            static SpaceShip* instance_s;
 
             Vector3 testvector_;
@@ -88 +91 @@
 
             Ogre::SceneNode* camNode_;
-            Camera* cam_;  
+            Camera* cam_;
             std::string camName_;