Changeset 64

Timestamp:

06/21/08 21:07:37 (4 months ago)

Author:

kaarna

Message:

Menu work. RTree cleanup. Hide. No crashes. Anims need work.

Files:

• trunk/pihlaja/src/pihlaja/PihlajaMain.d (modified) (1 diff)
• trunk/pihlaja/src/shiraz/Shiraz.d (modified) (2 diffs)
• trunk/pihlaja/src/shiraz/canvas/ICanvasItem.d (modified) (1 diff)
• trunk/pihlaja/src/shiraz/canvas/PlainRectangle.d (modified) (3 diffs)
• trunk/pihlaja/src/shiraz/canvas/Rectangle.d (modified) (13 diffs)
• trunk/pihlaja/src/shiraz/canvas/rtree/RTree.d (modified) (2 diffs)
• trunk/pihlaja/src/shiraz/ui/Animator.d (modified) (8 diffs)
• trunk/pihlaja/src/shiraz/ui/SubWindow.d (modified) (13 diffs)
• trunk/pihlaja/src/shiraz/ui/Window.d (modified) (2 diffs)

trunk/pihlaja/src/pihlaja/PihlajaMain.d

@@ -1082 +1082 @@
-        //be on the screen at the same time. Possibly both.
-
+        /*
-        for(uint i = 0; i < 10; i++)
-        {
-            crazyTest();
-        }
+        */
-    
-        Widget checkerBoard = new Widget();

trunk/pihlaja/src/shiraz/Shiraz.d

@@ -289 +289 @@
-                break;
-                case "Shiraz.Button":
+                    Trace.formatln("Creating Button texture.");
-                    texture = new Image( Image.GRADIENT_2 );
-                    texture.name = "Shiraz.Button";
@@ -329 +330 @@
-        {
-            if( img.name == set_name )
+            {
+                Trace.formatln("Reusing texture called {}.", set_name );
-                return img;
+            }
-        }
-        return null;

trunk/pihlaja/src/shiraz/canvas/ICanvasItem.d

@@ -301 +301 @@
-    void remove( Animator set_anim );
-    
+    void hide();
+    void show();
+    bool isHidden();
+
-    //LinkSeq!(ICanvasItem) enclosureList( double tx, double ty, double tw, double th, inout LinkSeq!(ICanvasItem) hit_items = null );
-}

trunk/pihlaja/src/shiraz/canvas/PlainRectangle.d

