Changeset 4715 in orxonox.OLD

Timestamp:

Jun 27, 2005, 12:07:16 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: vulcan spy some Splinters

Location:

orxonox/trunk/src

Files:

• lib/particles/particle_system.cc (modified) (3 diffs)
• story_entities/world.cc (modified) (2 diffs)

orxonox/trunk/src/lib/particles/particle_system.cc

@@ -81 +81 @@
    if (this->material)
      delete this->material;
+
+   ResourceManager::getInstance()->unload(this->model);
 }
 
@@ -176 +178 @@
 }
 
-
-
 /**
  * sets a Model to the Particles
@@ -185 +185 @@
 {
   if (this->model)
-    delete this->model;
+    ResourceManager::getInstance()->unload(this->model);
   if (modelName)
-    this->model = new OBJModel(modelName);
-  this->setType(PARTICLE_MODEL);
+  {
+    this->model = (Model*)ResourceManager::getInstance()->load(modelName, OBJ, RP_LEVEL);
+    this->setType(PARTICLE_MODEL);
+  }
+  else
+  {
+    this->model = NULL;
+    this->setType(PARTICLE_SPRITE);
+  }
 }
 

orxonox/trunk/src/story_entities/world.cc

@@ -476 +476 @@
 
 
+
+  ////////////
+  // STATIC //
+  ////////////
+
+  Field* gravity = new Gravity();
+  gravity->setMagnitude(30.0);
+
   // SYSTEM OF THE VULCANO
   ParticleSystem* vulcanSysFog = new ParticleSystem(10000, PARTICLE_SPRITE);
-  vulcanSysFog->setLifeSpan(3);
-  vulcanSysFog->setRadius(0.0, 1.0, 10);
-  vulcanSysFog->setRadius(.2, 3, 50);
-  vulcanSysFog->setRadius(1.0, 0.0, 200);
+  vulcanSysFog->setLifeSpan(5, 2);
+  vulcanSysFog->setRadius(0.0, 20.0, 10);
+  vulcanSysFog->setRadius(.2, 50, 30);
+  vulcanSysFog->setRadius(1.0, 200, 100);
   vulcanSysFog->setMass (0.0, 1.0);
   vulcanSysFog->setColor(0, 1, 1, 1, .5);
-  vulcanSysFog->setColor(.5, .6, .6, .6, .5);
+  vulcanSysFog->setColor(.5, .6, .6, .6, .2);
   vulcanSysFog->setColor(1, .0, .0, .0, 0);
 
-  ParticleEmitter* vulcanEmitFog = new ParticleEmitter(Vector(0,1,0), .5, 400, 150);
+  ParticleEmitter* vulcanEmitFog = new ParticleEmitter(Vector(0,1,0), .5, 200, 150);
+  vulcanEmitFog->setEmissionVelocity(150, 50);
   vulcanEmitFog->setType(EMITTER_CUBE);
   vulcanEmitFog->setSize(40);
   vulcanEmitFog->setRelCoor(2460,105, 606);
   ParticleEngine::getInstance()->addConnection(vulcanEmitFog, vulcanSysFog);
+
+  ParticleSystem* vulcanSysStone = new ParticleSystem(1000, PARTICLE_SPRITE);
+  vulcanSysStone->setModel("models/vulcanic_stone.obj");
+  vulcanSysStone->setLifeSpan(6);
+  vulcanSysStone->setRadius(0.0, 10.0, 8);
+  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);
+
 
   // SYSTEM TRAILING THE PLAYER
@@ -516 +541 @@
   emitter->setRelCoor(Vector(-3,0,0));
 
-  Field* gravity = new Gravity();
-  gravity->setMagnitude(10.0);
-  gravity->setParent(this->localCamera->getTarget());
 
   // Add the Flow from the Emitter into the System