Changeset 15

Timestamp:

11/26/06 11:22:07 (2 years ago)

Author:

baxissimo

Message:

Made headway on a dxut texture-based theme

Files:

• trunk/luigi/example1.d (modified) (4 diffs)
• trunk/luigi/gldraw.d (modified) (1 diff)
• trunk/luigi/gui.d (modified) (3 diffs)
• trunk/luigi/theme.d (modified) (17 diffs)
• trunk/luigi/themes (added)
• trunk/luigi/themes/dxut.d (added)
• trunk/luigi/themes/dxutcontrols.dds (added)

trunk/luigi/example1.d

@@ -28 +28 @@
-import luigui = luigi.gui;
-import luigi.adaptor.glfw;
+static import luigi.themes.dxut;
-
-import derelict.glfw.glfw;
@@ -79 +80 @@
-
-    // Set the background color
-0, 0, 0
+66/255., 75/255., 121/255.
-
-
@@ -87 +88 @@
-    with(luigui) {
-        Luigi().adaptor = GLFWAdaptor();
+        Luigi().theme = new luigi.themes.dxut.DXUTTheme();
-        gui = new Overlay;
-    
@@ -275 +277 @@
-        glClear( GL_COLOR_BUFFER_BIT );
-
+        glTranslatef(-4,14,4 );
+        glBegin( GL_TRIANGLES );
+          glColor3f( 1, 0, 0 );  glVertex3f( -5, 0, -4 );
+          glColor3f( 0, 1, 0 );  glVertex3f(  5, 0, -4 );
+          glColor3f( 0, 0, 1 );  glVertex3f(  0, 0,  6);
+        glEnd();
+        glTranslatef( 4,-14,-4 );
+
-        // Draw a rotating colorful triangle
-        glTranslatef( 0, 14, 0 );

trunk/luigi/gldraw.d

@@ -108 +108 @@
-    glEnd();
-}
+
+void fill_rect(Rect r, float[4] tc) {
+    glBegin(GL_QUADS);
+    glTexCoord2f(tc[0],tc[1]); glVertex2f(r.x1,r.y1);
+    glTexCoord2f(tc[2],tc[1]); glVertex2f(r.x2,r.y1);
+    glTexCoord2f(tc[2],tc[3]); glVertex2f(r.x2,r.y2);
+    glTexCoord2f(tc[0],tc[3]); glVertex2f(r.x1,r.y2);
+    glEnd();
+}
+
+void fill_rect(Rect r, int[4] tc) {
+    glBegin(GL_QUADS);
+    glTexCoord2i(tc[0],tc[1]); glVertex2f(r.x1,r.y1);
+    glTexCoord2i(tc[2],tc[1]); glVertex2f(r.x2,r.y1);
+    glTexCoord2i(tc[2],tc[3]); glVertex2f(r.x2,r.y2);
+    glTexCoord2i(tc[0],tc[3]); glVertex2f(r.x1,r.y2);
+    glEnd();
+}
+
-void stroke_rect(Rect r) {
-    glBegin(GL_LINE_LOOP);

trunk/luigi/gui.d

@@ -1028 +1028 @@
-    /** Sets up the drawing state for 2D GUI drawing and draws it's children. */
-    override void draw() {
-        // Over
-        if (!shown) return;
-
-
+
-        super.draw();
-
-
+
-    }
-
@@ -1240 +1237 @@
-
-    bool depressed() { return m_depressed; }
+    bool rollover() { return m_rollover; }
-
-    char[] label;
@@ -1249 +1247 @@
-protected:
-    bool m_depressed = false;
+    bool m_rollover = false;
-}
-

trunk/luigi/theme.d