@@ -1095 +1095 @@
-    {
-        debug(clipping) Trace.formatln("PlainRectangle.render() START. name: {}", fullName() );
+    
+        if( isHidden == true )
+            return;
-    
-        beginRender(draw);
@@ -1605 +1608 @@
-    float a( float set ) { return _colour_data[3] = set; }
-    
+    /*
+    float r( float set ) { _colour_data[0] = set; invalidate(); return _colour_data[0]; }
+    float g( float set ) { _colour_data[1] = set; invalidate(); return _colour_data[1]; }
+    float b( float set ) { _colour_data[2] = set; invalidate(); return _colour_data[2]; }
+    float a( float set ) { _colour_data[3] = set; invalidate(); return _colour_data[3]; }
+    */
+    
-    void colour( float sr, float sg, float sb, float sa )
-    {
@@ -1982 +1992 @@
-    }*/
-    
-
+
+
+
+
+
+
+
-    
-    

trunk/pihlaja/src/shiraz/canvas/Rectangle.d

@@ -1880 +1880 @@
-            //Trace.formatln("Animations pending.");
-            invalidate();
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        LinkSeq!(Animator) to_remove = new LinkSeq!(Animator);
-        
@@ -1894 +1916 @@
-            anim.removeFromOwner();
-        }
-
+   */
-        foreach(Rectangle wid; itemList)
-        {
@@ -1906 +1928 @@
-    {
-        //Trace.formatln("Added animation.");
-
-
-
+
+
+
+
+
+
+
+
-    }
-    
@@ -2067 +2094 @@
-    }
-    
+    //Colour Memory. Prelight colour uses this to store the actual colour.
+    float rMem() { return _colour_mem_data[0]; }
+    float gMem() { return _colour_mem_data[1]; }
+    float bMem() { return _colour_mem_data[2]; }
+    float aMem() { return _colour_mem_data[3]; }
+    
+    float rMem( float set ) { return _colour_mem_data[0] = set; }
+    float gMem( float set ) { return _colour_mem_data[1] = set; }
+    float bMem( float set ) { return _colour_mem_data[2] = set; }
+    float aMem( float set ) { return _colour_mem_data[3] = set; }
+    
+    void colourMem( float sr, float sg, float sb, float sa )
+    {
+        rMem = sr; gMem = sg; bMem = sb; aMem = sa;
+    }
+
+    void colourMem( float[] set )
+    {
+        if( set.length >= 4 )
+        {
+            rMem = set[0]; gMem = set[1]; bMem = set[2]; aMem = set[3];
+        }
+    }
+    
+    protected float[4] _colour_mem_data;
+    
-    /**
-        If prelight is true, the widget will be drawn
@@ -2075 +2128 @@
-    {
-        m_isPrelight = true;
+        
+        colourMem( r, g, b, a );
+        
+        if( r > 0.8f )//If whitish...make darker.
+        {
+            colourAnim( 0.7f*r, 0.7f*g, 0.7f*b, a );
+        }
+        else //otherwise make lighter.
+        {
+            colourAnim( 1.3f*r, 1.3f*g, 1.3f*b, a );
+        }
+        
-        invalidate();
-        return m_isPrelight;
@@ -2081 +2146 @@
-    {
-        m_isPrelight = false;
+        
+        colourAnim( rMem, gMem, bMem, aMem );
+        
-        invalidate();
-        return m_isPrelight;
@@ -2668 +2736 @@
-        Trace.formatln("Trying to remove stuff.");
-    
+        if( a_widget.parent !is this )
+        {
+            Trace.formatln("The Rectangle that we tried to remove isn't in this Container.");
+            return;
+        }
+    
+        Trace.formatln("Removing from itemList.");
+        itemList.remove( a_widget );
+        Trace.formatln("Removing from RTree.");
+        itemTree.remove( a_widget );
+        
+        Trace.formatln("Removing done. Cleaning up.");
+        
-        a_widget.parent = null;
-        a_widget.rootWindow = null;
-
-
-
+
+
-        arrange();
-        
+        Trace.formatln("Removing - invalidate.");
-        invalidate();
-    }
@@ -2699 +2780 @@
-    protected Anchor m_anchor = Anchor.TOP_LEFT;
-    
+    /*
-    //This is the public API of hiding and showing.
-    //NOT TRUE AT THE MOMENT:
@@ -2712 +2794 @@
-    protected bool isHidden(bool set) { return m_isHidden = set; }
-    protected bool m_isHidden = false;
+    */
-    
-    public void packOptions( PackOptions set_x, PackOptions set_y )
@@ -3529 +3612 @@
-    protected void applyColour()
-    {
+        /*
-        if( m_isPrelight == false )
-        {
+        */
-            glColor4f( r, g, b, a );
+        /*
-        }
-        else if( r > 0.8f )//If whitish...make darker.
@@ -3541 +3627 @@
-            glColor4f( 1.3f*r, 1.3f*g, 1.3f*b, a );
-        }
+        */
-    }
-    
@@ -3718 +3805 @@
-    protected float m_maxHeight = 0.0f;
-    
+    //Colour animations:
+    
+    void rAnim( float to_set, void delegate() set_when_finished = null )
+    {
+        Animator to_anim = new Animator(this, &r, &r, null, null, null, null, set_when_finished );
+        to_anim.animateTo( to_set, 0.0f, 0.0f );
+    }
+    
+    void gAnim( float to_set, void delegate() set_when_finished = null )
+    {
+        Animator to_anim = new Animator(this, &g, &g, null, null, null, null, set_when_finished );
+        to_anim.animateTo( to_set, 0.0f, 0.0f );
+    }
+    
+    void bAnim( float to_set, void delegate() set_when_finished = null )
+    {
+        Animator to_anim = new Animator(this, &b, &b, null, null, null, null, set_when_finished );
+        to_anim.animateTo( to_set, 0.0f, 0.0f );
+    }
+    
+    void aAnim( float to_set, void delegate() set_when_finished = null )
+    {
+        Animator to_anim = new Animator(this, &a, &a, null, null, null, null, set_when_finished );
+        to_anim.animateTo( to_set, 0.0f, 0.0f );
+    }
+    
+    void colourAnim( float to_r, float to_g, float to_b, float to_a = 1.0f, void delegate() set_when_finished = null )
+    {
+        Animator to_anim = new Animator(this, &r, &r, &g, &g, &b, &b, set_when_finished );
+        to_anim.animateTo( to_r, to_g, to_b );
+        
+        Animator to_anim_alpha = new Animator(this, &a, &a, null, null, null, null, set_when_finished );
+        to_anim_alpha.animateTo( to_a, 0.0f, 0.0f );
+    }
-    
-    //Redefined for adjustTree:
@@ -3747 +3868 @@
-    }
-    
+    void moveToAnim( float to_x, float to_y, float to_z = 0.0f, void delegate() set_when_finished = null )
+    {
+        Animator to_anim = new Animator(this, &xPos, &xPos, &yPos, &yPos, &zPos, &zPos, set_when_finished );
+        to_anim.animateTo( to_x, to_y, to_z );
+    }
+    
+    void sizeAnim( float to_w, float to_h, void delegate() set_when_finished = null )
+    {
+        Animator to_anim = new Animator(this, &w, &w, &h, &h, null, null, set_when_finished );
+        to_anim.animateTo( to_w, to_h, 0.0f );
+    }
+    
-    public float x1(){ return super.x1; }
-    public float x1( float set )

