Changeset 1618

Timestamp:

Jun 22, 2008, 11:47:09 PM (16 years ago)

Author:

rgrieder

Message:

• moved colours of the SpeedBar to XML file
• enabled render window updating in inactive mode (under windows the render window didn't show anything if inactive)
• added row/column to ticpp error description (there are a lot more to do this, may modify the macro..)

Location:

code/branches/hud

Files:

• bin/levels/sample.oxw (modified) (1 diff)
• src/orxonox/GraphicsEngine.h (modified) (1 diff)
• src/orxonox/Orxonox.cc (modified) (1 diff)
• src/orxonox/overlays/OrxonoxOverlay.cc (modified) (2 diffs)
• src/orxonox/overlays/debug (added)
• src/orxonox/overlays/debug/HUDFPSText.cc (moved) (moved from code/branches/hud/src/orxonox/overlays/hud/HUDFPSText.cc)
• src/orxonox/overlays/debug/HUDFPSText.h (moved) (moved from code/branches/hud/src/orxonox/overlays/hud/HUDFPSText.h)
• src/orxonox/overlays/debug/HUDRTRText.cc (moved) (moved from code/branches/hud/src/orxonox/overlays/hud/HUDRTRText.cc)
• src/orxonox/overlays/debug/HUDRTRText.h (moved) (moved from code/branches/hud/src/orxonox/overlays/hud/HUDRTRText.h)
• src/orxonox/overlays/hud/HUDBar.cc (modified) (3 diffs)
• src/orxonox/overlays/hud/HUDBar.h (modified) (4 diffs)
• src/tinyxml/ticpp.cc (modified) (2 diffs)
• src/util/Convert.h (modified) (2 diffs)

code/branches/hud/bin/levels/sample.oxw

@@ -9 +9 @@
   </audio--> 
 
-<Ambient colourvalue="0.1, 0.1, 0.1" />
+<Ambient colourvalue="1.0, 1.0, 1.0" />
 <Skybox src="Orxonox/Starbox" />
 <SpaceShip camera="true" position="0,0,0" scale="10" yawpitchroll="0,0,0" mesh="assff.mesh" maxSpeed="500" maxSideAndBackSpeed="50" maxRotation="1.0" transAcc="200" rotAcc="3.0" transDamp="75" rotDamp="1.0" />

code/branches/hud/src/orxonox/GraphicsEngine.h

@@ -77 +77 @@
             void setAverageRTR(float rtr) { this->renderTimeRatio_ = rtr; }
 
+            void setWindowActivity(bool activity)
+            { if (this->renderWindow_) this->renderWindow_->setActive(activity); }
+
             void windowMoved       (Ogre::RenderWindow* rw);
             void windowResized     (Ogre::RenderWindow* rw);

code/branches/hud/src/orxonox/Orxonox.cc

@@ -501 +501 @@
         // This calls the WindowEventListener objects.
         Ogre::WindowEventUtilities::messagePump();
+        GraphicsEngine::getSingleton().setWindowActivity(true);
 
         // render

code/branches/hud/src/orxonox/overlays/OrxonoxOverlay.cc

@@ -111 +111 @@
                 this->overlay_->hide();
 
+            this->sizeCorrectionChanged();
             this->sizeChanged();
             this->positionChanged();
@@ -160 +161 @@
         {
             float angle = this->angle_.valueDegrees();
+            if (angle < 0.0)
+                angle = -angle;
+            angle -= 180.0 * (int)(angle / 180.0);
+
             float tempAspect;
-            if (angle > 89.0 && angle < 91.0 || angle > 269 && angle < 271)
+            if (angle > 89.0 && angle < 91.0)
                 tempAspect = 1.0 / this->windowAspectRatio_;
-            else if (angle > 359 && angle < 1 || angle > 179 && angle < 181)
+            else if (angle > 179 || angle < 1)
                 tempAspect = this->windowAspectRatio_;
             else

code/branches/hud/src/orxonox/overlays/hud/HUDBar.cc

@@ -43 +43 @@
 namespace orxonox
 {
+    CreateFactory(BarColour);
+
+    BarColour::BarColour()
+        : position_(0.0)
+    {
+        RegisterObject(BarColour);
+    }
+
+    void BarColour::XMLPort(Element& xmlElement, XMLPort::Mode mode)
+    {
+        BaseObject::XMLPort(xmlElement, mode);
+
+        XMLPortParam(BarColour, "colour", setColour, getColour, xmlElement, mode);
+        XMLPortParam(BarColour, "position", setPosition, getPosition, xmlElement, mode);
+    }
+
+
     unsigned int HUDBar::materialcount_s = 0;
 
@@ -87 +104 @@
             this->autoColour_ = true;
             this->right2Left_ = false; // default is left to right progress
-
-            this->addColour(0.7, ColourValue(0.2, 0.7, 0.2));
-            this->addColour(0.4, ColourValue(0.7, 0.5, 0.2));
-            this->addColour(0.1, ColourValue(0.7, 0.2, 0.2));
         }
 
         XMLPortParamLoadOnly(HUDBar, "value", setValue, xmlElement, mode);
+        XMLPortParam(HUDBar, "right2left", setRightToLeft, getRightToLeft, xmlElement, mode);
+        XMLPortObject(HUDBar, BarColour, "", addColour, getColour, xmlElement, mode, false, true);
     }
 
@@ -154 +169 @@
     }
 
