Changeset 515 for code/branches

Timestamp:

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

Author:

nicolape

Message:

Added some objects for the level loader

Location:

code/branches/FICN

Files:

• bin/levels/sample.oxw (modified) (1 diff)
• src/orxonox/objects/CMakeFiles (added)
• src/orxonox/objects/CMakeFiles/CMakeDirectoryInformation.cmake (added)
• src/orxonox/objects/CMakeFiles/objects.dir (added)
• src/orxonox/objects/CMakeFiles/objects.dir/CXX.includecache (added)
• src/orxonox/objects/CMakeFiles/objects.dir/DependInfo.cmake (added)
• src/orxonox/objects/CMakeFiles/objects.dir/build.make (added)
• src/orxonox/objects/CMakeFiles/objects.dir/cmake_clean.cmake (added)
• src/orxonox/objects/CMakeFiles/objects.dir/cmake_clean_target.cmake (added)
• src/orxonox/objects/CMakeFiles/objects.dir/depend.internal (added)
• src/orxonox/objects/CMakeFiles/objects.dir/depend.make (added)
• src/orxonox/objects/CMakeFiles/objects.dir/depend.make.mark (added)
• src/orxonox/objects/CMakeFiles/objects.dir/flags.make (added)
• src/orxonox/objects/CMakeFiles/objects.dir/link.txt (added)
• src/orxonox/objects/CMakeFiles/objects.dir/progress.make (added)
• src/orxonox/objects/CMakeFiles/progress.make (added)
• src/orxonox/objects/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/Camera.cc (added)
• src/orxonox/objects/Camera.h (added)
• src/orxonox/objects/Entity.cc (added)
• src/orxonox/objects/Entity.h (added)
• src/orxonox/objects/Makefile (added)
• src/orxonox/objects/SceneNode.cc (added)
• src/orxonox/objects/SceneNode.h (added)
• src/orxonox/objects/SpaceshipSteeringObject.cc (added)
• src/orxonox/objects/SpaceshipSteeringObject.h (added)
• src/orxonox/objects/cmake_install.cmake (added)
• src/orxonox/objects/libobjects.so (added)
• src/orxonox/orxonox.cc (modified) (7 diffs)
• src/orxonox/orxonox.h (modified) (3 diffs)
• src/orxonox/spaceship_steering.cc (modified) (2 diffs)
• src/orxonox/spaceship_steering.h (modified) (2 diffs)

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

@@ -19 +19 @@
                 
                 <Skybox src="Orxonox/BlueStarSkyBox" />
-                                
+
+                <SceneNode name="OgreHeadNode" pos="0,0,0" />                           
+
+                <Entity name="ASSF" src="assf2.mesh" node="OgreHeadNode" />
+
+                <Camera name="Camera" pos="0,0,-250" lookat="0,0,0" node="OgreHeadNode" />
+
+                <SpaceshipSteeringObject node="OgreHeadNode" forward="500" rotateupdown="200" rotaterightleft="200" looprightleft="200" />
+
+                
 
 
-                                
-                                
         </world>
+
 
         <scripts> 

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

@@ -9 +9 @@
   Ambient.cc
   Skybox.cc
+  SceneNode.cc
+  Entity.cc
+  Camera.cc
+  SpaceshipSteeringObject.cc
 )
 

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);
-
+    */
 
   }

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

@@ -16 +16 @@
 #include "../loader/LevelLoader.h"
 #include "../audio/AudioManager.h"
+#include "spaceship_steering.h"
 
 
@@ -33 +34 @@
       static Orxonox* getSingleton();
       inline SceneManager* getSceneManager() { return ogre_->getSceneManager(); };
+      inline GraphicsEngine* getOgrePointer() { return ogre_; };
+      inline SpaceshipSteering* getSteeringPointer() { return steering_; };
     private:
       Orxonox();
@@ -54 +57 @@
       loader::LevelLoader*  loader_;    //!< level loader builds the scene
       audio::AudioManager*  auMan_;     //!< audio manager
+      SpaceshipSteering*        steering_;
       static Orxonox*       singletonRef_;
       OIS::Keyboard*        keyboard_;

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

@@ -28 +28 @@
 #include "Ogre.h"
 #include "spaceship_steering.h"
+#include <iostream>
 using namespace Ogre;
 
@@ -33 +34 @@
 maxSpeedRotateUpDown, float maxSpeedRotateRightLeft, float
 maxSpeedLoopRightLeft) {
+        
+        std::cout << "Steering was loaded"; 
   moveForward_ = 0;
   rotateUp_ = 0;

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

@@ -3 +3 @@
 
 #include "OgrePrerequisites.h"
+
 
 class SpaceshipSteering
@@ -58 +59 @@
 };
 
+
 #endif