trunk/pihlaja/src/shiraz/canvas/rtree/RTree.d

@@ -2794 +2794 @@
-        {
-            debug(RTree) Trace.formatln("inner foreach.");
-
+ && it.isHidden == false 
-            {
-                debug(RTree) Trace.formatln("testing for enclosure then.");
@@ -3456 +3456 @@
-    Trace.formatln("Tried to remove: {}\n\n", edit1.toString() );
-
-
-
-
-
-
-
-
-
+
+
+
+
-    
-
-
-
-
-
+
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    Trace.formatln( "\nTesting enclosureList()." );

trunk/pihlaja/src/shiraz/ui/Animator.d

@@ -51 +51 @@
-    float delegate(float) setZ;
-    
+    void delegate() whenFinished;
+    
-    float toX;
-    float toY;
@@ -74 +76 @@
-    //this( float delegate() set_get, float delegate(float) set_set )
-    
-
+, void delegate() set_when_finished = null
-    {
-        animatorType = AnimatorType.ABSOLUTE_PATH;
@@ -87 +89 @@
-        setY = set_y;
-        setZ = set_z;
-
-
-
+
+
+
+
+
-    {
-        animatorType = AnimatorType.ABSOLUTE_TO;
@@ -107 +111 @@
-        setZ = set_z;
-        getZ = get_z;
+        
+        whenFinished = set_when_finished;
-        
-        if( setX is null || getX is null )
@@ -247 +253 @@
-            if( position >= 1.0 )
-            {
+                if( whenFinished !is null )
+                    whenFinished();
+            
-                if( owner !is null )
-                {
@@ -265 +274 @@
-            {
-                float now_x = toX - getX();
-
-
-
+
+
+
+
+
+
-                
-                if( now_x < 0.001f && now_x > -0.001f )
-                {
-
+debug(Animator) 
-                    xDone = true;
-                    setX( toX );
@@ -284 +296 @@
-            {
-                float now_y = toY - getY();
-
+debug(Animator) 
-                if( now_y < 0.001f && now_y > -0.001f )
-                {
-
+debug(Animator) 
-                    yDone = true;
-                    setY( toY );
@@ -313 +325 @@
-            if( xDone == true && yDone == true && zDone == true )
-            {
-
+
+
+
+
-                
-                /*if( owner !is null )

trunk/pihlaja/src/shiraz/ui/SubWindow.d

@@ -817 +817 @@
-            //Trace.formatln("controlWidget.panret name: {}", controlWidget.parent.name );
-            //controlWidget.parent.remove(controlWidget);
-
+
+
+
+
+
+
-        }
-    }
@@ -849 +854 @@
-            Trace.formatln("Adding maximize animations.");
-            
+            //The simplified API:
+            controlWidget.moveToAnim(0.0f, 0.0f, 0.0f);
+            controlWidget.sizeAnim( controlWidget.parent.w, controlWidget.parent.h );
+            
+            //The more detailed API:
+            /*
-            Animator to_anim = new Animator(controlWidget, &controlWidget.xPos, &controlWidget.xPos, &controlWidget.yPos, &controlWidget.yPos, null, null );
-            to_anim.animateTo( 0.0f, 0.0f, 0.0f );
@@ -854 +865 @@
-            Animator wh_anim = new Animator(controlWidget, &controlWidget.w, &controlWidget.w, &controlWidget.h, &controlWidget.h, null, null );
-            wh_anim.animateTo( controlWidget.parent.w, controlWidget.parent.h, 0.0f );
+            */
-            
-            /*
@@ -1165 +1177 @@
-            draw.pushTexture( framebufferObject );
-                
-//
-
+
+//
-                //applyColour();
-            
@@ -1196 +1208 @@
-                //TODO
-                //glColor4f(r*0.5f, g*0.5f, b*0.5f, a);
-1.0
+a*0.5
-                draw.stroke( shape );
-            }
@@ -1461 +1473 @@
-    */
-    
+    /*
-    //Colour is overridden to control container widget.
-    float r() { return ((container is null) ? _colour_data[0] : container.r); }
@@ -1467 +1480 @@
-    float a() { return ((container is null) ? _colour_data[3] : container.a); }
-    
-    
-    
-    float r( float set ) { return ((container is null) ? (_colour_data[0] = set) : (container.r = set)); }
-    float g( float set ) { return ((container is null) ? (_colour_data[1] = set) : (container.g = set)); }
-    float b( float set ) { return ((container is null) ? (_colour_data[2] = set) : (container.b = set)); }
-    float a( float set ) { return ((container is null) ? (_colour_data[3] = set) : (container.a = set)); }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    //class Header?
@@ -1509 +1539 @@
-    this()
-    {
+        Trace.formatln("Menu.this() START.");
+        scope(exit) Trace.formatln("Menu.this() END.");
+    
-        super();
-        name = "Menu";
@@ -1515 +1548 @@
-    }
-    
-    /*
-    void add(MenuItem add_item)
-    {
+        add_item.createMenuWindow();
-        super.add(add_item);
-
-
-
-
-
+
-    
-    //LinkSeq!(MenuWindow) menuWindows;
@@ -1531 +1560 @@
-{
-public:
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-        menuWindow = new MenuWindow();
-        menuWindow.defaultSize( 0.25f, 0.35f );
-
-
-
-
-
-
+
+
-        signalMouseButtonPress.attach(&showMenuWindow);
-        signalMouseButtonRelease.attach(&hideMenuWindow);
-    }
-    
+    
-    /*
-    void renderChildren(Draw draw)
@@ -1567 +1609 @@
-    {
-        input.isHandled = true;
-
+   
-        if( menuWindow !is null )
-        {
-
+
+
+
+
+
+
+
+
+
-        }
-    }
@@ -1580 +1630 @@
-        if( menuWindow !is null )
-        {
-
+
+
-        }   
-    }
@@ -1592 +1643 @@
-    this()
-    {
+        Trace.formatln("MenuWindow.this() START.");
+        scope(exit) Trace.formatln("MenuWindow.this() END.");
+    
-        super("MenuWindow", WindowHeaderType.NONE, WindowHeaderType.NONE );
-        
-
+
+
-        //emptyButton31.signalActivate.attach(&clickHandler3);
-
+
+
+
+
+
+
+
+
+
+
+
-    }
-

trunk/pihlaja/src/shiraz/ui/Window.d

@@ -1233 +1233 @@
-        foreach(Rectangle wid; itemList)
-        {
-
+
+
-        }
-    
@@ -1258 +1259 @@
-        foreach(Rectangle wid; itemList)
-        {
-
+
+
-        }
-