Changeset 1289 for code/branches/merge/src/orxonox

Timestamp:

May 15, 2008, 4:43:20 PM (17 years ago)

Author:

scheusso

Message:

merged camera change into merger branch

Location:

code/branches/merge/src/orxonox/objects

Files:

• Camera.cc (modified) (7 diffs)
• Camera.h (modified) (3 diffs)
• CameraHandler.cc (modified) (1 diff)
• SpaceShip.cc (modified) (4 diffs)

code/branches/merge/src/orxonox/objects/Camera.cc

@@ -23 +23 @@
  *      Fabian 'x3n' Landau
  *   Co-authors:
- *      ...
+ *      Benjamin Knecht
  *
  */
@@ -29 +29 @@
 #include "OrxonoxStableHeaders.h"
 #include "Camera.h"
+#include "CameraHandler.h"
 
 #include <string>
@@ -47 +48 @@
 namespace orxonox
 {
-  //CreateFactory(Camera);
 
   Camera::Camera(Ogre::SceneNode* node)
   {
-    //RegisterObject(Camera);
     this->bHasFocus_ = false;
+    this->cameraNode_ = GraphicsEngine::getSingleton().getSceneManager()->getRootSceneNode()->createChildSceneNode(node->getName() + "Camera");
     if( node != NULL )
-      this->setCameraNode(node);
-
+      this->setPositionNode(node);
   }
 
   Camera::~Camera()
   {
+    CameraHandler::getInstance()->releaseFocus(this);
   }
 
-  /*void Camera::loadParams(TiXmlElement* xmlElem)
-  {
-    Ogre::SceneManager* mgr = GraphicsEngine::getSingleton().getSceneManager();
-
-    if (xmlElem->Attribute("name") && xmlElem->Attribute("pos") && xmlElem->Attribute("lookat") && xmlElem->Attribute("node"))
-    {
-      //    <Camera name="Camera" pos="0,0,-250" lookat="0,0,0" />
-
-      std::string name = xmlElem->Attribute("name");
-      std::string pos = xmlElem->Attribute("pos");
-      std::string lookat = xmlElem->Attribute("lookat");
-
-      this->cam_ = mgr->createCamera(name);
-
-      float x, y, z;
-      SubString posVec(xmlElem->Attribute("pos"), ',');
-      convertValue<std::string, float>(&x, posVec[0]);
-      convertValue<std::string, float>(&y, posVec[1]);
-      convertValue<std::string, float>(&z, posVec[2]);
-
-      setPosition(Vector3(x,y,z));
-
-      //std::string target = xmlElem->Attribute("lookat");
-      posVec.split(xmlElem->Attribute("lookat"), ',');
-      convertValue<std::string, float>(&x, posVec[0]);
-      convertValue<std::string, float>(&y, posVec[1]);
-      convertValue<std::string, float>(&z, posVec[2]);
-
-      cam_->lookAt(Vector3(x,y,z));
-
-      /*std::string node = xmlElem->Attribute("node");
-
-      Ogre::SceneNode* sceneNode = (Ogre::SceneNode*)mgr->getRootSceneNode()->createChildSceneNode(node); //getChild(node);
-      sceneNode->attachObject((Ogre::MovableObject*)cam_);
-      */
-
-      // FIXME: unused var
-      //Ogre::Viewport* vp =
-      //GraphicsEngine::getSingleton().getRenderWindow()->addViewport(cam_);
-    /*
-
-      COUT(4) << "Loader: Created camera "<< name  << std::endl << std::endl;
-    }
-  }*/
-
-  void Camera::setCameraNode(Ogre::SceneNode* node)
+  void Camera::setPositionNode(Ogre::SceneNode* node)
   {
     this->positionNode_ = node;
@@ -118 +73 @@
   }
 
+  void Camera::tick(float dt)
+  {
+    if(this->positionNode_ != NULL) {
+      // this stuff here may need some adjustments
+      Vector3 offset = this->positionNode_->getWorldPosition() - this->cameraNode_->getPosition();
+      this->cameraNode_->translate(15*dt*offset);
+
+      this->cameraNode_->setOrientation(Quaternion::Slerp(0.7, this->positionNode_->getWorldOrientation(), this->cameraNode_->getWorldOrientation(), false));
+    }
+  }
+
   /**
     don't move anything before here! here the Ogre camera is set to values of this camera
@@ -124 +90 @@
   void Camera::update()
   {
-    COUT(0) << "p " << this->positionNode_->getPosition() << std::endl;
-    COUT(0) << "t " << this->targetNode_->getPosition() << std::endl;
     if(this->positionNode_ != NULL)
-      this->cam_->setPosition(this->positionNode_->getPosition());
-    if(this->targetNode_ != NULL)
-      this->cam_->lookAt(this->targetNode_->getPosition());
+    {
+      this->cameraNode_->setPosition(this->positionNode_->getWorldPosition());
+      this->cameraNode_->setOrientation(this->positionNode_->getWorldOrientation());
+    }
   }
 
@@ -139 +104 @@
   {
     this->bHasFocus_ = false;
-    this->positionNode_->detachObject(cam_);
+    this->cameraNode_->detachObject(this->cam_);
   }
 
@@ -146 +111 @@
     this->bHasFocus_ = true;
     this->cam_ = ogreCam;
-    this->positionNode_->attachObject(cam_);
+    this->cam_->setOrientation(this->cameraNode_->getWorldOrientation());
+    this->cameraNode_->attachObject(this->cam_);
   }
 }

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

@@ -23 +23 @@
  *      Fabian 'x3n' Landau
  *   Co-authors:
- *      ...
+ *      Benjamin Knecht
  *
  */
@@ -45 +45 @@
         virtual ~Camera();
 
-        //inline void setPosition(Ogre::Vector3 pos) { position_->setPosition(pos); cam_->setPosition(pos); }
-        void setCameraNode(Ogre::SceneNode* node);
+        void setPositionNode(Ogre::SceneNode* node);
         inline Ogre::SceneNode* getCameraNode() { return this->positionNode_; }
         // maybe also BaseObject
         void setTargetNode(Ogre::SceneNode* obj);
 
-
+        void tick(float dt);
         void update();
         inline bool hasFocus() { return this->bHasFocus_; }
@@ -62 +61 @@
         Ogre::SceneNode* targetNode_;
         Ogre::SceneNode* positionNode_;
+        Ogre::SceneNode* cameraNode_;
+        Ogre::Vector3 oldPos;
         Ogre::Camera* cam_;
         bool bHasFocus_;

code/branches/merge/src/orxonox/objects/CameraHandler.cc

@@ -73 +73 @@
     focusList_.remove(cam);
     // set new focus if necessary
-    if(!(focusList_.back()->hasFocus()))
+    if(focusList_.size() > 0 && !(focusList_.back()->hasFocus()))
       focusList_.back()->setFocus(this->cam_);
   }

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

@@ -106 +106 @@
         this->setConfigValues();
 
+
         this->setRotationAxis(1, 0, 0);
         this->setStatic(false);
@@ -118 +119 @@
         if(setMouseEventCallback_)
           InputManager::removeMouseHandler("SpaceShip");
+        if (this->cam_)
+          delete this->cam_;
     }
 
@@ -286 +289 @@
       this->camNode_ = this->getNode()->createChildSceneNode(camName_);
       COUT(4) << "position: (this)" << this->getNode()->getPosition() << std::endl;
-      this->camNode_->setPosition(/*this->getNode()->getPosition() +*/ Vector3(-50,0,10));
+      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);
       COUT(4) << "position: (cam)" << this->camNode_->getPosition() << std::endl;
-/*
-//        node->setInheritOrientation(false);
-        cam->setPosition(Vector3(0,50,-150));
-        cam->lookAt(Vector3(0,20,0));
-        cam->roll(Degree(0));
-      *//*COUT(4) << "creating new camera" << std::endl;*/
       cam_ = new Camera(this->camNode_);
 
@@ -436 +436 @@
     void SpaceShip::tick(float dt)
     {
+        if (this->cam_)
+            this->cam_->tick(dt);
+
         if (this->redNode_ && this->greenNode_)
         {