Changeset 17

Timestamp:

11/26/06 23:48:52 (2 years ago)

Author:

baxissimo

Message:

Added enter/leave events, and got dxut doing timer-based transitions between states.

Files:

• trunk/luigi/base.d (modified) (1 diff)
• trunk/luigi/event.d (modified) (2 diffs)
• trunk/luigi/gui.d (modified) (9 diffs)
• trunk/luigi/themes/dxut.d (modified) (10 diffs)

trunk/luigi/base.d

@@ -171 +171 @@
-    void set(float r_, float g_, float b_, float a_=1.0) {
-        r=lrint(r_*255), g=lrint(g_*255), b=lrint(b_*255), a=lrint(a_*255);
+    }
+
+    static Color lerp(Color c1, Color c2, float t) {
+        Color ret;
+        ret.r = lrint( (1-t)*c1.r + t*c2.r );
+        ret.g = lrint( (1-t)*c1.g + t*c2.g );
+        ret.b = lrint( (1-t)*c1.b + t*c2.b );
+        ret.a = lrint( (1-t)*c1.a + t*c2.a );
+        return ret;
-    }
-

trunk/luigi/event.d

@@ -279 +279 @@
-}
-
-// how do I do this???
-/// extern luigi.gui.Widget;
-
-struct _FocusEvent
-{
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -299 +301 @@
-alias _WindowCloseEvent* WindowCloseEvent;
-alias _FocusEvent* FocusEvent;
+alias _EnterEvent* EnterEvent;
+alias _EnterEvent* LeaveEvent;
-
-alias void function(KeyEvent)         KeyEventFn;

trunk/luigi/gui.d

@@ -550 +550 @@
-
-
+    bool rollover() { return m_rollover; }
+
-    //---------------------------------------------------
-    // Base widget event handling
@@ -578 +580 @@
-        Button b = cast(Button)this;
-    }
+    void on_enter(EnterEvent ev) {
+        m_rollover = true;
+    }
+
+    void on_leave(LeaveEvent ev) {
+        m_rollover = false;
+    }
-
-    void stretch(ubyte both)       { m_stretchx = m_stretchy = both; }
@@ -599 +608 @@
-    bool m_enabled = true;
-    bool m_focused = false;
+    bool m_rollover = false;
-    Arranger m_arranger = null;
-    ubyte m_stretchx = 0; // stretchyness for arrangement 
@@ -1091 +1101 @@
-            // try to give it focus.
-            target.focus();
-
+xform_
-            Luigi().theme.on_mouse_button(target, ev);
-        }
-    }
-    final void on_sys_mouse_move(MouseMoveEvent ev)
+    {
+        Widget target;
+        target = find_item_at_point(Point(ev.winx,ev.winy));
+        if (target != m_hoverItem) {
+            _EnterEvent eev;
+            if (m_hoverItem) 
+                m_hoverItem.on_leave(&eev);
+            if (target)
+                target.on_enter(&eev);
+            m_hoverItem = target;
+        }
+        if (m_grabItem) {
+            target = m_grabItem;
+        }
+        if (target) {
+            _xform_event_to_widget(target, ev);
+            Luigi().theme.on_mouse_move(target, ev);
+        }
+    }
+    final void on_sys_mouse_wheel(MouseWheelEvent ev)
-    {
-        Widget target;
@@ -1105 +1135 @@
-        }
-        if (target) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-            Luigi().theme.on_mouse_wheel(target, ev);
-        }
@@ -1133 +1149 @@
-    }
-
-
+xform_
-        Point p = Point(ev.x,ev.y);
-        w.transform_window_to_widget(p);
@@ -1146 +1162 @@
-
-    Widget m_grabItem;  // item grabbing mouse. Could be any descendant
-
+Widget m_hoverItem; // item containing mouse pointer currently
-}
-
@@ -1237 +1253 @@
-
-    bool depressed() { return m_depressed; }
-    bool rollover() { return m_rollover; }
-
-    char[] label;
@@ -1247 +1262 @@
-protected:
-    bool m_depressed = false;
-    bool m_rollover = false;
-}
-

trunk/luigi/themes/dxut.d

