Changeset 126

Timestamp:

Oct 30, 2007, 6:22:22 PM (17 years ago)

Author:

rgrieder

Message:

 

Location:

code/branches/main_reto

Files:

• include/CameraManager.h (added)
• include/OrxonoxShip.cpp (added)
• include/OrxonoxShip.h (added)
• include/RunManager.h (modified) (2 diffs)
• include/SteerableNode.h (added)
• src/CameraManager.cpp (added)
• src/RunManager.cpp (modified) (2 diffs)
• src/SteerableNode.cpp (added)
• weapon_framework/weapon_framework.suo (modified) (previous)
• weapon_framework/weapon_framework.vcproj (modified) (4 diffs)

code/branches/main_reto/include/RunManager.h

@@ -8 +8 @@
 #include "OgreControl.h"
 #include "OrxonoxScene.h"
+#include "OrxonoxShip.h"
+#include "SteerableNode.h"
 
 //Use this define to signify OIS will be used as a DLL
@@ -31 +33 @@
         OgreControl  *mOgre;
 
-        // these objects are meant to be static in existance.
+        SceneManager *mSceneMgr;
+        RenderWindow* mWindow;
+
         OrxonoxScene *mScene;
-        SceneManager *mSceneMgr;
         Camera* mCamera;
-        RenderWindow* mWindow;
+        SteerableNode *mShipNode;
+        OrxonoxShip *mShip;
 
         Vector3 mTranslateVector;

code/branches/main_reto/src/RunManager.cpp

@@ -11 +11 @@
 mInputManager(0), mMouse(0), mKeyboard(0), mJoy(0)
 {
-        // create new scene
+        // create new SceneManger
         mSceneMgr = mOgre->getRoot()->createSceneManager(ST_GENERIC,"mScene");
+
+
+        // create various objects
+        // background scene
         mScene = new OrxonoxScene(mSceneMgr);
-
         // 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);*/
 
 
@@ -65 +76 @@
         if (mScene)
                 delete mScene;
+
+        /*if (mShipNode)
+                delete mShipNode;
+
+        if (mShip)
+                delete mShip;*/
 }
 

code/branches/main_reto/weapon_framework/weapon_framework.vcproj

@@ -184 +184 @@
                         >
                         <File
+                                RelativePath="..\src\CameraManager.cpp"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\src\main.cpp"
                                 >
@@ -200 +204 @@
                         </File>
                         <File
+                                RelativePath="..\include\OrxonoxShip.cpp"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\src\RunManager.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\src\SteerableNode.cpp"
                                 >
                         </File>
@@ -210 +222 @@
                         >
                         <File
+                                RelativePath="..\include\CameraManager.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\include\OgreControl.h"
                                 >
@@ -222 +238 @@
                         </File>
                         <File
+                                RelativePath="..\include\OrxonoxShip.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\include\RunManager.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\include\SteerableNode.h"
                                 >
                         </File>