Changeset 1684 for code/branches/core3/src/orxonox/objects/ParticleProjectile.cc

Timestamp:

Aug 31, 2008, 4:32:31 AM (16 years ago)

Author:

landauf

Message:

• packed all super-function-related code into a bunch of macros and commented the code.
• added tick, XMLPort, changedActivity and changedVisibility as super-functions

File:

• code/branches/core3/src/orxonox/objects/ParticleProjectile.cc (modified) (4 diffs)

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

@@ -33 +33 @@
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
-//#include "util/FastDelegate.h"
-//using namespace fastdelegate;
 
 namespace orxonox
 {
     CreateFactory(ParticleProjectile);
-
-    struct FunctionPointerViewer
-    {
-        void* ptr1_;
-        void* ptr2_;
-
-        void view()
-        {
-            std::cout << ptr1_ << "." << ptr2_ << std::endl;
-        }
-    };
-
-    union FunctionPointerViewer1
-    {
-        FunctionPointerViewer viewer_;
-        void (Projectile::*function_) ();
-    };
-
-    union FunctionPointerViewer2
-    {
-        FunctionPointerViewer viewer_;
-        void (BillboardProjectile::*function_) ();
-    };
-
-    union FunctionPointerViewer3
-    {
-        FunctionPointerViewer viewer_;
-        void (ParticleProjectile::*function_) ();
-    };
 
     ParticleProjectile::ParticleProjectile(SpaceShip* owner) : BillboardProjectile(owner)
@@ -86 +55 @@
 
         this->setConfigValues();
-/*
-        FunctionPointerViewer1 fpw1;
-        fpw1.function_ = &Projectile::testfunction;
-        FunctionPointerViewer2 fpw2;
-        fpw2.function_ = &BillboardProjectile::testfunction;
-        FunctionPointerViewer3 fpw3;
-        fpw3.function_ = &ParticleProjectile::testfunction;
 
-        std::cout << sizeof(void (Projectile::*) ()) << std::endl;
-        fpw1.viewer_.view();
-        fpw2.viewer_.view();
-        fpw3.viewer_.view();
-
-        {
-            std::cout << "1:" << std::endl;
-            FastDelegate0<> delegate1(this, &ParticleProjectile::testfunction);
-            delegate1();
-            FastDelegate0<> delegate2((BillboardProjectile*)this, &BillboardProjectile::testfunction);
-            delegate2();
-            FastDelegate0<> delegate3(this, &Projectile::testfunction);
-            delegate3();
-        }
-        {
-            std::cout << "2:" << std::endl;
-            BillboardProjectile temp;
-//            FastDelegate0<> delegate1(&temp, &ParticleProjectile::testfunction);
-//            delegate1();
-            FastDelegate0<> delegate2(&temp, &BillboardProjectile::testfunction);
-            delegate2();
-            FastDelegate0<> delegate3(&temp, &Projectile::testfunction);
-            delegate3();
-        }
-        std::cout << "done" << std::endl;
-
-        std::cout << "0:" << std::endl;
-        this->Projectile::testfunction();
-        this->BillboardProjectile::testfunction();
-        this->ParticleProjectile::testfunction();
-        this->testfunction();
-
-        std::cout << "1:" << std::endl;
-        (this->*fpw1.function_)();
-        std::cout << "2:" << std::endl;
-        (this->*fpw2.function_)();
-        std::cout << "3:" << std::endl;
-        (this->*fpw3.function_)();
-        std::cout << "done" << std::endl;
-*/
         std::cout << "c:\n";
         SUPER(ParticleProjectile, testfunction);
@@ -141 +63 @@
         this->testfunction();
         std::cout << "f:\n";
-
-//        (*((ClassIdentifier<SuperDummy>*)this->getIdentifier())->superFunctionCaller_testfunction_)(this);
     }
 
@@ -158 +78 @@
     void ParticleProjectile::changedVisibility()
     {
-        BillboardProjectile::changedVisibility();
+//        BillboardProjectile::changedVisibility();
+        SUPER(ParticleProjectile, changedVisibility);
         this->particles_->setEnabled(this->isVisible());
     }