Changeset 10523 in orxonox.OLD

Timestamp:

Jan 30, 2007, 11:14:26 PM (17 years ago)

Author:

patrick

Message:

tried fixing the segfault on tardis, emitter mount point attach

Location:

trunk/src

Files:

• story_entities/game_world.cc (modified) (1 diff)
• world_entities/mount_point.cc (modified) (2 diffs)
• world_entities/particles/particle_system.cc (modified) (1 diff)
• world_entities/particles/particle_system.h (modified) (1 diff)

trunk/src/story_entities/game_world.cc

@@ -591 +591 @@
 {
   CameraMan* man = State::getCameraman();
-  man->getCurrentCam()->apply ();
-  man->getCurrentCam()->project ();
+  Camera* c = man->getCurrentCam();
+  if( c != NULL)
+  {
+    c->apply ();
+    c->project ();
+  }
   GraphicsEngine::storeMatrices();
 }

trunk/src/world_entities/mount_point.cc

@@ -22 +22 @@
 
 #include "weapons/weapon_slot.h"
+
+#include "particles/particle_system.h"
 
 #include "mount_point.h"
@@ -140 +142 @@
     PRINTF(0)("Got detail informations\n");
     this->_mount->loadParams( root);
+
+    if( this->_mount->isA(ParticleSystem::staticClassID()))
+    {
+      PRINTF(0)("got particle system. attaching it to mp\n");
+      dynamic_cast<ParticleSystem*>(this->_mount)->attachEmmittersTo(this, Vector(0,0,0));
+    }
   }
 }

trunk/src/world_entities/particles/particle_system.cc

@@ -281 +281 @@
 }
 
+
+/**
+ * attackes
+ * @param node
+ */
+void ParticleSystem::attachEmmittersTo(PNode* node, const Vector& offset)
+{
+  std::list<ParticleEmitter*>::iterator it = this->emitters.begin();
+  for( ; it != this->emitters.end(); it++)
+  {
+    //
+    (*it)->setParent(node);
+    (*it)->setRelCoor(offset);
+  }
+}
+
+
+
 /**
  * @brief does a Precaching, meaning, that the ParticleSystem(and its emitters) will be ticked force

trunk/src/world_entities/particles/particle_system.h

@@ -96 +96 @@
   void removeEmitter(ParticleEmitter* emitter);
 
+  void attachEmmittersTo(PNode* node, const Vector& offset);
+
   virtual void applyField(const Field* field);
   /** @brief this is an empty function, because the Physics are implemented in tick @param dt: useless here */