Changeset 4726 in orxonox.OLD for orxonox/trunk/src/story_entities

Timestamp:

Jun 28, 2005, 10:33:14 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: more loading procedures, fixed small bugs in loadparam

File:

• orxonox/trunk/src/story_entities/world.cc (modified) (5 diffs)

orxonox/trunk/src/story_entities/world.cc

@@ -39 +39 @@
 #include "light.h"
 #include "text_engine.h"
+#include "load_param.h"
 
 #include "track_manager.h"
@@ -173 +174 @@
 {
   PRINTF(3)("World::~World() - deleting current world\n");
+
+  ParticleEngine::getInstance()->debug();
 
   this->eventHandler->unsubscribe(this->localPlayer);
@@ -376 +379 @@
     }
   this->glmis->draw();
-  // find WorldEntities
+
+  ////////////////////////
+  // find WorldEntities //
+  ////////////////////////
+
   element = root->FirstChildElement("WorldEntities");
 
@@ -403 +410 @@
     }
 
+    //////////////////////////////
+    // LOADING ADDITIONAL STUFF //
+    //////////////////////////////
+
+    LoadParam<ParticleEngine>(root, "ParticleEngine", ParticleEngine::getInstance(), &ParticleEngine::loadParams);
+
   // find Track
   element = root->FirstChildElement( "Track");
@@ -503 +516 @@
 
 
-  ParticleSystem* vulcanSysStone = new ParticleSystem(1000, PARTICLE_SPRITE);
-  vulcanSysStone->setModel("models/vulcanic_stone.obj");
-  vulcanSysStone->setLifeSpan(6);
-  vulcanSysStone->setRadius(0.0, 5.0, 3.0);
-  vulcanSysStone->setMass (0.0, .1);
-
-  ParticleEmitter* vulcanEmitStone = new ParticleEmitter(Vector(0,1,0), .5, 10, 200);
-  vulcanEmitStone->setEmissionVelocity(700, 400);
-  vulcanEmitStone->setType(EMITTER_CUBE);
-  vulcanEmitStone->setSize(40);
-  vulcanEmitStone->setRelCoor(2460,105, 606);
-
-  ParticleEngine::getInstance()->addConnection(vulcanEmitStone, vulcanSysStone);
-  new PhysicsConnection(vulcanSysStone, gravity);
+//   ParticleSystem* vulcanSysStone = new ParticleSystem(1000, PARTICLE_MODEL);
+//   vulcanSysStone->setLifeSpan(6);
+//   vulcanSysStone->setRadius(0.0, 5.0, 3.0);
+//   vulcanSysStone->setMass (0.0, .1);
+//   vulcanSysStone->loadModel("models/vulcanic_stones.obj");
+//
+//   ParticleEmitter* vulcanEmitStone = new ParticleEmitter(Vector(0,1,0), .5, 10, 200);
+//   vulcanEmitStone->setEmissionVelocity(700, 400);
+//   vulcanEmitStone->setType(EMITTER_CUBE);
+//   vulcanEmitStone->setSize(40);
+//   vulcanEmitStone->setRelCoor(2460,105, 606);
+
+//   ParticleEngine::getInstance()->addConnection(vulcanEmitStone, vulcanSysStone);
+//   new PhysicsConnection(vulcanSysStone, gravity);
 
   // SYSTEM OF THE VULCANO