Changeset 127

Timestamp:

Oct 30, 2007, 10:41:04 PM (17 years ago)

Author:

rgrieder

Message:

 

Location:

code/branches/main_reto

Files:

• include/OrxonoxShip.cpp (deleted)
• include/OrxonoxShip.h (modified) (1 diff)
• include/RunManager.h (modified) (1 diff)
• include/SteerableNode.h (modified) (1 diff)
• src/OrxonoxShip.cpp (added)
• 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

@@ -6 +6 @@
 using namespace Ogre;
 
-class OrxonoxShip : public Entity
+class OrxonoxShip
 {
 public:
-        OrxonoxShip(const Ogre::String, Ogre::MeshPtr&);
+        OrxonoxShip(SceneManager*, SceneNode*);
         virtual ~OrxonoxShip();
+
+        /*void setThrust(float);
+        void setSideThrust(float);*/
 
         virtual bool initialise();
 
 protected:
+        SceneManager *mSceneMgr;
+        SceneNode *mRootNode;
+        Entity *mShip;
 };
 

code/branches/main_reto/include/RunManager.h

@@ -38 +38 @@
         OrxonoxScene *mScene;
         Camera* mCamera;
-        SteerableNode *mShipNode;
+        SceneNode *mShipNode;
         OrxonoxShip *mShip;
 

code/branches/main_reto/include/SteerableNode.h

@@ -6 +6 @@
 using namespace Ogre;
 
-class SteerableNode : public SceneNode
+class SteerableNode
 {
 public:

code/branches/main_reto/src/RunManager.cpp

@@ -8 +8 @@
 mTranslateVector(Vector3::ZERO), mStatsOn(true), mNumScreenShots(0),
 mMoveScale(0.0f), mRotScale(0.0f), mTimeUntilNextToggle(0), mFiltering(TFO_BILINEAR),
-mAniso(1), mSceneDetailIndex(0), mMoveSpeed(100), mRotateSpeed(36), mDebugOverlay(0),
+mAniso(1), mSceneDetailIndex(0), mMoveSpeed(300), mRotateSpeed(36), mDebugOverlay(0),
 mInputManager(0), mMouse(0), mKeyboard(0), mJoy(0)
 {
@@ -18 +18 @@
         // background scene
         mScene = new OrxonoxScene(mSceneMgr);
+
+        // create a steerable SceneNode for the spaceship to be attached to
+        mShipNode = mSceneMgr->getRootSceneNode()->createChildSceneNode("ShipNode", Vector3(20, 20, 20));
+
+        // spaceship
+        mShip = new OrxonoxShip(mSceneMgr, mShipNode);
+
+        // load all resources and create the entities
+        mScene->initialise();
+        mShip->initialise();
+
         // create camera and viewport
         createCamera();
         createViewports();
-        mScene->initialise();
-
-        // create a steerable SceneNode for the spaceship to be attached to
-        /*mShipNode = new SteerableNode(mSceneMgr, "shipNode");
-        mShipNode->setPosition(Vector3(20, 20, 20));
-        mSceneMgr->getRootSceneNode()->addChild(mShipNode);*/
-
-        // spaceship
-        /*mShip = static_cast<OrxonoxShip*>(mSceneMgr->createEntity("ship", "ninja.mesh"));
-        mShipNode->attachObject(mShip);*/
-
+
+        // Set default mipmap level (NB some APIs ignore this)
+        TextureManager::getSingleton().setDefaultNumMipmaps(5);
 
         using namespace OIS;
@@ -76 +79 @@
         if (mScene)
                 delete mScene;
-
-        /*if (mShipNode)
-                delete mShipNode;
-
-        if (mShip)
-                delete mShip;*/
 }
 
@@ -369 +366 @@
 {
         mCamera = mSceneMgr->createCamera("PlayerCam");
+        mShipNode->attachObject(mCamera);
         mCamera->setNearClipDistance(5);
         mCamera->setPosition(Vector3(0,10,500));
@@ -384 +382 @@
         mCamera->setAspectRatio(
                 Real(vp->getActualWidth()) / Real(vp->getActualHeight()));
-
-        // Set default mipmap level (NB some APIs ignore this)
-        TextureManager::getSingleton().setDefaultNumMipmaps(5);
-}
-
-
+}
+
+

code/branches/main_reto/weapon_framework/weapon_framework.vcproj

@@ -211 +211 @@
                                 >
                         </File>
-                        <File
-                                RelativePath="..\src\SteerableNode.cpp"
-                                >
-                        </File>
                 </Filter>
                 <Filter
@@ -245 +241 @@
                                 >
                         </File>
-                        <File
-                                RelativePath="..\include\SteerableNode.h"
-                                >
-                        </File>
                 </Filter>
                 <Filter