Changeset 646 for code/branches/FICN/src/orxonox/particle

Timestamp:

Dec 19, 2007, 5:04:07 AM (17 years ago)

Author:

landauf

Message:

• added very bad collision detection (presentation hack )
• added explosions
• fixed bug in ParticleInterface (it tried to delete SceneManager)

AND:

• fixed one of the most amazing bugs ever! (the game crashed when I deleted an object through a timer-function. because the timer-functions is called by an iterator, the iterator indirectly delted its object. by overloading the (it++) operator, i was able to solve this problem)

Location:

code/branches/FICN/src/orxonox/particle

Files:

• ParticleInterface.cc (modified) (2 diffs)
• ParticleInterface.h (modified) (1 diff)

code/branches/FICN/src/orxonox/particle/ParticleInterface.cc

@@ -40 +40 @@
   ParticleInterface::~ParticleInterface(void)
   {
+std::cout << "blubiblub_1\n";
     sceneManager_->destroyParticleSystem(particleSystem_);
+std::cout << "blubiblub_2\n";
 
-    delete sceneNode_;
-    delete particleSystem_;
-    delete sceneManager_;
+//    delete sceneNode_;
+//    delete particleSystem_;
+//    delete sceneManager_;
   }
 
@@ -80 +82 @@
   }
 
-  void ParticleInterface::dettachFromSceneNode ( void )
+  void ParticleInterface::detachFromSceneNode ( void )
   {
     sceneNode_->detachObject(particleSystem_);

code/branches/FICN/src/orxonox/particle/ParticleInterface.h

@@ -22 +22 @@
         ~ParticleInterface( void );
         void addToSceneNode( Ogre::SceneNode* sceneNode );
-        void dettachFromSceneNode( void );
+        void detachFromSceneNode( void );
         Ogre::ParticleEmitter* getEmitter ( int emitterNr );
         void newEmitter ( void );