Changeset 584 for code/branches/FICN/src/orxonox

Timestamp:

Dec 17, 2007, 5:44:18 PM (17 years ago)

Author:

nicolape

Message:

Music loads now from level file

Location:

code/branches/FICN/src/orxonox

Files:

• orxonox.cc (modified) (4 diffs)
• orxonox.h (modified) (1 diff)

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

@@ -430 +430 @@
     loader_->loadLevel();
 
-        /*
-    auMan_->ambientAdd("a1");
-    auMan_->ambientAdd("a2");
-    auMan_->ambientAdd("a3");
-                                //auMan->ambientAdd("ambient1");
     auMan_->ambientStart();
-        */
   }
 
@@ -455 +449 @@
     steering_->addNode(node);
 
-
+/*
     particle::ParticleInterface *e = new particle::ParticleInterface(mgr,"engine","Orxonox/strahl");
     e->particleSystem_->setParameter("local_space","true");
@@ -461 +455 @@
     e->setDirection(Vector3(0,0,-1));
     e->addToSceneNode(node);
+*/
 
     particle::ParticleInterface *w = new particle::ParticleInterface(mgr,"schuss","Orxonox/schuss");
@@ -469 +464 @@
     w->setPositionOfEmitter(1, Vector3(-10,10,0));
     w->addToSceneNode(node);
+
+    particle::ParticleInterface *tt = new particle::ParticleInterface(mgr,"thrusters","Orxonox/treibwerk");
+    tt->particleSystem_->setParameter("local_space","true");
+    tt->newEmitter();
+    tt->setDirection(Vector3(0,0,1));
+    tt->setPositionOfEmitter(0, Vector3(15,0,-60));
+    tt->setPositionOfEmitter(1, Vector3(-15,0,-60));
+    tt->addToSceneNode(node);
+
+
   }
 

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

@@ -43 +43 @@
       inline GraphicsEngine* getOgrePointer() { return ogre_; };
       inline SpaceshipSteering* getSteeringPointer() { return steering_; };
+      inline audio::AudioManager* getAudioManagerPointer() { return auMan_; };
     private:
       Orxonox();