Changeset 608 for code

Timestamp:

Dec 18, 2007, 2:23:12 AM (17 years ago)

Author:

landauf

Message:

added SpaceShip class

Location:

code/branches/FICN

Files:

• bin/levels/sample.oxw (modified) (2 diffs)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/Camera.cc (modified) (1 diff)
• src/orxonox/objects/SpaceShip.cc (added)
• src/orxonox/objects/SpaceShip.h (added)
• src/orxonox/orxonox.cc (modified) (8 diffs)
• src/orxonox/orxonox.h (modified) (5 diffs)

code/branches/FICN/bin/levels/sample.oxw

@@ -24 +24 @@
   <!-- Keep a minimum distance of >100 to the object, otherwise the camara thinks it's in the object -->
   <!-- the value has to negative, as we want the camara behind the object -->
+<!--
+    <Camera name="Camera" pos="0,50,-150" lookat="0,20,0" node="2OgreHeadNode" />
+-->
   <world>
-    <SceneNode name="OgreHeadNode" pos="0,0,0" />
-    <Camera name="Camera" pos="0,50,-150" lookat="0,20,0" node="OgreHeadNode" />
     <Ambient colourvalue="1,1,1" />
     <Skybox src="Orxonox/StarfieldSkyBox" />
 
-
-    <SceneNode name="ShipNode" pos="0,0,0" node="OgreHeadNode" scale="10,10,10" yaw="-90" pitch="-90" />
-    <BaseEntity name="TheShip" src="assf3.mesh" node="ShipNode" />
+    <SpaceShip camera="true" position="0,0,0" scale="10" yaw="-90" pitch="-90" mesh="assf3.mesh"  forward="500" rotateupdown="200" rotaterightleft="200" looprightleft="200" />
 
     <Model position="200,0,500" scale="10" mesh="assf3.mesh" yaw="-90" pitch="-90" />
@@ -48 +47 @@
 
   <!-- Unused at the moment -->
-  <SpaceshipSteeringObject node="OgreHeadNode" forward="500" rotateupdown="200" rotaterightleft="200" looprightleft="200" />
+<!--  <SpaceshipSteeringObject node="OgreHeadNode" forward="500" rotateupdown="200" rotaterightleft="200" looprightleft="200" /> -->
 
   <scripts>

code/branches/FICN/src/orxonox/CMakeLists.txt

@@ -28 +28 @@
     objects/Entity.cc
     objects/Camera.cc
-    objects/SpaceshipSteeringObject.cc
+#    objects/SpaceshipSteeringObject.cc
     objects/Model.cc
     objects/Mesh.cc
     objects/BaseEntity.cc
+    objects/SpaceShip.cc
+    objects/NPC.cc
   )
 ELSE(WIN32)

code/branches/FICN/src/orxonox/objects/CMakeLists.txt

@@ -13 +13 @@
   Entity.cc
   Camera.cc
-  SpaceshipSteeringObject.cc
+#  SpaceshipSteeringObject.cc
   Model.cc
   Mesh.cc
+  SpaceShip.cc
   NPC.cc
 )

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

@@ -59 +59 @@
                 std::string node = xmlElem->Attribute("node");
 
-                    Ogre::SceneNode* sceneNode = (Ogre::SceneNode*)mgr->getRootSceneNode()->getChild(node);
+                    Ogre::SceneNode* sceneNode = (Ogre::SceneNode*)mgr->getRootSceneNode()->createChildSceneNode(node); //getChild(node);
                     sceneNode->attachObject((Ogre::MovableObject*)cam);
 

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

@@ -61 +61 @@
 #include "../audio/AudioManager.h"
 
-#include "spaceship_steering.h"
-
-#include "particle/ParticleInterface.h"
-
 #include "hud/HUD.h"
 
@@ -84 +80 @@
 
    // put this in seperate Class or solve the problem in another fashion