-    void HUDBar::addColour(float value, const ColourValue& colour)
+    void HUDBar::addColour(BarColour* colour)
     {
-        value = clamp<float>(value, 0, 1);
-        this->colours_[value] = colour;
+        float value = clamp<float>(colour->getPosition(), 0.0, 1.0);
+        this->colours_[value] = colour->getColour();
+
+        this->barColours_.push_back(colour);
+    }
+
+    BarColour* HUDBar::getColour(unsigned int index)
+    {
+        if (index < this->barColours_.size())
+            return barColours_[index];
+        else
+            return 0;
     }
 

code/branches/hud/src/orxonox/overlays/hud/HUDBar.h

@@ -41 +41 @@
 namespace orxonox
 {
+    class _OrxonoxExport BarColour : public BaseObject
+    {
+    public:
+        BarColour();
+        ~BarColour() { }
+
+        void XMLPort(Element& xmlElement, XMLPort::Mode mode);
+
+        void setColour(const ColourValue& colour) { this->colour_ = colour; }
+        const ColourValue& getColour() const { return this->colour_; }
+
+        void setPosition(float pos) { this->position_ = pos; }
+        float getPosition() const    { return this->position_; }
+
+    private:
+        ColourValue colour_;
+        float position_;
+    };
+
     class _OrxonoxExport HUDBar : public OrxonoxOverlay
     {
@@ -50 +69 @@
 
         virtual void setValue(float value);
-        void addColour(float value, const ColourValue& colour);
         void clearColours();
 
@@ -61 +79 @@
 
     private:
+        void addColour(BarColour* colour);
+        BarColour* getColour(unsigned int index);
+
         bool right2Left_;
         bool autoColour_;                   //!< whether bar changes colour automatically
@@ -68 +89 @@
         Ogre::TextureUnitState* textureUnitState_;
         std::map<float, ColourValue> colours_;
+        std::vector<BarColour*> barColours_;
 
         float barWidth_s;

code/branches/hud/src/tinyxml/ticpp.cc

@@ -23 +23 @@
 */
 
+/*
+Modifications by the orxonox team:
+In function: void Document::Parse( const std::string& xml, bool throwIfParseError, TiXmlEncoding encoding )
+     change: Added row and column number to the error description.
+     author: Reto Grieder
+*/
+
 #ifdef TIXML_USE_TICPP
 
@@ -853 +860 @@
         if( throwIfParseError && m_tiXmlPointer->Error() )
         {
-                TICPPTHROW( "Error parsing xml: " << m_tiXmlPointer->ErrorDesc() );
+                TICPPTHROW( "Error parsing xml: " << m_tiXmlPointer->ErrorDesc()
+            << " In row " << m_tiXmlPointer->ErrorRow() << ", column " << m_tiXmlPointer->ErrorCol() << ".");
         }
 }

code/branches/hud/src/util/Convert.h

@@ -668 +668 @@
 
         SubString tokens(input.substr(opening_parenthesis, closing_parenthesis - opening_parenthesis), ",", SubString::WhiteSpaces, false, '\\', true, '"', true, '\0', '\0', true, '\0');
-        if (tokens.size() >= 4)
+        if (tokens.size() >= 3)
         {
             if (!ConvertValue(&(output->r), tokens[0]))
@@ -676 +676 @@
             if (!ConvertValue(&(output->b), tokens[2]))
                 return false;
-            if (!ConvertValue(&(output->a), tokens[3]))
-                return false;
+            if (tokens.size() >= 4)
+            {
+                if (!ConvertValue(&(output->a), tokens[3]))
+                    return false;
+            }
+            else
+                output->a = 1.0;
 
             return true;