Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Sep 26, 2009, 2:05:30 AM (15 years ago)
Author:
landauf
Message:

Added destroy() function to OrxonoxClass.
Removed destroy() functions from some subclasses.
Expanded Timer to accept Functors of other classes too.

Location:
code/branches/core5/src/orxonox
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • code/branches/core5/src/orxonox/graphics/ParticleSpawner.h

    r5738 r5791  
    4646            virtual void processEvent(Event& event);
    4747
    48             inline void destroy()
    49                 { this->bForceDestroy_ = true; this->stopParticleSpawner(); }
     48            inline void stop(bool bDestroy)
     49                { this->bForceDestroy_ = bDestroy; this->stopParticleSpawner(); }
    5050            inline void spawn()
    5151                { this->bSuppressStart_ = false; this->startParticleSpawner(); }

  • code/branches/core5/src/orxonox/overlays/InGameConsole.h

    r5738 r5791  
    5050
    5151        void initialise();
    52         void destroy();
    5352        void setConfigValues();
    5453

  • code/branches/core5/src/orxonox/worldentities/BigExplosion.cc

    r5747 r5791  
    333333    }
    334334
    335     void BigExplosion::destroy()
    336     {
    337         delete this;
    338     }
    339 
    340335/* TODO
    341336

  • code/branches/core5/src/orxonox/worldentities/BigExplosion.h

    r5738 r5791  
    5757            void checkStop();
    5858            void stop();
    59             void destroy();
    6059            void init();
    6160            void initZero();
    … …  
    9897            ParticleInterface*    explosionFire_;
    9998
    100             LODParticle::Value      LOD_;
    101             Timer<BigExplosion> destroyTimer_;
     99            LODParticle::Value    LOD_;
     100            Timer<BigExplosion>   destroyTimer_;
    102101    };
    103102}

  • code/branches/core5/src/orxonox/worldentities/ExplosionChunk.cc

    r5747 r5791  
    136136    }
    137137
    138     void ExplosionChunk::destroy()
    139     {
    140         delete this;
    141     }
    142 
    143138    void ExplosionChunk::tick(float dt)
    144139    {

  • code/branches/core5/src/orxonox/worldentities/ExplosionChunk.h

    r5738 r5791  
    5555            void checkStop();
    5656            void stop();
    57             void destroy();
    5857
    5958            bool                  bStop_;
    6059            ParticleInterface*    fire_;
    6160            ParticleInterface*    smoke_;
    62             LODParticle::Value      LOD_;
     61            LODParticle::Value    LOD_;
    6362            Timer<ExplosionChunk> destroyTimer_;
    6463    };
Note: See TracChangeset for help on using the changeset viewer.