Changeset 128 for code/branches

Timestamp:

Oct 30, 2007, 11:43:48 PM (17 years ago)

Author:

rgrieder

Message:

 

Location:

code/branches/main_reto

Files:

• include/OrxonoxShip.h (modified) (2 diffs)
• src/OrxonoxShip.cpp (modified) (2 diffs)
• src/RunManager.cpp (modified) (2 diffs)
• weapon_framework/weapon_framework.suo (modified) (previous)
• weapon_framework/weapon_framework.vcproj (modified) (1 diff)

code/branches/main_reto/include/OrxonoxShip.h

@@ -12 +12 @@
         virtual ~OrxonoxShip();
 
-        /*void setThrust(float);
-        void setSideThrust(float);*/
+        virtual bool initialise();
 
-        virtual bool initialise();
+        void setThrust(const Real);
+        void setSideThrust(const Real);
+        void setYaw(const Radian);
+        void setPitch(const Radian);
+        void setRoll(const Radian);
+
+        bool tick(unsigned long, float);
 
 protected:
@@ -21 +26 @@
         SceneNode *mRootNode;
         Entity *mShip;
+
+        Vector3 speed;
+        float thrust, sideThrust, baseThrust;
 };
 

code/branches/main_reto/src/OrxonoxShip.cpp

@@ -2 +2 @@
 
 
-OrxonoxShip::OrxonoxShip(SceneManager *mSceneMgr, SceneNode *mNode) : mSceneMgr(mSceneMgr), mRootNode(mNode)
+OrxonoxShip::OrxonoxShip(SceneManager *mSceneMgr, SceneNode *mNode)
+        : mSceneMgr(mSceneMgr), mRootNode(mNode), speed(Vector3(0, 0, 0)), baseThrust(100)
 {
 }
@@ -19 +20 @@
         // create the "space ship" (currently a fish..)
         mShip = mSceneMgr->createEntity("Ship", "fish.mesh");
-        mRootNode->setScale(Vector3(10, 10, 10));
-        mRootNode->attachObject(mShip);
+        SceneNode *fishNode = mRootNode->createChildSceneNode("fishNode");
+        fishNode->yaw(Degree(-90));
+        fishNode->attachObject(mShip);
+        fishNode->setScale(Vector3(10, 10, 10));
 
         return true;
 }
+
+
+void OrxonoxShip::setThrust(const Real value)
+{
+        thrust = value * baseThrust;
+}
+
+void OrxonoxShip::setSideThrust(const Real value)
+{
+        sideThrust = value;
+}
+
+void OrxonoxShip::setYaw(const Radian value)
+{
+        mRootNode->yaw(value);
+}
+
+void OrxonoxShip::setPitch(const Radian value)
+{
+        mRootNode->pitch(value);
+}
+
+void OrxonoxShip::setRoll(const Radian value)
+{
+        mRootNode->roll(value);
+}
+
+
+bool OrxonoxShip::tick(unsigned long time, float deltaTime)
+{
+        speed += (mRootNode->getLocalAxes() * Vector3(0, 0, 1)).normalisedCopy() * thrust * deltaTime;
+
+        mRootNode->translate(speed * deltaTime);
+
+        return true;
+}

code/branches/main_reto/src/RunManager.cpp

@@ -284 +284 @@
         // 2nd mouse button - slide, otherwise rotate
         const MouseState &ms = mMouse->getMouseState();
-        if( ms.buttonDown( MB_Right ) )
-        {
-                mTranslateVector.x += ms.X.rel * 0.13;
-                mTranslateVector.y -= ms.Y.rel * 0.13;
-        }
-        else
-        {
-                mRotX = Degree(-ms.X.rel * 0.13);
-                mRotY = Degree(-ms.Y.rel * 0.13);
-        }
+        mRotX = Degree(-ms.X.rel * 0.13);
+        mRotY = Degree(-ms.Y.rel * 0.13);
+
+        mShip->setYaw(mRotX);
+        mShip->setPitch(mRotY);
 
         return true;
@@ -304 +299 @@
         // Note that YAW direction is around a fixed axis (freelook style) rather than a natural YAW
         //(e.g. airplane)
-        mCamera->yaw(mRotX);
-        mCamera->pitch(mRotY);
-        mCamera->moveRelative(mTranslateVector);
+        //mCamera->yaw(mRotX);
+        //mCamera->pitch(mRotY);
+        //mCamera->moveRelative(mTranslateVector);
+
+        mShipNode->translate(mShipNode->getLocalAxes() * mTranslateVector);
 }
 

code/branches/main_reto/weapon_framework/weapon_framework.vcproj

@@ -204 +204 @@
                         </File>
                         <File
-                                RelativePath="..\include\OrxonoxShip.cpp"
+                                RelativePath="..\src\OrxonoxShip.cpp"
                                 >
                         </File>