Changeset 11584 for code/branches/CampaignMap_HS17/src

Timestamp:

Nov 20, 2017, 5:01:46 PM (7 years ago)

Author:

boltn

Message:

Planeten koennen nun mittels objectlist beschrieben werden. todo: textart und groesse mittels xml einstellbar machen

Location:

code/branches/CampaignMap_HS17/src/modules/overlays/hud

Files:

• StoryModeHUD.cc (modified) (7 diffs)
• StoryModeHUD.h (modified) (2 diffs)

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

@@ -44 +44 @@
 #include <typeinfo>
 
-#include "util/Math.h"
 #include "util/Convert.h"
 #include "core/command/ConsoleCommandIncludes.h"
@@ -50 +49 @@
 #include "core/XMLPort.h"
 #include "CameraManager.h"
-#include "Scene.h"
-#include "Radar.h"
 #include "graphics/Camera.h"
-#include "controllers/HumanController.h"
 #include "worldentities/pawns/Pawn.h"
 #include "worldentities/WorldEntity.h"
@@ -59 +55 @@
 #include "tools/TextureGenerator.h"
 
+#include "worldentities/StoryModePlanet.h"
 
 namespace orxonox
@@ -68 +65 @@
     {
         RegisterObject(StoryModeHUD);
-
-        // Set default values
-        //this->setFont("Monofur");
-        //this->setTextSize(0.5f);
-
-        // Scales used for dimensions and text size
-        float xScale = this->getActualSize().x;
-        float yScale = this->getActualSize().y;
-
-        // Create text
-        text_ = static_cast<Ogre::TextAreaOverlayElement*>( Ogre::OverlayManager::getSingleton()
-                .createOverlayElement("TextArea", "StoryModeHUD_navText_" + getUniqueNumberString()));
-        //text->setFontName(this->fontName_);
-        //text->setCharHeight(this->textSize_ * yScale);
-        text_->setDimensions(xScale, yScale);
-
-        text_->hide();
-        
-        this->background_->addChild(text_);
+        this->initialize();
     }
 
-    // TODO:
     // Destructor of the StoryMode HUD
     StoryModeHUD::~StoryModeHUD()
     {
-
+        for(Ogre::TextAreaOverlayElement* text : texts)
+          delete text;
     }
 
@@ -107 +86 @@
     }
 
+    void StoryModeHUD::initialize(){
+        // Scales used for dimensions and text size
+        float xScale = this->getActualSize().x;
+        float yScale = this->getActualSize().y;
+
+        
+        for(unsigned int i = 0; i < ObjectList<StoryModePlanet>().size(); i++){
+
+            Ogre::TextAreaOverlayElement* text = static_cast<Ogre::TextAreaOverlayElement*>( Ogre::OverlayManager::getSingleton()
+                    .createOverlayElement("TextArea", "StoryModeHUD_navText_" + getUniqueNumberString()));
+
+            texts.push_back(text);
+            //text->setFontName(this->fontName_);
+            //text->setCharHeight(this->textSize_ * yScale);
+            texts[i]->setDimensions(xScale, yScale);
+
+            texts[i]->hide();
+        
+            this->background_->addChild(texts[i]);
+        }
+        //this->setFont("Monofur");
+        //this->setTextSize("0.5f");
+    }
+
     // Set the Font size of the Text.
     void StoryModeHUD::setFont(const std::string& font)
@@ -117 +120 @@
         }
         this->fontName_ = font;
-        if(text_ != nullptr)
-            text_->setFontName(this->fontName_);
+        for(Ogre::TextAreaOverlayElement* text : texts)
+            if(text != nullptr)
+                text->setFontName(this->fontName_);
     }
    
@@ -158 +162 @@
         const Matrix4& camTransform = cam->getOgreCamera()->getProjectionMatrix() * cam->getOgreCamera()->getViewMatrix();
 
+        int i = 0;
+        for(StoryModePlanet* planet : ObjectList<StoryModePlanet>()){
 
-        //display name next to cursor
-        //TODO: Planet.getName()
-        text_->setCaption("Hello Muthafuckin' World!");
+            //display name next to cursor
+            texts[i]->setCaption(planet->getLevelName());
 
-        // Transform to screen coordinates
-        Vector3 pos = camTransform * Vector3(0,0,0); // planet->getRVWorldPosition();
+            // Transform to screen coordinates
+            Vector3 pos = camTransform * planet->getWorldPosition();
 
-        // If you fly passed the description, it gets out of sight
-        if (pos.z > 1.0)
-            return;
-       
-        // Position text
-        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
+            // If you fly passed the description, it gets out of sight
+            if (!(pos.z > 1.0)){
+                    
+                // 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
 
-        // Make sure the overlays are shown
-        text_->show();
+                // Make sure the overlays are shown
+                texts[i]->show();
+            }
+            i++;
 
+        }
     }
-
-    //void StoryModeHUD::addObject()
-
-    /*void StoryModeHUD::removeObject(RadarViewable* viewable)
-    {
-        Ogre::OverlayManager::getSingleton().destroyOverlayElement(it->second.text_);
-    }*/
 }

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

@@ -52 +52 @@
 
         private:
-            Ogre::TextAreaOverlayElement* text_;
-     
+            std::vector<Ogre::TextAreaOverlayElement*> texts;
+            void initialize();
             void setTextSize(float size);
             float getTextSize() const;
@@ -60 +60 @@
             const std::string& getFont() const;
 
-    
             std::string fontName_;
             float textSize_;