Changeset 11745 for code/branches/Presentation_HS17_merge/src/modules

Timestamp:

Feb 15, 2018, 12:11:04 AM (6 years ago)

Author:

landauf

Message:

[CampaignMap_HS17] some cleanup

Location:

code/branches/Presentation_HS17_merge/src/modules/overlays/hud

Files:

• StoryModeHUD.cc (modified) (5 diffs)
• StoryModeHUD.h (modified) (1 diff)

code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.cc

@@ -66 +66 @@
     {
         RegisterObject(StoryModeHUD);
+
+        this->textSize_ = 1.0;
     }
 
     // Destructor of the StoryMode HUD
     StoryModeHUD::~StoryModeHUD()
-    {}
+    {
+        for(Ogre::TextAreaOverlayElement* text : texts)
+            Ogre::OverlayManager::getSingleton().destroyOverlayElement(text);
+    }
 
     // Functions of the StoryMode HUD
@@ -92 +97 @@
         CameraManager::getInstance().getActiveCamera()->setOrientation(Vector3::UNIT_X, Degree(-30));
 
-        int i = 0;
         for(NameableStaticEntity* planet : ObjectList<NameableStaticEntity>()){
 
@@ -100 +104 @@
 
             texts.push_back(text);
-            texts[i]->setDimensions(xScale, yScale);
+            text->setDimensions(xScale, yScale);
 
             //font name of the text needs to be set here, not in the xml setter function
-            texts[i]->setFontName(this->fontName_);
-            texts[i]->setCharHeight(this->textSize_ * yScale);
+            text->setFontName(this->fontName_);
+            text->setCharHeight(this->textSize_ * yScale);
 
             //set text
-            texts[i]->setCaption(planet->getLevelName());
+            text->setCaption(planet->getLevelName());
 
-            texts[i]->hide();
+            text->hide();
         
-            this->background_->addChild(texts[i]);
-            i++;
+            this->background_->addChild(text);
         }
     }
@@ -170 +173 @@
         const Matrix4& camTransform = cam->getOgreCamera()->getProjectionMatrix() * cam->getOgreCamera()->getViewMatrix();
 
-        int i = 0;
+        size_t i = 0;
         for(NameableStaticEntity* planet : ObjectList<NameableStaticEntity>()){
+            if (i >= texts.size()) {
+                break;
+            }
+            Ogre::TextAreaOverlayElement* text = texts[i];
+            i++;
 
             // Transform to screen coordinates
@@ -180 +188 @@
                     
                 // Position text
-                texts[i]->setLeft((pos.x+1)/2); // The (0,0) Coordinate is in the upper left corner.
-                texts[i]->setTop((-pos.y+1)/2);  // With those two calculations we set the desired positions
+                text->setLeft((pos.x+1)/2); // The (0,0) Coordinate is in the upper left corner.
+                text->setTop((-pos.y+1)/2);  // With those two calculations we set the desired positions
 
                 // Make sure the overlays are shown
-                texts[i]->show();
+                text->show();
             }
-            i++;
-
         }
     }

code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.h

@@ -50 +50 @@
             virtual void tick(float dt) override;
 
+        private:
+            void initialize();
 
-        private:
-            std::vector<Ogre::TextAreaOverlayElement*> texts;
-            void initialize();
-            virtual void setTextSize(float size);
-            virtual float getTextSize() const;
+            void setTextSize(float size);
+            float getTextSize() const;
 
-            virtual void setFont(const std::string& font);
+            void setFont(const std::string& font);
             const std::string& getFont() const;
 
+            std::vector<Ogre::TextAreaOverlayElement*> texts;
             std::string fontName_;
             float textSize_;