Changeset 584

Timestamp:

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

Author:

nicolape

Message:

Music loads now from level file

Location:

code/branches/FICN

Files:

• bin/levels/sample.oxw (modified) (2 diffs)
• src/loader/LevelLoader.cc (modified) (3 diffs)
• src/orxonox/orxonox.cc (modified) (4 diffs)
• src/orxonox/orxonox.h (modified) (1 diff)

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

@@ -24 +24 @@
   <world>
     <SceneNode name="OgreHeadNode" pos="0,0,0" />
-    <Camera name="Camera" pos="0,0,-150" lookat="0,0,0" node="OgreHeadNode" />
+    <Camera name="Camera" pos="0,50,-150" lookat="0,20,0" node="OgreHeadNode" />
     <Ambient colourvalue="1,1,1" />
     <Skybox src="Orxonox/StarfieldSkyBox" />
@@ -31 +31 @@
     <BaseEntity name="TheShip" src="assf2.mesh" node="ShipNode" />
 
-    <SceneNode name="node1" pos="0,200,0" />
+    <SceneNode name="ShipNode2" pos="200,0,500" scale="10,10,10" yaw="-90" pitch="-90" />
+    <BaseEntity name="TheShip2" src="assf2.mesh" node="ShipNode2" />
+
+    <SceneNode name="ShipNode3" pos="-200,0,500" scale="10,10,10" yaw="-90" pitch="-90" />
+    <BaseEntity name="TheShip3" src="assf2.mesh" node="ShipNode3" />
+
+
+    <SceneNode name="node1" pos="0,2000,0"  scale="40,40,40" />
     <Entity name="asteroid1" src="ast1.mesh" node="node1" />
 
-    <SceneNode name="node2" pos="200,0,0" />
+    <SceneNode name="node2" pos="2000,0,0" scale="20,20,20"/>
     <Entity name="asteroid2" src="ast2.mesh" node="node2" />
 
-    <SceneNode name="node3" pos="0,0,200" />
-    <Entity name="aststeroid3" src="ast3.mesh" node="node3" />
+    <SceneNode name="node3" pos="0,0,2000" scale="20,20,20"/>
+    <Entity name="aststeroid3" src="ast3.mesh" node="node3"/>
 
-    <SceneNode name="node4" pos="0,-200,0" />
+    <SceneNode name="node4" pos="0,-2000,0" scale="20,20,20"/>
     <Entity name="asteroid4" src="ast4.mesh" node="node4" />
 
-    <SceneNode name="node5" pos="-200,0,0" />
+    <SceneNode name="node5" pos="-2000,0,0" scale="20,20,20"/>
     <Entity name="asteroid5" src="ast5.mesh" node="node5" />
 
-    <SceneNode name="node6" pos="0,0,-200" />
+    <SceneNode name="node6" pos="0,0,-2000" scale="20,20,20"/>
     <Entity name="asteroid6" src="ast6.mesh" node="node6" />
   </world>

code/branches/FICN/src/loader/LevelLoader.cc

@@ -39 +39 @@
 #include "orxonox/core/Error.h"
 #include "orxonox/objects/BaseObject.h"
+#include "audio/AudioManager.h"
+#include "orxonox/orxonox.h"
 
 using namespace std;
@@ -100 +102 @@
                 {
                         TiXmlElement* loadElem;
+                        TiXmlElement* audioElem;
                         TiXmlElement* worldElem;
                         TiXmlElement* tElem;
@@ -140 +143 @@
 
                         // Load audio
-                        // TODO
-
-                        // Load scripts
-                        // TODO
-
+                        audio::AudioManager* auMan = orxonox::Orxonox::getSingleton()->getAudioManagerPointer();
+                        audioElem = rootElement->FirstChildElement("audio");
+                        if (audioElem)
+                        {
+                                audioElem = audioElem->FirstChildElement("ambient");
+                                if (audioElem)
+                                {
+                                        tNode = 0;
+                                        while( tNode = audioElem->IterateChildren( tNode ) )
+                                        {
+                                                tElem = tNode->ToElement();
+                                                std::string elemVal = tElem->Value();
+                                                if (elemVal == "ogg")
+                                                {
+                                        auMan->ambientAdd(tElem->Attribute("src"));
+                                                }
+                                        }               
+                                }       
+                        }
+                        
                         // Load world
                         worldElem = rootElement->FirstChildElement("world");

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();