Changeset 655 for code/branches/FICN

Timestamp:

Dec 19, 2007, 1:10:23 PM (17 years ago)

Author:

nicolape

Message:

Fixed ambient sound and changed skybox

Location:

code/branches/FICN

Files:

• bin/levels/sample.oxw (modified) (4 diffs)
• src/loader/LevelLoader.cc (modified) (3 diffs)

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

@@ -12 +12 @@
 
 
-  <!-- <audio>
+ <audio>
                 <ambient>
                         <ogg src="allgorythm-lift_up" />
@@ -20 +20 @@
                         <ogg src="tha_silent_partner_-_void" />
                 </ambient>
-  </audio> -->
+  </audio> 
 
   <!-- Keep a minimum distance of >100 to the object, otherwise the camara thinks it's in the object -->
@@ -30 +30 @@
   <world>
     <Ambient colourvalue="1,1,1" />
-    <Skybox src="Orxonox/StarSkyBox" />
+    <Skybox src="Orxonox/StarfieldSkyBox" />
 
     <!--Fighter camera="true" position="0,0,0" scale="10" yaw="-90" pitch="-90" mesh="assf3.mesh"  forward="500" rotateupdown="200" rotaterightleft="200" looprightleft="200" /-->
@@ -41 +41 @@
     <NPC position="100,0,400" scale="1" mesh="razor.mesh"/>
 
-    <Model position="200,0,500" scale="10" mesh="starship.mesh" yaw="-90" pitch="-90" />
-    <Model position="-200,0,500" scale="10" mesh="drone.mesh" yaw="-90" pitch="-90" />
+<!--    <Model position="200,0,500" scale="10" mesh="starship.mesh" yaw="-90" pitch="-90" />
+    <Model position="-200,0,500" scale="10" mesh="drone.mesh" yaw="-90" pitch="-90" />-->
 
     <Model position="-200,1000,500" scale="10" mesh="hoover_body.mesh" yaw="-90" pitch="-90" />

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

@@ -145 +145 @@
                         audio::AudioManager* auMan = orxonox::Orxonox::getSingleton()->getAudioManagerPointer();
                         audioElem = rootElement->FirstChildElement("audio");
+
                         if (audioElem)
                         {
@@ -155 +156 @@
             if (tNode->Type() == TiXmlNode::ELEMENT)
             {
+
                                                   tElem = tNode->ToElement();
                                                   std::string elemVal = tElem->Value();
                                                   if (elemVal == "ogg")
                                                   {
+                                COUT(0) << "Adding sound "<< tElem->Attribute("src") << "\n\n\n";
+
                                           auMan->ambientAdd(tElem->Attribute("src"));
                                                   }
             }
                                         }
+                                        auMan->ambientStart();
                                 }
                         }
@@ -194 +199 @@
                                  mLoadOverlay->hide();
                         }
+                        
+                        
                         COUT(0) << "Loading finished!\n\n\n\n\n";
                 }