Changeset 9235 in orxonox.OLD for trunk/src/story_entities/game_world.cc

Timestamp:

Jul 5, 2006, 4:39:02 PM (19 years ago)

Author:

bensch

Message:

merged the presentation back

File:

• trunk/src/story_entities/game_world.cc (modified) (9 diffs)

trunk/src/story_entities/game_world.cc

@@ -62 +62 @@
 #include "game_rules.h"
 
-using namespace std;
-
 #include "script_class.h"
 CREATE_SCRIPTABLE_CLASS(GameWorld, CL_GAME_WORLD,
                         addMethod("setPlaymode", ExecutorLua1<GameWorld,const std::string&>(&GameWorld::setPlaymode))
+                        ->addMethod("setSoundtrack", ExecutorLua1<GameWorld, const std::string&>(&GameWorld::setSoundtrack))
                        );
 
@@ -158 +157 @@
 
   PRINTF(3)("> Loading world: '%s'\n", getLoadFile().c_str());
-//  TiXmlElement* element;
-//  GameLoader* loader = GameLoader::getInstance();
+  //  TiXmlElement* element;
+  //  GameLoader* loader = GameLoader::getInstance();
 
   if( getLoadFile().empty())
@@ -233 +232 @@
 
 
+void GameWorld::setSoundtrack(const std::string& soundTrack)
+{
+  if (this->dataTank != NULL)
+  {
+    this->dataTank->setSoundTrack(soundTrack);
+    this->dataTank->music->play();
+  }
+}
+
+
 /**
  *  starts the GameWorld
@@ -312 +321 @@
     /* update the state */
     //this->update (); /// LESS REDUNDANCY.
-//      PNode::getNullParent()->updateNode(this->dtS);
+    //      PNode::getNullParent()->updateNode(this->dtS);
     PNode::getNullParent()->updateNode(this->dtS);
 
@@ -459 +468 @@
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
       this->dataTank->objectManager->getObjectList(OM_GROUP_00_PROJ));
-  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
-      this->dataTank->objectManager->getObjectList(OM_GROUP_01));
+  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
+    this->dataTank->objectManager->getObjectList(OM_GROUP_00));
+
+  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
+  this->dataTank->objectManager->getObjectList(OM_GROUP_02));
+  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_02),
+  this->dataTank->objectManager->getObjectList(OM_GROUP_01_PROJ));
+
 
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
@@ -536 +551 @@
 void GameWorld::renderPassReflection()
 {
-    // clear buffer
+  // clear buffer
   glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
-//  glLoadIdentity();
+  //  glLoadIdentity();
 
   const std::list<BaseObject*>* reflectedWaters;
@@ -562 +577 @@
       // draw everything to be included in the reflection
       this->drawEntityList(State::getObjectManager()->getReflectionList());
-//       for (unsigned int i = 0; i < this->dataTank->drawLists.size(); ++i)
-//         this->drawEntityList(State::getObjectManager()->getObjectList(this->dataTank->drawLists[i]));
+      //       for (unsigned int i = 0; i < this->dataTank->drawLists.size(); ++i)
+      //         this->drawEntityList(State::getObjectManager()->getObjectList(this->dataTank->drawLists[i]));
 
       // clean up from reflection rendering
@@ -578 +593 @@
 void GameWorld::renderPassRefraction()
 {
-    // clear buffer
+  // clear buffer
   glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
   //glLoadIdentity();
@@ -602 +617 @@
       // draw everything to be included in the reflection
       this->drawEntityList(State::getObjectManager()->getReflectionList());
-//       for (unsigned int i = 0; i < this->dataTank->drawLists.size(); ++i)
-//         this->drawEntityList(State::getObjectManager()->getObjectList(this->dataTank->drawLists[i]));
+      //       for (unsigned int i = 0; i < this->dataTank->drawLists.size(); ++i)
+      //         this->drawEntityList(State::getObjectManager()->getObjectList(this->dataTank->drawLists[i]));
 
       // clean up from reflection rendering