Context Navigation

Changeset 646 for code/branches

Timestamp:

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

Author:

landauf

Message:

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

Files:

r643	r646
43	43	objects/weapon_system/bullet_manager.cc
44	44	objects/weapon_system/weapon_station.cc
	45	objects/Explosion.cc
45	46	)
46	47	ELSE(WIN32)

-                      r496
+                      r646
             /**
+                @brief Overloading of the it++ operator: Iterator points to the next object in the list.
+                @return The Iterator itself
+            */
+            Iterator<T> operator++(int i)
+            {
+                Iterator<T> copy = *this;
+                this->element_ = this->element_->next_;
+                return copy;
+            }
+            /**
                 @brief Overloading of the --it operator: Iterator points to the previous object in the list.
                 @return The Iterator itself
 …
                 this->element_ = this->element_->prev_;
                 return *this;
+            }
+            /**
+                @brief Overloading of the it-- operator: Iterator points to the previous object in the list.
+                @return The Iterator itself
+            */
+            Iterator<T> operator--(int i)
+            {
+                Iterator<T> copy = *this;
+                this->element_ = this->element_->prev_;
+                return copy;
+            }

r643	r646
27	27	weapon_system/bullet_manager.cc
28	28	weapon_system/weapon_station.cc
	29	Explosion.cc
29	30	)
30	31

-                      r631
+                      r646
         create();
+    }
     bool Model::create(){
       if(meshSrc_.compare("")!=0){
 …
       return true;
+    }
     void Model::registerAllVariables(){
       registerVar(&meshSrc_, meshSrc_.length()+1, network::STRING);

r630	r646
12	12	public:
13	13	Model();
14		~Model();
	14	virtual ~Model();
15	15	virtual void loadParams(TiXmlElement* xmlElem);
16	16	bool create();

-                      r644
+                      r646
 #include "Projectile.h"
 #include "../core/CoreIncludes.h"
+#include "Explosion.h"
+#include "Model.h"
 namespace orxonox
 …
+    }
+    void Projectile::tick(float dt)
+    {
+        WorldEntity::tick(dt);
+        float radius;
+        for (Iterator<Model> it = ObjectList<Model>::start(); it; ++it)
+        {
+            if ((*it) != this->owner_)
+            {
+                radius = it->getScale().x * 3.0;
+                if (this->getPosition().squaredDistance(it->getPosition()) <= (radius*radius))
+                {
+                    Explosion* eplosion = new Explosion(this);
+                    delete this;
+                    return;
+                }
+            }
+        }
+    }
     void Projectile::destroyObject()
+    {

-                      r643
+                      r646
         public:
             Projectile(SpaceShip* owner = 0);
             ~Projectile();
+            virtual ~Projectile();
             void destroyObject();
+            virtual void tick(float dt);
         private:

r644	r646
46	46
47	47	SetConfigValue(bInvertMouse_, true);
48		SetConfigValue(reloadTime_, 0.1);
	48	SetConfigValue(reloadTime_, 0.125);
49	49
50	50	this->setMouseEventCallback_ = false;

-                      r640
+                      r646
+            {
                 // Iterate through all Tickables and call their tick(dt) function
                 for (Iterator<Tickable> it = ObjectList<Tickable>::start(); it; ++it)
                     it->tick(evt.timeSinceLastFrame);
+                for (Iterator<Tickable> it = ObjectList<Tickable>::start(); it; )
+                    (it++)->tick(evt.timeSinceLastFrame);
                 return FrameListener::frameStarted(evt);

r640	r646
136	136	{
137	137	// Iterate through all Timers
138		for (Iterator<TimerBase> it = ObjectList<TimerBase>::start(); it; ~~++it~~)
	138	for (Iterator<TimerBase> it = ObjectList<TimerBase>::start(); it; )
139	139	{
140	140	if (it->isActive())
…	…
151	151	it->stopTimer(); // Stop the timer if we don't want to loop
152	152
153		it->run();
	153	(it++)->run();
154	154	}
	155	else
	156	++it;
155	157	}
	158	else
	159	++it;
156	160	}
157	161

r618	r646
40	40	ParticleInterface::~ParticleInterface(void)
41	41	{
	42	std::cout << "blubiblub_1\n";
42	43	sceneManager_->destroyParticleSystem(particleSystem_);
	44	std::cout << "blubiblub_2\n";
43	45
44		delete sceneNode_;
45		delete particleSystem_;
46		delete sceneManager_;
	46	// delete sceneNode_;
	47	// delete particleSystem_;
	48	// delete sceneManager_;
47	49	}
48	50
…	…
80	82	}
81	83
82		void ParticleInterface::dettachFromSceneNode ( void )
	84	void ParticleInterface::detachFromSceneNode ( void )
83	85	{
84	86	sceneNode_->detachObject(particleSystem_);

r621	r646
22	22	~ParticleInterface( void );
23	23	void addToSceneNode( Ogre::SceneNode* sceneNode );
24		void dettachFromSceneNode( void );
	24	void detachFromSceneNode( void );
25	25	Ogre::ParticleEmitter* getEmitter ( int emitterNr );
26	26	void newEmitter ( void );

Note: See TracChangeset for help on using the changeset viewer.