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

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

Files:

• objects/Radar.cc (modified) (1 diff)
• objects/Scene.cc (modified) (1 diff)
• objects/gametypes/Gametype.cc (modified) (2 diffs)
• objects/items/Engine.cc (modified) (1 diff)
• objects/worldentities/BlinkingBillboard.cc (modified) (1 diff)
• objects/worldentities/Camera.cc (modified) (1 diff)
• objects/worldentities/ControllableEntity.cc (modified) (1 diff)
• objects/worldentities/FadingBillboard.cc (modified) (1 diff)
• objects/worldentities/MovableEntity.cc (modified) (1 diff)
• objects/worldentities/triggers/Trigger.cc (modified) (1 diff)
• overlays/debug/DebugFPSText.cc (modified) (1 diff)
• overlays/debug/DebugRTRText.cc (modified) (1 diff)
• overlays/hud/HUDNavigation.cc (modified) (1 diff)
• overlays/hud/HUDSpeedBar.cc (modified) (1 diff)
• tools/Shader.cc (modified) (1 diff)

code/branches/objecthierarchy2/src/orxonox/objects/Radar.cc

@@ -99 +99 @@
     void Radar::tick(float dt)
     {
+        SUPER(Radar, tick, dt);
+
         if (this->focus_ != *(this->itFocus_))
         {

code/branches/objecthierarchy2/src/orxonox/objects/Scene.cc

@@ -167 +167 @@
     void Scene::tick(float dt)
     {
+        SUPER(Scene, tick, dt);
+
         if (!Core::showsGraphics())
         {

code/branches/objecthierarchy2/src/orxonox/objects/gametypes/Gametype.cc

@@ -62 +62 @@
     void Gametype::tick(float dt)
     {
+        SUPER(Gametype, tick, dt);
+
         if (this->bStartCountdownRunning_ && !this->bStarted_)
             this->startCountdown_ -= dt;
@@ -150 +152 @@
         if (this->spawnpoints_.size() > 0)
         {
-            srand(time(0));
-            rnd();
-
             unsigned int randomspawn = (unsigned int)rnd(this->spawnpoints_.size());
             unsigned int index = 0;

code/branches/objecthierarchy2/src/orxonox/objects/items/Engine.cc

@@ -144 +144 @@
             return;
 
+        SUPER(Engine, tick, dt);
+
         const Vector3& direction = this->getDirection();
         Vector3 velocity = this->ship_->getVelocity();

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_;

code/branches/objecthierarchy2/src/orxonox/overlays/debug/DebugFPSText.cc

@@ -49 +49 @@
     void DebugFPSText::tick(float dt)
     {
+        SUPER(DebugFPSText, tick, dt);
+
         float fps = GraphicsEngine::getInstance().getAverageFramesPerSecond();
         this->setCaption(convertToString(fps));

code/branches/objecthierarchy2/src/orxonox/overlays/debug/DebugRTRText.cc

@@ -49 +49 @@
     void DebugRTRText::tick(float dt)
     {
+        SUPER(DebugRTRText, tick, dt);
+
         float rtr = GraphicsEngine::getInstance().getAverageTickTime();
         this->setCaption(convertToString(rtr));

code/branches/objecthierarchy2/src/orxonox/overlays/hud/HUDNavigation.cc

@@ -129 +129 @@
     void HUDNavigation::tick(float dt)
     {
+        SUPER(HUDNavigation, tick, dt);
+
         if (!Radar::getInstance().getFocus())
         {

code/branches/objecthierarchy2/src/orxonox/overlays/hud/HUDSpeedBar.cc

@@ -52 +52 @@
     void HUDSpeedBar::tick(float dt)
     {
+        SUPER(HUDSpeedBar, tick, dt);
+
         if (this->owner_ && this->owner_->getEngine())
         {

code/branches/objecthierarchy2/src/orxonox/tools/Shader.cc

@@ -101 +101 @@
     void Shader::tick(float dt)
     {
+        SUPER(Shader, tick, dt);
+
         if (this->bLoadCompositor_ && !this->bViewportInitialized_ && this->scenemanager_ && this->scenemanager_->getCurrentViewport())
         {