@@ -35 +35 @@
-import luigi.gui;
-
+import std.math : pow;
+import std.perf;
+
-import derelict.opengl.extension.arb.texture_compression;
-static const GLint GL_COMPRESSED_RGB_S3TC_DXT1_EXT  = 0x83F0;
@@ -47 +50 @@
-}
-
-
-class DXUTTheme : ThemeBase
-{
-    this() {
+        // Load texture first
+        try {
+            initialize_compressed_texture_extension();
+            loadCompressedTexture("themes/dxutcontrols.dds", m_texid);
+            //loadCompressedTexture("themes/lena.dds", m_texid);
+            glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &m_texw);
+            glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &m_texh);
+        }
+        catch (Exception e) {
+            report_error(std.string.format("Couldn't load texture: ", e.toString));
+        }
+
+        m_default_font = new ASCIIBitmapFont();
+        m_timer = new PerformanceCounter;
+
-        // Register all known size and draw functions.
-        label_register();
@@ -61 +78 @@
-        radiogroup_register();
-        radiobutton_register();
-
-        m_default_font = new ASCIIBitmapFont();
-
-        // Load texture
-        try {
-            initialize_compressed_texture_extension();
-            loadCompressedTexture("themes/dxutcontrols.dds", m_texid);
-            //loadCompressedTexture("themes/lena.dds", m_texid);
-            glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &m_texw);
-            glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &m_texh);
-        }
-        catch (Exception e) {
-            report_error(std.string.format("Couldn't load texture: ", e.toString));
-        }
-
-        /*
-        bkg_color.set(212,208,200);
-        text_color.set(0,0,0);
-
-        sel_text_color.set(255,255,255);
-        sel_text_bkg_color.set(10,36,106);
-        sel_text_unfocus_bkg_color.set(176,176,176);
-
-        hilite_color[0].set(64,64,64);
-        hilite_color[1].set(128,128,128);
-        hilite_color[2].set(255,255,255);
-
-        m_bitmaps = new StdBitmapSet;
-
-        // Some default colors
-        set_background_color(Overlay.classinfo, Color(0,0,0,0));
-        */
-    }
-    ~this() {
@@ -99 +84 @@
-    }
-
+    //----------------------------------------------------------------------
+    class ThemeData {
+        Element[] elements;
+    }
+    ThemeData get_theme_data(Widget w) {
+        Object td;
+        if (w && (td=w.theme_instance_data)!is null) {
+            return cast(ThemeData)td;
+        }
+        else {
+            ThemeData td2 = new ThemeData;
+            w.theme_instance_data = td2;
+            td2.elements = m_elements[w.classinfo].dup;
+            return td2;
+        }
+    }
+    Element[] get_widget_elements(Widget w) {
+        return get_theme_data(w).elements;
+    }
+    //----------------------------------------------------------------------
+
+
-    //============================================================================
-    // Built-in Drawing and size routines
@@ -115 +122 @@
-    }
-
+    /** Draw text centered in the rectangle */
+    void draw_text_centered(Font font, char[] label, Rect rect)
+    {
+        Rect sr = font.string_rect(label);
+        float sx = rect.x+(rect.w-sr.w)/2;
+        float sy = rect.y+(rect.h-sr.h)/2;
+        Point trans = font.origin; trans.x+=sx; trans.y+=sy;
+        translate(trans);
+        font.draw_string(label);
+        untranslate(trans);
+    }
-    /** Draw text so the upper left corner is at (x,y) */
-
-
-
+
+
-        Point trans = font.origin; trans.x+=x; trans.y+=y;
-        translate(trans);
@@ -127 +144 @@
-    //----GRPAHICS STATE------------------------------------------------------
-    void begin_drawing(Rect r) {
+        m_timer.stop();
+        m_elapsedTime = m_timer.milliseconds / 1000.0;
+        m_timer.start();
+        
-        gldraw.push_graphics_state(r);
+        glPushAttrib(GL_TEXTURE_BIT);
+
+        glEnable(GL_BLEND);
+        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+        glBindTexture(GL_TEXTURE_2D,m_texid);
+        glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+
+        glMatrixMode(GL_TEXTURE);
+        glPushMatrix();
+        glLoadIdentity();
+        glScalef(1./m_texw, 1./m_texh,1);
+        glMatrixMode(GL_MODELVIEW);
+
-    }
-    void end_drawing() {
+        glPopAttrib(); // TEXTURE_BIT
-        gldraw.pop_graphics_state();
+        glMatrixMode(GL_TEXTURE);
+        glPopMatrix();
+        glMatrixMode(GL_MODELVIEW);
-    }
-    //----LABEL---------------------------------------------------------------
@@ -139 +177 @@
-    void button_register() {
-        addHandlers!(Button)(&button_draw, &button_best_size, &button_min_size);
+        Element[] elems = new Element[2];
+        Element e;
+        // button layer
+        e.fontColor.states[ WidgetState.Disabled ] = Color(200,200,200,200);
+        e.set_texture( m_texid, [0,0,136,54] );
+        e.set_font( m_default_font );
+        e.texColor.states[ WidgetState.Normal ] = Color(255, 255, 255, 150);
+        e.texColor.states[ WidgetState.Depressed ] = Color(255, 255, 255, 200);
+        e.fontColor.states[ WidgetState.Rollover ] = Color(0, 0, 0, 255);
+        elems[0] = e;
+    
+        // fill layer
+        e.set_texture( m_texid, [136, 0, 272, 54], Color(255, 255, 255, 0) );
+        e.texColor.states[ WidgetState.Rollover ] = Color(255, 255, 255, 160);
+        e.texColor.states[ WidgetState.Depressed ] = Color(0, 0, 0, 60);
+        e.texColor.states[ WidgetState.Focus ] = Color(255, 255, 255, 30);
+        elems[1] = e;
+    
+        m_elements[Button.classinfo] = elems;
-    }
-    Size button_min_size(Widget widget, Size bounds) {
@@ -150 +207 @@
-        return Size(max(50.,minsz.w), max(22.,minsz.h));
-    }
-    int[4] button_tex_coord = [0,0,136,54];
-    int[4] button_fill_tex_coord = [136,0,272,54];
-    void button_draw(Widget widget) {
-        auto w = cast(Button)widget; assert(w);
-        with (w) {
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-            {
-
-
-
-
-
-
+
+
+
-            }
-
-
-
-
-
+
-            {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        }
@@ -210 +281 @@
-    int m_texw = 0;
-    int m_texh = 0;
+    Element[][ClassInfo] m_elements;
+        
+    PerformanceCounter m_timer;
+    float m_elapsedTime = 0;
+}
+
+
+//============================================================================
+enum WidgetState
+{
+    Normal = 0,
+    Disabled,
+    Hidden,
+    Focus,
+    Rollover,
+    Depressed
+}
+
+struct BlendColor
+{
+    static BlendColor opCall(
+        Color defaultColor, 
+        Color disabledColor = Color(128, 128, 128, 200), 
+        Color hiddenColor = Color(0,0,0,0) ) 
+    {
+        BlendColor bc; bc.set(defaultColor,disabledColor,hiddenColor);
+        return bc;
+    }
+    void set( Color defaultColor, 
+              Color disabledColor = Color(128, 128, 128, 200), 
+              Color hiddenColor = Color(0,0,0,0) )
+    {
+        for( int i=0; i <= WidgetState.max; i++ ) {
+            states[ i ] = defaultColor;
+        }
+        states[ WidgetState.Disabled ] = disabledColor;
+        states[ WidgetState.Hidden ] = hiddenColor;
+        current = hiddenColor;
+    }
+    void blend( WidgetState iState, float fElapsedTime, float fRate = 0.7f )
+    {
+        current = Color.lerp(current, states[iState], 1.0f - pow( fRate, 30. * fElapsedTime ) );
+    }
+
+    ubyte alpha() { return current.a; }
+    
+    Color states[ WidgetState.max+1 ]; // Modulate colors for all possible control states
+    Color current;
+}
+
+struct Element
+{
+    void set_texture(uint iTexID, int[4] textureRect, 
+                     Color defaultTexColor = Color(255,255,255,255))
+    {
+        iTexture = iTexID;
+        texRect[] = textureRect[];
+    
+        texColor.set( defaultTexColor );
+    }
+    void set_font( Font fnt, Color defaultFontColor = Color(255, 255, 255, 255) ) 
+    {
+        font = fnt;
+        fontColor.set(defaultFontColor);
+    }
+
+    void refresh() {
+        texColor.current = texColor.states[ WidgetState.Hidden ];
+        fontColor.current = fontColor.states[ WidgetState.Hidden ];
+    }
+
+    uint iTexture;          // Index of the texture for this Element 
+    Font font;              // Font object for this Element
+
+    int[4] texRect;       // Bounding rect of this element on the composite texture
+    
+    BlendColor texColor;
+    BlendColor fontColor;
-}
-
@@ -497 +646 @@
-
-    fread( pDDSdata.pixels, 1, bufferSize, pFile );
+    // need to do an endian swap on pixels for big-endian systems?
-
-    pDDSdata.width      = ddsinfo.width;