-  class OrxListener : public FrameListener, public OIS::MouseListener
+  class OrxListener : public FrameListener
   {
     public:
-      OrxListener(OIS::Keyboard *keyboard, OIS::Mouse *mouse, audio::AudioManager*  auMan, SpaceshipSteering* steering, gameMode mode)
-      : mKeyboard(keyboard), mMouse(mouse)
+      OrxListener(OIS::Keyboard *keyboard, audio::AudioManager*  auMan, gameMode mode)
       {
-
-
+        mKeyboard = keyboard;
         mode_=mode;
-        speed = 250;
-        loop = 100;
-        rotate = 10;
-        mouseX = 0;
-        mouseY = 0;
-        maxMouseX = 0;
-        minMouseX = 0;
-        moved = false;
-
-        steering_ = steering;
-
-        steering_->brakeRotate(rotate*10);
-        steering_->brakeLoop(loop);
-
-
-        mMouse->setEventCallback(this);
         auMan_ = auMan;
       }
+
       bool frameStarted(const FrameEvent& evt)
       {
-
         auMan_->update();
 
-        mKeyboard->capture();
-        mMouse->capture();
-        if (mKeyboard->isKeyDown(OIS::KC_UP) || mKeyboard->isKeyDown(OIS::KC_W))
-          steering_->moveForward(speed);
-        else
-          steering_->moveForward(0);
-        if(mKeyboard->isKeyDown(OIS::KC_DOWN) || mKeyboard->isKeyDown(OIS::KC_S))
-          steering_->brakeForward(speed);
-        else
-          steering_->brakeForward(speed/10);
-        if (mKeyboard->isKeyDown(OIS::KC_RIGHT) || mKeyboard->isKeyDown(OIS::KC_D))
-          steering_->loopRight(loop);
-        else
-          steering_->loopRight(0);
-        if (mKeyboard->isKeyDown(OIS::KC_LEFT) || mKeyboard->isKeyDown(OIS::KC_A))
-          steering_->loopLeft(loop);
-        else
-          steering_->loopLeft(0);
-
-        if(moved) {
-          if (mouseY<=0)
-            steering_->rotateUp(-mouseY*rotate);
-          if (mouseY>0)
-            steering_->rotateDown(mouseY*rotate);
-          if (mouseX>0)
-            steering_->rotateRight(mouseX*rotate);
-          if (mouseX<=0)
-            steering_->rotateLeft(-mouseX*rotate);
-          mouseY = 0;
-          mouseX = 0;
-          moved = false;
-        }
-        else {
-          steering_->rotateUp(0);
-          steering_->rotateDown(0);
-          steering_->rotateRight(0);
-          steering_->rotateLeft(0);
-        }
-
-                steering_->tick(evt.timeSinceLastFrame);
-
-
-
-//      scenemanager->spacehip->tick(evt.timesincelastframe);
-        //if(mKeyboard->isKeyDown(OIS::KC_ESCAPE))
-          //cout << "maximal MouseX: " << maxMouseX << "\tminMouseX: " << minMouseX << endl;
         if(mode_==PRESENTATION)
-          server_g->tick(evt.timeSinceLastFrame);
+          server_g->tick(evt.timeSinceLastFrame);
         else if(mode_==CLIENT)
           client_g->tick(evt.timeSinceLastFrame);
+
         usleep(10);
+
+        mKeyboard->capture();
         return !mKeyboard->isKeyDown(OIS::KC_ESCAPE);
       }
 
-      bool mouseMoved(const OIS::MouseEvent &e)
-      {
-        mouseX += e.state.X.rel;
-        mouseY += e.state.Y.rel;
-        if(mouseX>maxMouseX) maxMouseX = mouseX;
-        if(mouseX<minMouseX) minMouseX = mouseX;
-        //cout << "mouseX: " << mouseX << "\tmouseY: " << mouseY << endl;
-        moved = true;
-        return true;
-      }
-
-      bool mousePressed(const OIS::MouseEvent &e, OIS::MouseButtonID id) { return true; }
-      bool mouseReleased(const OIS::MouseEvent &e, OIS::MouseButtonID id) { return true; }
-
     private:
       gameMode mode_;
-      float speed;
-      float rotate;
-      float loop;
-      float mouseY;
-      float mouseX;
-      float maxMouseX;
-      float minMouseX;
-      bool moved;
       OIS::Keyboard *mKeyboard;
-      OIS::Mouse *mMouse;
       audio::AudioManager*  auMan_;
-      SpaceshipSteering* steering_;
   };
+
   // init static singleton reference of Orxonox
   Orxonox* Orxonox::singletonRef_ = NULL;
