Changeset 133 for code/branches

Timestamp:

Oct 31, 2007, 11:16:00 AM (16 years ago)

Author:

rgrieder

Message:

 

Location:

code/branches/main_reto

Files:

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

code/branches/main_reto/include/OrxonoxShip.h

@@ -3 +3 @@
 
 #include "Ogre.h"
+#include "Bullet.h"
 
 using namespace Ogre;
@@ -11 +12 @@
         Vector3 speed;
         float thrust, sideThrust, baseThrust;
+        Vector3 bulletSpeed;
 
         OrxonoxShip(SceneManager*, SceneNode*);
@@ -25 +27 @@
         Real getThrust();
 
+        Bullet* fire();
+
         bool tick(unsigned long, float);
 
@@ -32 +36 @@
         Entity *mShip;
 
+        int n;
+
 };
 

code/branches/main_reto/include/RunManager.h

@@ -60 +60 @@
         OIS::JoyStick* mJoy;
 
+        bool leftButtonDown;
+        Bullet **mBullets;
+        int mBulletsSize;
+        int mBulletsPosition;
+
         // previously elapsed render time
         unsigned long mTime;

code/branches/main_reto/src/OrxonoxShip.cpp

@@ -3 +3 @@
 
 OrxonoxShip::OrxonoxShip(SceneManager *mSceneMgr, SceneNode *mNode)
-        : mSceneMgr(mSceneMgr), mRootNode(mNode), speed(Vector3(0, 0, 0)), baseThrust(100), thrust(0), sideThrust(0)
+        : mSceneMgr(mSceneMgr), mRootNode(mNode), speed(Vector3(0, 0, 0)), baseThrust(100), thrust(0), sideThrust(0), n(0),
+        bulletSpeed(400)
 {
 }
@@ -19 +20 @@
 
         // create the "space ship" (currently a fish..)
+        // TODO: names must be unique!
         mShip = mSceneMgr->createEntity("Ship", "fish.mesh");
         SceneNode *fishNode = mRootNode->createChildSceneNode("fishNode");
@@ -59 +61 @@
 }
 
+Bullet* OrxonoxShip::fire()
+{
+        // TODO: Names must be unique!
+        SceneNode *temp = mRootNode->getParentSceneNode()->createChildSceneNode("BulletNode" + StringConverter::toString(n));
+        temp->setOrientation(mRootNode->getOrientation());
+        temp->setPosition(mRootNode->getPosition());
+        temp->setScale(Vector3(1, 1, 1) * 10);
+        temp->yaw(Degree(-90));
+        return new Bullet(temp,
+                mSceneMgr->createEntity("bullet" + StringConverter::toString(n++), "Barrel.mesh"),
+                speed + (mRootNode->getLocalAxes() * Vector3(0, 0, -1)).normalisedCopy() * bulletSpeed);
+}
 
 bool OrxonoxShip::tick(unsigned long time, float deltaTime)

code/branches/main_reto/src/RunManager.cpp

@@ -5 +5 @@
 RunManager::RunManager(OgreControl * mOgre, bool bufferedKeys, bool bufferedMouse,
                                            bool bufferedJoy ) :
-mOgre(mOgre), mWindow(mOgre->getRenderWindow()),
+mOgre(mOgre), mWindow(mOgre->getRenderWindow()), leftButtonDown(false),
 mStatsOn(true), mNumScreenShots(0),
 mTimeUntilNextToggle(0), mFiltering(TFO_BILINEAR),
@@ -35 +35 @@
         // Set default mipmap level (NB some APIs ignore this)
         TextureManager::getSingleton().setDefaultNumMipmaps(5);
+
+        // initialise bullets list
+        mBullets = new Bullet*[10];
+        mBulletsPosition = 0;
+        mBulletsSize = 10;
 
         using namespace OIS;
@@ -79 +84 @@
         if (mScene)
                 delete mScene;
+
+        for (int i = 0; i < mBulletsPosition; i++)
+                delete mBullets[i];
+        delete mBullets;
 }
 
@@ -91 +100 @@
         mScene->tick(time, deltaTime);
         mShip->tick(time, deltaTime);
+
+        // update the bullet positions
+        for (int i = 0; i < mBulletsPosition; i++)
+        {
+                mBullets[i]->mNode->translate(mBullets[i]->mSpeed*deltaTime);
+                mBullets[i]->mNode->yaw(Degree(deltaTime*100));
+                mBullets[i]->mNode->roll(Degree(deltaTime*300));
+        }
 
         using namespace OIS;
@@ -257 +274 @@
         const MouseState &ms = mMouse->getMouseState();
 
+        if (ms.buttonDown(MB_Left) && !leftButtonDown)
+        {
+                leftButtonDown = true;
+                // fire
+                Bullet *mTempBullet = mShip->fire();
+                if (mBulletsPosition >= mBulletsSize)
+                {
+                        // redimension the array
+                        Bullet **mTempArray = new Bullet*[2*mBulletsSize];
+                        for (int i = 0; i < mBulletsSize; i++)
+                                mTempArray[i] = mBullets[i];
+                        mBulletsSize *= 2;
+                        delete mBullets;
+                        mBullets = mTempArray;
+                }
+                mBullets[mBulletsPosition++] = mTempBullet;
+
+        }
+        else if (!ms.buttons)
+                leftButtonDown = false;
+
         mShip->setYaw(Degree(-ms.X.rel * 0.13));
         mShip->setPitch(Degree(-ms.Y.rel * 0.13));

code/branches/main_reto/weapon_framework/weapon_framework.vcproj

@@ -184 +184 @@
                         >
                         <File
+                                RelativePath="..\src\Bullet.cpp"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\src\CameraManager.cpp"
                                 >
@@ -218 +222 @@
                         >
                         <File
+                                RelativePath="..\include\Bullet.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\include\CameraManager.h"
                                 >