Changeset 8605 in orxonox.OLD for branches/gui/src/lib/gui/gl/glgui_widget.h

Timestamp:

Jun 20, 2006, 9:59:53 AM (18 years ago)

Author:

bensch

Message:

orxonox/gui: fading works again

File:

• branches/gui/src/lib/gui/gl/glgui_widget.h (modified) (6 diffs)

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

@@ -79 +79 @@
     void setWidgetSize(float x, float y);
 
-
+    void animateBack();
 
     /// STYLE
@@ -114 +114 @@
     inline const Font* const font() const { return _font; }
     /** @returns true if the Element is Animated */
-    inline bool animated() const { return _animated; }
+    inline bool animating() const { return _animating; }
     /** @returns true if State-Changes are animated */
     inline bool animatedStateChanges() const { return _animatedStateChanges; }
@@ -182 +182 @@
     void setForegroundColorS(float r, float g, float b, float a, const std::string& stateName);
 
-    inline Color& foregroundColor(OrxGui::State state= GLGUI_DEFAULT_STYLE) { return _style[state]._foreground.diffuseColor(); }
-    inline Color& backgroundColor(OrxGui::State state= GLGUI_DEFAULT_STYLE) { return _style[state]._background.diffuseColor(); }
-    inline Material& background(OrxGui::State state = GLGUI_DEFAULT_STYLE) { return _style[state]._background; }
-    inline Material& foreground(OrxGui::State state = GLGUI_DEFAULT_STYLE) { return _style[state]._foreground; }
-
     void loadBackgroundMaterial(const Material& material);
     void loadBackgroundMaterial(const Material& material, OrxGui::State state);
@@ -204 +199 @@
     void setFont(const std::string& fontName);
 
-    void setAnimated(bool animated);
     void setAnimatedStateChanges(bool animated);
     void switchState(OrxGui::State state);
@@ -261 +255 @@
 
 
-
+    /// WIDGET
     GLGuiWidget*                   _parent;           //!< The parent of this Widget.
 
     /// LOOKS
     Rect2D                         _backRect;
-
-    Color*                         _toFrontColor;
-
     Vector2D                       _minSize;
 
@@ -306 +297 @@
 
     /// ANIMATION STUFF:
-    bool                _animated;             //!< If the Widget is animated (Texture might be an AnimatedTexture.)
     bool                _animatedStateChanges; //!< If the Transitions between States are Animated automatically.
 
+    bool                _animating;            //!< If the Widget is animated at the moment (Texture might be an AnimatedTexture.)
     float               _animationCycle;
     float               _animationDuration;