Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1736 for code/branches/core3


Ignore:
Timestamp:
Sep 7, 2008, 5:19:48 PM (16 years ago)
Author:
landauf
Message:

Super.h:

  • removed some commented lines
  • removed testfunction
Location:
code/branches/core3/src
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • code/branches/core3/src/core/BaseObject.h

    r1684 r1736  
    103103    };
    104104
    105     SUPER_FUNCTION(1, BaseObject, XMLPort, false);
    106     SUPER_FUNCTION(3, BaseObject, changedActivity, false);
    107     SUPER_FUNCTION(4, BaseObject, changedVisibility, false);
     105    SUPER_FUNCTION(0, BaseObject, XMLPort, false);
     106    SUPER_FUNCTION(2, BaseObject, changedActivity, false);
     107    SUPER_FUNCTION(3, BaseObject, changedVisibility, false);
    108108}
    109109

  • code/branches/core3/src/core/Namespace.cc

    r1684 r1736  
    6060    void Namespace::XMLPort(Element& xmlelement, XMLPort::Mode mode)
    6161    {
    62 //        BaseObject::XMLPort(xmlelement, mode);
    6362        SUPER(Namespace, XMLPort, xmlelement, mode);
    6463

  • code/branches/core3/src/core/Super.h

    r1687 r1736  
    105105                    if (!((ClassIdentifier<T>*)(*it))->superFunctionCaller_##functionname##_) \
    106106                    { \
    107                         COUT(0) << "Added SuperFunctionCaller for " << #functionname << ": " << ClassIdentifier<T>::getIdentifier()->getName() << " <- " << ((ClassIdentifier<T>*)(*it))->getName() << std::endl; \
     107                        COUT(5) << "Added SuperFunctionCaller for " << #functionname << ": " << ClassIdentifier<T>::getIdentifier()->getName() << " <- " << ((ClassIdentifier<T>*)(*it))->getName() << std::endl; \
    108108                        ((ClassIdentifier<T>*)(*it))->superFunctionCaller_##functionname##_ = new SuperFunctionClassCaller_##functionname <T>; \
    109109                    } \
    … …  
    218218
    219219    // (1/3) --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <--
    220     #define SUPER_testfunction(classname, functionname, ...) \
    221         SUPER_NOARGS(classname, functionname)
    222 
    223220    #define SUPER_XMLPort(classname, functionname, ...) \
    224221        SUPER_ARGS(classname, functionname, __VA_ARGS__)
    … …  
    421418
    422419        // (2/3) --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <--
    423         SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(0, testfunction, false)
     420        SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(0, XMLPort, true, Element& xmlelement, XMLPort::Mode mode)
     421            (xmlelement, mode)
     422        SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
     423
     424        SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(1, tick, true, float dt)
     425            (dt)
     426        SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
     427
     428        SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(2, changedActivity, false)
    424429            ()
    425430        SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
    426431
    427         SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(1, XMLPort, true, Element& xmlelement, XMLPort::Mode mode)
    428             (xmlelement, mode)
    429         SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
    430 
    431         SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(2, tick, true, float dt)
    432             (dt)
    433         SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
    434 
    435         SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(3, changedActivity, false)
    436             ()
    437         SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
    438 
    439         SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(4, changedVisibility, false)
     432        SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(3, changedVisibility, false)
    440433            ()
    441434        SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
    … …  
    482475
    483476    // (3/3) --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <--
    484     SUPER_INTRUSIVE_DECLARATION(testfunction);
    485477    SUPER_INTRUSIVE_DECLARATION(XMLPort);
    486478    SUPER_INTRUSIVE_DECLARATION(tick);

  • code/branches/core3/src/orxonox/objects/Ambient.cc

    r1684 r1736  
    8989    void Ambient::XMLPort(Element& xmlelement, XMLPort::Mode mode)
    9090    {
    91 //        BaseObject::XMLPort(xmlelement, mode);
    9291        SUPER(Ambient, XMLPort, xmlelement, mode);
    9392

  • code/branches/core3/src/orxonox/objects/BillboardProjectile.cc

    r1685 r1736  
    4848            this->scale(0.5);
    4949        }
    50 /*
    51         std::cout << "a:\n";
    52         SUPER(BillboardProjectile, testfunction);
    53         std::cout << "b:\n";
    54 */
    5550    }
    5651
    … …  
    6863    void BillboardProjectile::changedVisibility()
    6964    {
    70 //        Projectile::changedVisibility();
    7165        SUPER(BillboardProjectile, changedVisibility);
    7266        this->billboard_.setVisible(this->isVisible());
    7367    }
    74 
    75     void BillboardProjectile::testfunction() { SUPER(BillboardProjectile, testfunction); std::cout << "2 -> " << std::endl; }
    7668}

  • code/branches/core3/src/orxonox/objects/BillboardProjectile.h

    r1685 r1736  
    4646            virtual void setColour(const ColourValue& colour);
    4747            virtual void changedVisibility();
    48             virtual void testfunction();
    4948
    5049        private:

  • code/branches/core3/src/orxonox/objects/Model.cc

    r1684 r1736  
    6666    void Model::XMLPort(Element& xmlelement, XMLPort::Mode mode)
    6767    {
    68 //        WorldEntity::XMLPort(xmlelement, mode);
    6968        SUPER(Model, XMLPort, xmlelement, mode);
    7069
    … …  
    7372        Model::create();
    7473    }
    75 /*
    76     void Model::tick(float dt)
    77     {
    78         float i = dt * rnd(-100, 100);
    79         float j = dt * rnd(-100, 100);
    80         float k = dt * rnd(-100, 100);
    8174
    82 //        WorldEntity::tick(dt);
    83         SUPER(Model, tick, dt);
    84 
    85         this->setPosition(this->getPosition().x + i, this->getPosition().y + j, this->getPosition().z + k);
    86     }
    87 */
    8875    bool Model::create(){
    8976      if(!WorldEntity::create())
    … …  
    10794    void Model::changedVisibility()
    10895    {
    109 //        WorldEntity::changedVisibility();
    11096        SUPER(Model, changedVisibility);
    11197        this->mesh_.setVisible(this->isVisible());

  • code/branches/core3/src/orxonox/objects/Model.h

    r1684 r1736  
    4444            virtual ~Model();
    4545            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    46 //            virtual void tick(float dt);
    4746            virtual void changedVisibility();
    4847            inline void setMesh(const std::string& meshname)

  • code/branches/core3/src/orxonox/objects/ParticleProjectile.cc

    r1685 r1736  
    5555
    5656        this->setConfigValues();
    57 /*
    58         std::cout << "c:\n";
    59         SUPER(ParticleProjectile, testfunction);
    60         std::cout << "d:\n";
    61 
    62         std::cout << "e:\n";
    63         this->testfunction();
    64         std::cout << "f:\n";
    65 */
    6657    }
    6758
    … …  
    7970    void ParticleProjectile::changedVisibility()
    8071    {
    81 //        BillboardProjectile::changedVisibility();
    8272        SUPER(ParticleProjectile, changedVisibility);
    8373        this->particles_->setEnabled(this->isVisible());
    8474    }
    85 
    86     void ParticleProjectile::testfunction() { SUPER(ParticleProjectile, testfunction); std::cout << "3 -> " << std::endl; }
    8775}

  • code/branches/core3/src/orxonox/objects/ParticleProjectile.h

    r1685 r1736  
    4444            virtual ~ParticleProjectile();
    4545            virtual void changedVisibility();
    46             virtual void testfunction();
    4746            void setConfigValues();
    4847

  • code/branches/core3/src/orxonox/objects/Projectile.cc

    r1684 r1736  
    8686    void Projectile::tick(float dt)
    8787    {
    88 //        WorldEntity::tick(dt);
    8988        SUPER(Projectile, tick, dt);
    9089
    … …  
    122121        delete this;
    123122    }
    124 
    125     void Projectile::testfunction() { std::cout << "1 -> " << std::endl; }
    126123}

  • code/branches/core3/src/orxonox/objects/Projectile.h

    r1685 r1736  
    3232#include "OrxonoxPrereqs.h"
    3333
    34 #include "core/Super.h"
    3534#include "WorldEntity.h"
    3635#include "tools/Timer.h"
    … …  
    4645            void destroyObject();
    4746            virtual void tick(float dt);
    48             virtual void testfunction();
    4947
    5048            static float getSpeed()
    … …  
    6664            Timer<Projectile> destroyTimer_;
    6765    };
    68 
    69     SUPER_FUNCTION(0, Projectile, testfunction, false);
    7066}
    7167

  • code/branches/core3/src/orxonox/objects/RotatingProjectile.cc

    r1684 r1736  
    8787        }
    8888
    89         Projectile::tick(dt);
    90 //        SUPER(RotatingProjectile, tick, dt);
     89        SUPER(RotatingProjectile, tick, dt);
    9190    }
    9291
    9392    void RotatingProjectile::changedVisibility()
    9493    {
    95 //        BillboardProjectile::changedVisibility();
    9694        SUPER(RotatingProjectile, changedVisibility);
    9795        this->rotatingBillboard1_.setVisible(this->isVisible());

  • code/branches/core3/src/orxonox/objects/Skybox.cc

    r1684 r1736  
    6767    void Skybox::XMLPort(Element& xmlelement, XMLPort::Mode mode)
    6868    {
    69 //        BaseObject::XMLPort(xmlelement, mode);
    7069        SUPER(Skybox, XMLPort, xmlelement, mode);
    7170
    … …  
    8786    void Skybox::changedVisibility()
    8887    {
    89 //        BaseObject::changedVisibility();
    9088        SUPER(Skybox, changedVisibility);
    9189        GraphicsEngine::getSingleton().getSceneManager()->setSkyBox(this->isVisible(), this->skyboxSrc_);

  • code/branches/core3/src/orxonox/objects/SpaceShip.cc

    r1684 r1736  
    259259    void SpaceShip::changedVisibility()
    260260    {
    261 //        Model::changedVisibility();
    262261        SUPER(SpaceShip, changedVisibility);
    263262
    … …  
    272271    void SpaceShip::changedActivity()
    273272    {
    274 //        Model::changedActivity();
    275273        SUPER(SpaceShip, changedActivity);
    276274
    … …  
    347345    void SpaceShip::XMLPort(Element& xmlelement, XMLPort::Mode mode)
    348346    {
    349 //        Model::XMLPort(xmlelement, mode);
    350347        SUPER(SpaceShip, XMLPort, xmlelement, mode);
    351348
    … …  
    485482
    486483
    487 //        WorldEntity::tick(dt);
    488484        SUPER(SpaceShip, tick, dt);
    489485

  • code/branches/core3/src/orxonox/objects/SpaceShipAI.cc

    r1684 r1736  
    7878    void SpaceShipAI::XMLPort(Element& xmlelement, XMLPort::Mode mode)
    7979    {
    80 //        SpaceShip::XMLPort(xmlelement, mode);
    8180        SUPER(SpaceShipAI, XMLPort, xmlelement, mode);
    8281
    … …  
    230229            this->doFire();
    231230
    232 //        SpaceShip::tick(dt);
    233231        SUPER(SpaceShipAI, tick, dt);
    234232    }

  • code/branches/core3/src/orxonox/objects/Tickable.h

    r1684 r1736  
    6363    };
    6464
    65     SUPER_FUNCTION(2, Tickable, tick, true);
     65    SUPER_FUNCTION(1, Tickable, tick, true);
    6666
    6767    //! The Tickable interface provides a tick(dt) function, that gets called every frame.

  • code/branches/core3/src/orxonox/objects/WorldEntity.cc

    r1684 r1736  
    110110    void WorldEntity::XMLPort(Element& xmlelement, XMLPort::Mode mode)
    111111    {
    112 //        BaseObject::XMLPort(xmlelement, mode);
    113112        SUPER(WorldEntity, XMLPort, xmlelement, mode);
    114113
Note: See TracChangeset for help on using the changeset viewer.