Changeset 2361 for code/branches/objecthierarchy2/src/orxonox/objects/worldentities

Timestamp:

Dec 9, 2008, 2:07:24 AM (16 years ago)

Author:

landauf

Message:

• Fixed a problem with SUPER in combination with a pure-virtual base-function when called from a direct child of the base-class.

• Added random number generator initialization to Core (configurable)

• Fixed a bug in Convert.h

Location:

code/branches/objecthierarchy2/src/orxonox/objects/worldentities

Files:

• BlinkingBillboard.cc (modified) (1 diff)
• Camera.cc (modified) (1 diff)
• ControllableEntity.cc (modified) (1 diff)
• FadingBillboard.cc (modified) (1 diff)
• MovableEntity.cc (modified) (1 diff)
• triggers/Trigger.cc (modified) (1 diff)

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/BlinkingBillboard.cc

@@ -75 +75 @@
     void BlinkingBillboard::tick(float dt)
     {
+        SUPER(BlinkingBillboard, tick, dt);
+
         if (Core::isMaster() && this->isActive())
         {

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/Camera.cc

@@ -94 +94 @@
     void Camera::tick(float dt)
     {
+        SUPER(Camera, tick, dt);
 /*
         // this stuff here may need some adjustments

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/ControllableEntity.cc

@@ -232 +232 @@
         if (this->isActive())
         {
+            SUPER(ControllableEntity, tick, dt);
+
             this->velocity_ += (dt * this->acceleration_);
             this->node_->translate(dt * this->velocity_, Ogre::Node::TS_LOCAL);

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/FadingBillboard.cc

@@ -140 +140 @@
     void FadingBillboard::tick(float dt)
     {
+        SUPER(FadingBillboard, tick, dt);
+
         if (this->changedirection_ > 0 && (this->fadedColour_.a < this->getColour().a))
         {

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/MovableEntity.cc

@@ -74 +74 @@
         if (this->isActive())
         {
+            SUPER(MovableEntity, tick, dt);
+
             this->velocity_ += (dt * this->acceleration_);
             this->node_->translate(dt * this->velocity_);

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/triggers/Trigger.cc

@@ -106 +106 @@
     if (!this->BaseObject::isActive())
         return;
+
+    SUPER(Trigger, tick, dt);
 
     bool newTriggered = this->isTriggered() ^ this->bInvertMode_;