Changeset 1243 for code/branches/ogre/src/orxonox/objects

Timestamp:

May 7, 2008, 12:11:25 AM (16 years ago)

Author:

rgrieder

Message:

• rearranged function calls in Orxonox.cc has yet to be looked at clearly, commented and COUTed
• works so far, but using 3 little hacks… in hacky classes

Location:

code/branches/ogre/src/orxonox/objects

Files:

• Explosion.cc (modified) (1 diff)
• SpaceShip.cc (modified) (4 diffs)
• WorldEntity.cc (modified) (2 diffs)

code/branches/ogre/src/orxonox/objects/Explosion.cc

@@ -47 +47 @@
     Explosion::Explosion(WorldEntity* owner)
     {
-        RegisterObject(Explosion);
-
         this->particle_ = 0;
         this->lifetime_ = 0.4;
+
+        RegisterObject(Explosion);
 
         if (owner)

code/branches/ogre/src/orxonox/objects/SpaceShip.cc

@@ -64 +64 @@
     SpaceShip::SpaceShip()
     {
-        RegisterObject(SpaceShip);
-        this->registerAllVariables();
-
         SpaceShip::instance_s = this;
-
-        this->setConfigValues();
 
         this->setMouseEventCallback_ = false;
@@ -139 +134 @@
 //         this->create();
 
+        RegisterObject(SpaceShip);
+        this->registerAllVariables();
+        this->setConfigValues();
 
         COUT(3) << "Info: SpaceShip was loaded" << std::endl;
@@ -166 +164 @@
     void SpaceShip::init()
     {
+        if (!setMouseEventCallback_)
+        {
+          InputManager::addMouseHandler(this, "SpaceShip");
+          setMouseEventCallback_ = true;
+        }
+
         // START CREATING THRUSTER
         this->tt_ = new ParticleInterface(GraphicsEngine::getSingleton().getSceneManager(),"twinthruster" + this->getName(),"Orxonox/engineglow");
@@ -428 +432 @@
     void SpaceShip::tick(float dt)
     {
-        if (!setMouseEventCallback_)
-        {
-          InputManager::addMouseHandler(this, "SpaceShip");
-          setMouseEventCallback_ = true;
-        }
-
         if (this->redNode_ && this->greenNode_)
         {

code/branches/ogre/src/orxonox/objects/WorldEntity.cc

@@ -47 +47 @@
     WorldEntity::WorldEntity()
     {
-        RegisterObject(WorldEntity);
-
-        //create();
-
         this->bStatic_ = true;
         this->velocity_ = Vector3(0, 0, 0);
@@ -57 +53 @@
         this->rotationRate_ = 0;
         this->momentum_ = 0;
+
+        RegisterObject(WorldEntity);
 
         if (GraphicsEngine::getSingleton().getSceneManager())