Changeset 8554 in orxonox.OLD for branches

Timestamp:

Jun 17, 2006, 9:45:53 AM (18 years ago)

Author:

bensch

Message:

style should be loadable through strings

Location:

branches/gui/src/lib/gui/gl

Files:

• glgui_style.cc (modified) (11 diffs)
• glgui_style.h (modified) (2 diffs)

branches/gui/src/lib/gui/gl/glgui_style.cc

@@ -68 +68 @@
   {}
 
+
   void GLGuiStyle::setBorderLeft(float value)
   {
@@ -79 +80 @@
   }
 
-  void GLGuiStyle::setBorderLeftS(float value, const std::string& state)
-  {
+  void GLGuiStyle::setBorderLeftS(float value, const std::string& stateName)
+  {
+    OrxGui::State state;
+    if (getState(stateName, &state))
+      this->setBorderLeft(value, state);
+    else
+      this->setBorderLeft(value);
   }
 
@@ -95 +101 @@
   }
 
-  void GLGuiStyle::setBorderRightS(float value, const std::string& state)
-  {}
+  void GLGuiStyle::setBorderRightS(float value, const std::string& stateName)
+  {
+    OrxGui::State state;
+    if (getState(stateName, &state))
+      this->setBorderRight(value, state);
+    else
+      this->setBorderRight(value);
+  }
 
 
@@ -110 +122 @@
   }
 
-  void GLGuiStyle::setBorderTopS(float value, const std::string& state)
-  {}
+  void GLGuiStyle::setBorderTopS(float value, const std::string& stateName)
+  {
+    OrxGui::State state;
+    if (getState(stateName, &state))
+      this->setBorderTop(value, state);
+    else
+      this->setBorderTop(value);
+  }
 
 
@@ -125 +143 @@
   }
 
-  void GLGuiStyle::setBorderBottomS(float value, const std::string& state)
-  {}
+  void GLGuiStyle::setBorderBottomS(float value, const std::string& stateName)
+  {
+        OrxGui::State state;
+  if (getState(stateName, &state))
+    this->setBorderBottom(value, state);
+  else
+    this->setBorderBottom(value);
+  }
 
 
@@ -140 +164 @@
   }
 
-  void GLGuiStyle::setTextSizeS(float value, const std::string& state)
-  {}
+  void GLGuiStyle::setTextSizeS(float value, const std::string& stateName)
+  {
+    OrxGui::State state;
+    if (getState(stateName, &state))
+      this->setTextSize(value, state);
+    else
+      this->setTextSize(value);
+  }
 
 
@@ -155 +185 @@
   }
 
-  void GLGuiStyle::setBackgroundColorS(float r, float g, float b, float a, const std::string& state)
-  {}
+  void GLGuiStyle::setBackgroundColorS(float r, float g, float b, float a, const std::string& stateName)
+  {
+    OrxGui::State state;
+    if (getState(stateName, &state))
+      this->setBackgroundColor(Color(r,g,b,a), state);
+    else
+      this->setBackgroundColor(Color(r,g,b,a));
+  }
 
 
@@ -170 +206 @@
   }
 
-  void GLGuiStyle::setBackgroundTexture(const std::string& textureName, const std::string& state)
-  {}
+  void GLGuiStyle::setBackgroundTexture(const std::string& textureName, const std::string& stateName)
+  {
+        OrxGui::State state;
+  if (getState(stateName, &state))
+    ; /// FIXME this->setBackgroundTexture(textureName, state);
+  else
+      ; ///    this->setBackgroundTexture(textureName);
+  }
 
 
@@ -185 +227 @@
   }
 
-  void GLGuiStyle::setForegroundColorS(float r, float g, float b, float a, const std::string& state)
-  {}
+  void GLGuiStyle::setForegroundColorS(float r, float g, float b, float a, const std::string& stateName)
+  {
+    OrxGui::State state;
+    if (getState(stateName, &state))
+      this->setForegroundColor(Color(r,g,b,a), state);
+    else
+      this->setForegroundColor(Color(r,g,b,a));
+  }
 
 
@@ -196 +244 @@
 
   void GLGuiStyle::setFeaturePosition(const std::string& featurePosition)
-  {}
-
+  {
+    for (unsigned int i = 0; i < 4; ++i)
+    {
+      if (featurePosition == FeaturePositionString[i])
+      {
+        this->setFeaturePosition((FeaturePosition)i);
+      }
+    }
+  }
 
   void GLGuiStyle::setFont(Font* font)
@@ -220 +275 @@
   }
 
+
+
+  bool GLGuiStyle::getState(const std::string& stateName, OrxGui::State* state)
+  {
+    for (unsigned int i = 0; i < GLGUI_STATE_COUNT; ++i)
+      if (stateName == OrxGui::StateString[i])
+    {
+      *state = (OrxGui::State)i;
+        return true;
+    }
+    return false;
+  }
+
 }

branches/gui/src/lib/gui/gl/glgui_style.h

@@ -48 +48 @@
     void setBorderLeft(float value);
     void setBorderLeft(float value, OrxGui::State state);
-    void setBorderLeftS(float value, const std::string& state);
+    void setBorderLeftS(float value, const std::string& stateName);
 
     void setBorderRight(float value);
     void setBorderRight(float value, OrxGui::State state);
-    void setBorderRightS(float value, const std::string& state);
+    void setBorderRightS(float value, const std::string& stateName);
 
     void setBorderTop(float value);
     void setBorderTop(float value, OrxGui::State state);
-    void setBorderTopS(float value, const std::string& state);
+    void setBorderTopS(float value, const std::string& stateName);
 
     void setBorderBottom(float value);
     void setBorderBottom(float value, OrxGui::State state);
-    void setBorderBottomS(float value, const std::string& state);
+    void setBorderBottomS(float value, const std::string& stateName);
 
     void setTextSize(float value);
     void setTextSize(float value, OrxGui::State state);
-    void setTextSizeS(float value, const std::string& state);
+    void setTextSizeS(float value, const std::string& stateName);
 
     void setBackgroundColor(const Color& color);
     void setBackgroundColor(const Color& color, OrxGui::State state);
-    void setBackgroundColorS(float r, float g, float b, float a, const std::string& state);
+    void setBackgroundColorS(float r, float g, float b, float a, const std::string& stateName);
 
     void setBackgroundTexture(const Texture& texture);
     void setBackgroundTexture(const Texture& texture, OrxGui::State state);
-    void setBackgroundTexture(const std::string& textureName, const std::string& state);
+    void setBackgroundTexture(const std::string& textureName, const std::string& stateName);
 
     void setForegroundColor(const Color& color);
     void setForegroundColor(const Color& color, OrxGui::State state);
-    void setForegroundColorS(float r, float g, float b, float a, const std::string& state);
+    void setForegroundColorS(float r, float g, float b, float a, const std::string& stateName);
 
 
@@ -87 +87 @@
     void setAnimated(bool animated);
     void setAnimatedStateChanges(bool animated);
+
+    private:
+      bool getState(const std::string& stateName, OrxGui::State* state);
 
   private: