Changeset 515 for code/branches/FICN/src/orxonox/orxonox.cc

Timestamp:

Dec 13, 2007, 6:21:22 PM (16 years ago)

Author:

nicolape

Message:

Added some objects for the level loader

File:

• code/branches/FICN/src/orxonox/orxonox.cc (modified) (7 diffs)

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

@@ -60 +60 @@
 
 #include "spaceship_steering.h"
-SpaceshipSteering* steering;
 
 
@@ -84 +83 @@
       : mKeyboard(keyboard), mMouse(mouse)
       {
+        
+        SpaceshipSteering* steering = orxonox::Orxonox::getSingleton()->getSteeringPointer();
+        
         speed = 250;
         loop = 100;
@@ -101 +103 @@
 
         auMan_->update();
+
+        SpaceshipSteering* steering = orxonox::Orxonox::getSingleton()->getSteeringPointer();
 
         mKeyboard->capture();
@@ -141 +145 @@
         }
 
-        steering->tick(evt.timeSinceLastFrame);
+                steering->tick(evt.timeSinceLastFrame);
+                
+                
+                
 //      scenemanager->spacehip->tick(evt.timesincelastframe);
         if(mKeyboard->isKeyDown(OIS::KC_ESCAPE))
@@ -348 +355 @@
     loader_->loadLevel();
 
+
+
+
+
         /*
     auMan_->ambientAdd("a1");
@@ -362 +373 @@
     SceneManager *mgr = ogre_->getSceneManager();
 
+        /*
     Camera *cam = mgr->createCamera("Camera");
     cam->setPosition(Vector3(0,0,-250));
     cam->lookAt(Vector3(0,0,0));
+
+
     Viewport *vp = ogre_->getRoot()->getAutoCreatedWindow()->addViewport(cam);
 
-
+/*
     Entity* head = mgr->createEntity("ASSF", "assf2.mesh");
     SceneNode *node = mgr->getRootSceneNode()->createChildSceneNode("OgreHeadNode", Vector3(0,0,0));
@@ -393 +407 @@
     steering = new SpaceshipSteering(500, 200, 200, 200);
     steering->addNode(node);
-
+    */
 
   }