Changeset 644

Timestamp:

Dec 19, 2007, 3:03:30 AM (16 years ago)

Author:

landauf

Message:

added free-view-mode (hold right mouse button pressed)

Location:

code/branches/FICN/src/orxonox/objects

Files:

• Projectile.cc (modified) (1 diff)
• SpaceShip.cc (modified) (8 diffs)
• SpaceShip.h (modified) (1 diff)

code/branches/FICN/src/orxonox/objects/Projectile.cc

@@ -24 +24 @@
             this->setOrientation(this->owner_->getOrientation());
             this->setPosition(this->owner_->getPosition());
+            this->translate(Vector3(55, 0, 0), Ogre::Node::TS_LOCAL);
             this->setVelocity(Vector3(1, 0, 0) * this->speed_);
         }

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

@@ -49 +49 @@
 
         this->setMouseEventCallback_ = false;
-        this->bMousePressed_ = false;
+        this->bLMousePressed_ = false;
+        this->bRMousePressed_ = false;
+
+        this->camNode_ = 0;
 
         this->tt_ = 0;
@@ -140 +143 @@
         this->greenBillboard_.setBillboardSet("Examples/Flare", ColourValue(0.0, 1.0, 0.0), 1);
 
-        this->redNode_ = this->getNode()->createChildSceneNode(this->getName() + "red", Vector3(0.1, 4.6, -0.3));
+        this->redNode_ = this->getNode()->createChildSceneNode(this->getName() + "red", Vector3(0.3, 4.7, -0.3));
         this->redNode_->setInheritScale(false);
-        this->greenNode_ = this->getNode()->createChildSceneNode(this->getName() + "green", Vector3(0.1, -4.6, -0.3));
+        this->greenNode_ = this->getNode()->createChildSceneNode(this->getName() + "green", Vector3(0.3, -4.7, -0.3));
         this->greenNode_->setInheritScale(false);
 
@@ -171 +174 @@
         {
             Ogre::Camera *cam = Orxonox::getSingleton()->getSceneManager()->createCamera("ShipCam");
-            Ogre::SceneNode *node = this->getNode()->createChildSceneNode("CamNode");
+            this->camNode_ = this->getNode()->createChildSceneNode("CamNode");
 /*
 //            node->setInheritOrientation(false);
@@ -184 +187 @@
             cam->roll(Degree(-90));
 
-            node->attachObject(cam);
+            this->camNode_->attachObject(cam);
             Orxonox::getSingleton()->getOgrePointer()->getRoot()->getAutoCreatedWindow()->addViewport(cam);
         }
@@ -203 +206 @@
         this->moved = true;
 
+        if (this->bRMousePressed_)
+        {
+            this->camNode_->roll(Degree(-e.state.X.rel * 0.10));
+            this->camNode_->yaw(Degree(e.state.Y.rel * 0.10));
+        }
+
         return true;
     }
@@ -208 +217 @@
     bool SpaceShip::mousePressed(const OIS::MouseEvent &e, OIS::MouseButtonID id)
     {
-        this->bMousePressed_ = true;
+        if (id == OIS::MB_Left)
+            this->bLMousePressed_ = true;
+        else if (id == OIS::MB_Right)
+            this->bRMousePressed_ = true;
 
         return true;
@@ -215 +227 @@
     bool SpaceShip::mouseReleased(const OIS::MouseEvent &e, OIS::MouseButtonID id)
     {
-        this->bMousePressed_ = false;
+        if (id == OIS::MB_Left)
+            this->bLMousePressed_ = false;
+        else if (id == OIS::MB_Right)
+        {
+            this->bRMousePressed_ = false;
+            this->camNode_->resetOrientation();
+        }
+
+        return true;
     }
 
@@ -245 +265 @@
             this->timeToReload_ = 0;
 
-        if (this->bMousePressed_ && this->timeToReload_ <= 0)
+        if (this->bLMousePressed_ && this->timeToReload_ <= 0)
         {
             Projectile* proj = new Projectile(this);

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

@@ -43 +43 @@
             bool bInvertMouse_;
             bool setMouseEventCallback_;
-            bool bMousePressed_;
+            bool bLMousePressed_;
+            bool bRMousePressed_;
+
+            Ogre::SceneNode* camNode_;
 
             particle::ParticleInterface *tt_;