@@ -207 +119 @@
   Orxonox::Orxonox()
   {
-    ogre_ = new GraphicsEngine();
-    dataPath_ = "";
+    this->ogre_ = new GraphicsEngine();
+    this->dataPath_ = "";
+    this->loader_ = 0;
+    this->auMan_ = 0;
+    this->singletonRef_ = 0;
+    this->keyboard_ = 0;
+    this->mouse_ = 0;
+    this->inputManager_ = 0;
+    this->frameListener_ = 0;
+    this->root_ = 0;
   }
 
@@ -240 +160 @@
     ar.checkArgument("ip", serverIp_, false);
     if(ar.errorHandling()) die();
-
     if(mode == std::string("server"))
     {
@@ -343 +262 @@
     createRenderWindow();
     initializeResourceGroups();
+    setupInputSystem();
+    Factory::createClassHierarchy();
     createScene();
     setupScene();
-    setupInputSystem();
-    Factory::createClassHierarchy();
     createFrameListener();
     try{
@@ -472 +391 @@
   void Orxonox::setupScene()
   {
-    SceneManager *mgr = ogre_->getSceneManager();
-
-
-    SceneNode* node = (SceneNode*)mgr->getRootSceneNode()->getChild("OgreHeadNode");
+//    SceneManager *mgr = ogre_->getSceneManager();
+
+
+//    SceneNode* node = (SceneNode*)mgr->getRootSceneNode()->getChild("OgreHeadNode");
 //     SceneNode *node = mgr->getRootSceneNode()->createChildSceneNode("OgreHeadNode", Vector3(0,0,0));
 
-
-    steering_ = new SpaceshipSteering(500, 200, 200, 200);
-    steering_->addNode(node);
 
 /*
@@ -489 +405 @@
     e->addToSceneNode(node);
 */
-
-    particle::ParticleInterface *w = new particle::ParticleInterface(mgr,"schuss","Orxonox/schuss");
-    w->particleSystem_->setParameter("local_space","true");
-    w->newEmitter();
-    w->setDirection(Vector3(0,0,1));
-    w->setPositionOfEmitter(0, Vector3(10,10,0));
-    w->setPositionOfEmitter(1, Vector3(-10,10,0));
-    w->addToSceneNode(node);
-
-    particle::ParticleInterface *tt = new particle::ParticleInterface(mgr,"twinthruster","Orxonox/engineglow");
-    tt->particleSystem_->setParameter("local_space","true");
-    tt->newEmitter();
-    tt->setDirection(Vector3(0,0,-1));
-    tt->setPositionOfEmitter(0, Vector3(20,-1,-15));
-    tt->setPositionOfEmitter(1, Vector3(-20,-1,-15));
-    tt->addToSceneNode(node);
-
   }
 
@@ -542 +441 @@
 
     //if(mode_!=CLIENT) // just a hack ------- remove this in future
-      frameListener_ = new OrxListener(keyboard_, mouse_, auMan_, steering_, mode_);
+      frameListener_ = new OrxListener(keyboard_, auMan_, mode_);
     ogre_->getRoot()->addFrameListener(frameListener_);
   }

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

@@ -10 +10 @@
 //#include <OgreSingleton.h>
 #include <OgreSceneManager.h>
-
 #include <OIS/OIS.h>
 
@@ -29 +28 @@
     PRESENTATION
   };
-  
+
   class OrxListener;
 
@@ -42 +41 @@
       inline SceneManager* getSceneManager() { return ogre_->getSceneManager(); };
       inline GraphicsEngine* getOgrePointer() { return ogre_; };
-      inline SpaceshipSteering* getSteeringPointer() { return steering_; };
       inline audio::AudioManager* getAudioManagerPointer() { return auMan_; };
+      inline OIS::Keyboard* getKeyboard() { return this->keyboard_; }
+      inline OIS::Mouse* getMouse() { return this->mouse_; }
+
     private:
       Orxonox();
@@ -63 +64 @@
       void createFrameListener();
       void startRenderLoop();
+
     private:
-
       GraphicsEngine*       ogre_;      //!< our dearest graphics engine <3
       std::string           dataPath_;  //!< path to data
       loader::LevelLoader*  loader_;    //!< level loader builds the scene
       audio::AudioManager*  auMan_;     //!< audio manager
-      SpaceshipSteering*        steering_;
       static Orxonox*       singletonRef_;
       OIS::Keyboard*        keyboard_;
@@ -76 +76 @@
       OrxListener*          frameListener_;
       Ogre::Root*           root_;
-      
+
       // this is used to identify the mode (server/client/...) we're in
       gameMode              mode_;