Changeset 519

Timestamp:

Dec 13, 2007, 6:45:17 PM (16 years ago)

Author:

nicolape

Message:

Loading the steering works, but there is something odd with the steering object in orxonox.cc… it was defined global, i moved it to orxonox class and made it available with the singleton stuff.. it works for my loader and it compiles well, but when running the listener got a porblem with it and crashes. can someone take a look at id, thx

Location:

code/branches/FICN

Files:

• bin/levels/sample.oxw (modified) (1 diff)
• src/orxonox/objects/SpaceshipSteeringObject.cc (modified) (1 diff)
• src/orxonox/orxonox.cc (modified) (6 diffs)

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

@@ -27 +27 @@
 
                 <SpaceshipSteeringObject node="OgreHeadNode" forward="500" rotateupdown="200" rotaterightleft="200" looprightleft="200" />
-
-                
+        
 
 

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

@@ -54 +54 @@
                 steering->addNode(sceneNode);
     
+    
+    
+    
                 std::cout << "Loader: Initialized spaceship steering at node " << nodeStr << " values "<< forward << " " << rotateupdown << " "<< rotaterightleft << " "<< looprightleft << " "<< std::endl << std::endl;
         }       

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

@@ -80 +80 @@
   {
     public:
-      OrxListener(OIS::Keyboard *keyboard, OIS::Mouse *mouse, audio::AudioManager*  auMan)
+      OrxListener(OIS::Keyboard *keyboard, OIS::Mouse *mouse, audio::AudioManager*  auMan, SpaceshipSteering* steering)
       : mKeyboard(keyboard), mMouse(mouse)
       {
         
-        SpaceshipSteering* steering = orxonox::Orxonox::getSingleton()->getSteeringPointer();
+        
         
         speed = 250;
@@ -94 +94 @@
         minMouseX = 0;
         moved = false;
-        steering->brakeRotate(rotate*10);
-        steering->brakeLoop(loop);
+        
+        steering_ = steering;
+
+        steering_->brakeRotate(rotate*10);
+        steering_->brakeLoop(loop);
+    
+
         mMouse->setEventCallback(this);
         auMan_ = auMan;
@@ -104 +109 @@
         auMan_->update();
 
-        SpaceshipSteering* steering = orxonox::Orxonox::getSingleton()->getSteeringPointer();
-
         mKeyboard->capture();
         mMouse->capture();
         if (mKeyboard->isKeyDown(OIS::KC_UP) || mKeyboard->isKeyDown(OIS::KC_W))
-          steering->moveForward(speed);
+          steering_->moveForward(speed);
         else
-          steering->moveForward(0);
+          steering_->moveForward(0);
         if(mKeyboard->isKeyDown(OIS::KC_DOWN) || mKeyboard->isKeyDown(OIS::KC_S))
-          steering->brakeForward(speed);
+          steering_->brakeForward(speed);
         else
-          steering->brakeForward(speed/10);
+          steering_->brakeForward(speed/10);
         if (mKeyboard->isKeyDown(OIS::KC_RIGHT) || mKeyboard->isKeyDown(OIS::KC_D))
-          steering->loopRight(loop);
+          steering_->loopRight(loop);
         else
-          steering->loopRight(0);
+          steering_->loopRight(0);
         if (mKeyboard->isKeyDown(OIS::KC_LEFT) || mKeyboard->isKeyDown(OIS::KC_A))
-          steering->loopLeft(loop);
+          steering_->loopLeft(loop);
         else
-          steering->loopLeft(0);
+          steering_->loopLeft(0);
 
         if(moved) {
           if (mouseY<=0)
-            steering->rotateUp(-mouseY*rotate);
+            steering_->rotateUp(-mouseY*rotate);
           if (mouseY>0)
-            steering->rotateDown(mouseY*rotate);
+            steering_->rotateDown(mouseY*rotate);
           if (mouseX>0)
-            steering->rotateRight(mouseX*rotate);
+            steering_->rotateRight(mouseX*rotate);
           if (mouseX<=0)
-            steering->rotateLeft(-mouseX*rotate);
+            steering_->rotateLeft(-mouseX*rotate);
           mouseY = 0;
           mouseX = 0;
@@ -139 +142 @@
         }
         else {
-          steering->rotateUp(0);
-          steering->rotateDown(0);
-          steering->rotateRight(0);
-          steering->rotateLeft(0);
+          steering_->rotateUp(0);
+          steering_->rotateDown(0);
+          steering_->rotateRight(0);
+          steering_->rotateLeft(0);
         }
 
-                steering->tick(evt.timeSinceLastFrame);
+                steering_->tick(evt.timeSinceLastFrame);
                 
                 
@@ -181 +184 @@
       OIS::Mouse *mMouse;
       audio::AudioManager*  auMan_;
+      SpaceshipSteering* steering_;
   };
   // init static singleton reference of Orxonox
@@ -444 +448 @@
     ogre_->getRoot()->addFrameListener(TimerFL);
 
-    frameListener_ = new OrxListener(keyboard_, mouse_, auMan_);
+    frameListener_ = new OrxListener(keyboard_, mouse_, auMan_, steering_);
     ogre_->getRoot()->addFrameListener(frameListener_);
   }