@@ -33 +33 @@
-import luigi.bitmaps;
-import luigi.gldraw;
+import gldraw = luigi.gldraw;
-import luigi.font;
-import luigi.event;
@@ -43 +44 @@
-interface Theme
-{
+    /** Called before and after refreshing the gui by Overlay.
+     *  This is where all common 2D GL state can be set up and restored by 
+     *  the theme.
+     */
+    void begin_drawing(Rect r);
+    void end_drawing();
-
-    /** Draws the given item */
@@ -65 +72 @@
-{
-    abstract override void draw(Widget item);
-
-    abstract override Size minimum_size(Widget item, Size bounds);
-    abstract override Size preferred_size(Widget item, Size bounds);
+
+    void begin_drawing(Rect r) {}
+    void end_drawing() {}
-
-    //============================================================================
@@ -88 +97 @@
-    }
-}
-
-
-template FuncDispatcher(FuncT)
@@ -114 +122 @@
-}
-
-StdThem
+ThemeBas
-{
-
+
+
+
+
+
+
+
+
-    {
-        m_drawFuncs.add(Class.classinfo, draw);
@@ -122 +137 @@
-        m_minsizeFuncs.add(Class.classinfo, (min_sz is null)?best_sz : min_sz);
-    }
-_addEvFuncs(alias Class)(ButtonFunc btn, MoveFunc move
+addEventHandlers(alias Class)(ButtonFunc btn, MoveFunc move=null, KeyFunc key=null
-    {
-        m_btnFuncs.add(Class.classinfo, btn);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    this() {
-        // Register all known size and draw functions.
@@ -188 +261 @@
-    }
-
-    //========================================================================
-
-    void draw(Widget item) {
-        DrawFunc f = m_drawFuncs.lookup(item);
-        if (f) f(item);
-    }
-
-    Size minimum_size(Widget item, Size bounds) { 
-        SizeFunc f = m_minsizeFuncs.lookup(item);
-        if (f) return f(item,bounds);
-        return Size(0,0);
-    }
-    Size preferred_size(Widget item, Size bounds) { 
-        SizeFunc f = m_bestsizeFuncs.lookup(item);
-        if (f) { 
-            return f(item,bounds);
-        }
-        return Size(50,22); 
-    }
-
-    //============================================================================
-    // Event functions
-    override void on_mouse_button(Widget item, MouseButtonEvent ev) 
-    {
-        ButtonFunc f = m_btnFuncs.lookup(item);
-        if (f) f(item, ev);
-
-        if (!f || ev.alive) { item.on_mouse_button(ev); }
-    }
-    override void on_mouse_move(Widget item, MouseMoveEvent ev) 
-    {
-        MoveFunc f = m_moveFuncs.lookup(item);
-        if (f) f(item, ev);
-
-        if (!f || ev.alive) { item.on_mouse_move(ev); }
-    }
-
-    //============================================================================
-    // Built-in Drawing and size routines
@@ -333 +369 @@
-
-
-
+
+
+
+
+
+
+
-    //----PANEL-------------------------------------------------------------------
-    void panel_register() {
@@ -347 +389 @@
-    //----LABEL-------------------------------------------------------------------
-    void label_register() {
-_addFunc
+addHandler
-    }
-    Size label_best_size(Widget widget, Size bounds) {
@@ -371 +413 @@
-    //----BUTTON------------------------------------------------------------------
-    void button_register() {
-_addFunc
+addHandler
-    }
-    Size button_min_size(Widget widget, Size bounds) {
@@ -421 +463 @@
-    //----CHECKBOX----------------------------------------------------------------
-    void checkbox_register() {
-_addFunc
+addHandler
-    }
-    //Size checkbox_min_size(Widget widget, Size bounds) {
@@ -487 +529 @@
-    //----TEXTFIELD-------------------------------------------------------------
-    void textfield_register() {
-_addFunc
-_addEvFunc
+addHandler
+addEventHandler
-    }
-    const int textfield_base_scroll = 3;
@@ -703 +745 @@
-    //----SLIDER----------------------------------------------------------------
-    void slider_register() {
-_addFunc
-_addEvFunc
+addHandler
+addEventHandler
-    }
-
@@ -817 +859 @@
-    //----SPINNER----------------------------------------------------------------
-    void spinner_register() { 
-_addFunc
+addHandler
-    }
-    /*
@@ -836 +878 @@
-    //----RADIOGROUP----------------------------------------------------------------
-    void radiogroup_register() {
-_addFunc
+addHandler
-    }
-    Size radiogroup_min_size(Widget widget, Size bounds) {
@@ -853 +895 @@
-    //----RADIOBUTTON----------------------------------------------------------------
-    void radiobutton_register() {
-_addFunc
+addHandler
-    }
-    Size radiobutton_min_size(Widget widget, Size bounds) {
@@ -883 +925 @@
-
-    ThemeData[ClassInfo] m_classThemeData;
-
-
-    alias Size delegate(Widget item, Size bounds) SizeFunc;
-    alias void delegate(Widget item) DrawFunc;
-    alias void delegate(Widget item, MouseButtonEvent ev) ButtonFunc;
-    alias void delegate(Widget item, MouseMoveEvent ev) MoveFunc;
-
-    mixin FuncDispatcher!(DrawFunc) m_drawFuncs;
-    mixin FuncDispatcher!(SizeFunc) m_minsizeFuncs;
-    mixin FuncDispatcher!(SizeFunc) m_bestsizeFuncs;
-    mixin FuncDispatcher!(ButtonFunc) m_btnFuncs;
-    mixin FuncDispatcher!(MoveFunc) m_moveFuncs;
-}
-