Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Sep 19, 2009, 11:17:51 PM (15 years ago)
Author:
rgrieder
Message:

Added Exception::handleMessage() (copy from Game::getExceptionMessage) function that returns the exception message (if retrievable) when catching with "…"
and adjusted some exception handlers.

Location:
code/trunk/src/orxonox/worldentities
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/orxonox/worldentities/BigExplosion.cc

    r5738 r5747  
    7474            catch (...)
    7575            {
    76                 COUT(1) << "Error: Couln't load particle effect in BigExplosion." << std::endl;
     76                COUT(1) << "Error: Couln't load particle effect in BigExplosion: " << Exception::handleMessage() << std::endl;
    7777                this->initZero();
    7878            }
     
    9797    void BigExplosion::init()
    9898    {
    99         Identifier* idDE1 = Class(MovableEntity);
    100         BaseObject* oDE1 = idDE1->fabricate(this);
    101         this->debrisEntity1_ = orxonox_cast<MovableEntity*>(oDE1);
    102 
    103         Identifier* idDE2 = Class(MovableEntity);
    104         BaseObject* oDE2 = idDE2->fabricate(this);
    105         this->debrisEntity2_ = orxonox_cast<MovableEntity*>(oDE2);
    106 
    107         Identifier* idDE3 = Class(MovableEntity);
    108         BaseObject* oDE3 = idDE3 ->fabricate(this);
    109         this->debrisEntity3_ = orxonox_cast<MovableEntity*>(oDE3);
    110 
    111         Identifier* idDE4 = Class(MovableEntity);
    112         BaseObject* oDE4 = idDE4->fabricate(this);
    113         this->debrisEntity4_ = orxonox_cast<MovableEntity*>(oDE4);
    114 
    115         Identifier* idD1 = Class(Model);
    116         BaseObject* oD1 = idD1->fabricate(this);
    117         this->debris1_ = orxonox_cast<Model*>(oD1);
    118 
    119         Identifier* idD2 = Class(Model);
    120         BaseObject* oD2 = idD2->fabricate(this);
    121         this->debris2_ = orxonox_cast<Model*>(oD2);
    122 
    123         Identifier* idD3 = Class(Model);
    124         BaseObject* oD3 = idD3->fabricate(this);
    125         this->debris3_ = orxonox_cast<Model*>(oD3);
    126 
    127         Identifier* idD4 = Class(Model);
    128         BaseObject* oD4 = idD4->fabricate(this);
    129         this->debris4_ = orxonox_cast<Model*>(oD4);
    130 
    131         Identifier* id6 = Class(StaticEntity);
    132         BaseObject* object4 = id6->fabricate(this);
    133         this->explosion_ = orxonox_cast<StaticEntity*>(object4);
     99        this->debrisEntity1_ = new MovableEntity(this);
     100        this->debrisEntity2_ = new MovableEntity(this);
     101        this->debrisEntity3_ = new MovableEntity(this);
     102        this->debrisEntity4_ = new MovableEntity(this);
     103
     104        this->debris1_ = new Model(this);
     105        this->debris2_ = new Model(this);
     106        this->debris3_ = new Model(this);
     107        this->debris4_ = new Model(this);
     108
     109        this->explosion_ = new StaticEntity(this);
    134110
    135111        this->debrisSmoke1_ = new ParticleInterface(this->getScene()->getSceneManager(), "Orxonox/smoke7", this->LOD_);
     
    200176        for(int i=0;i<10;i++)
    201177        {
    202             Identifier* idf1 = Class(Model);
    203             BaseObject* obj1 = idf1->fabricate(this);
    204             Model* part1 = orxonox_cast<Model*>(obj1);
    205 
    206 
    207             Identifier* idf2 = Class(Model);
    208             BaseObject* obj2 = idf2->fabricate(this);
    209             Model* part2 = orxonox_cast<Model*>(obj2);
    210 
    211             Identifier* idf3 = Class(MovableEntity);
    212             BaseObject* obj3 = idf3->fabricate(this);
    213             MovableEntity* partEntity1 = orxonox_cast<MovableEntity*>(obj3);
    214 
    215             Identifier* idf4 = Class(MovableEntity);
    216             BaseObject* obj4 = idf4->fabricate(this);
    217             MovableEntity* partEntity2 = orxonox_cast<MovableEntity*>(obj4);
     178            Model* part1 = new Model(this);
     179            Model* part2 = new Model(this);
     180
     181            MovableEntity* partEntity1 = new MovableEntity(this);
     182            MovableEntity* partEntity2 = new MovableEntity(this);
    218183
    219184            partEntity1->setVelocity(Vector3(rnd(-1, 1), rnd(-1, 1), rnd(-1, 1))*rnd(10,100));
     
    227192            part1->setMeshSource("SmallPart1.mesh");
    228193            part2->setMeshSource("SmallPart2.mesh");
    229 
    230194
    231195            partEntity1->attach(part1);
  • code/trunk/src/orxonox/worldentities/ExplosionChunk.cc

    r5738 r5747  
    6161            catch (...)
    6262            {
    63                 COUT(1) << "Error: Couln't load particle effect in ExplosionChunk." << std::endl;
     63                COUT(1) << "Error: Couln't load particle effect in ExplosionChunk: " << Exception::handleMessage() << std::endl;
    6464                this->fire_ = 0;
    6565                this->smoke_ = 0;
Note: See TracChangeset for help on using the changeset viewer.