Changeset 46

Timestamp:

04/19/08 21:23:06 (8 months ago)

Author:

kaarna

Message:

Faster.Added x1N(set) type methods for speed.Doublesided testing.

Files:

• trunk/pihlaja/src/pihlaja/PihlajaMain.d (modified) (8 diffs)
• trunk/pihlaja/src/shiraz/canvas/PlainRectangle.d (modified) (14 diffs)
• trunk/pihlaja/src/shiraz/canvas/Rectangle.d (modified) (9 diffs)
• trunk/pihlaja/src/shiraz/ui/Button.d (modified) (1 diff)
• trunk/pihlaja/src/shiraz/ui/ProgressBar.d (modified) (1 diff)
• trunk/pihlaja/src/shiraz/ui/SubWindow.d (modified) (14 diffs)
• trunk/pihlaja/src/shiraz/ui/Window.d (modified) (1 diff)

trunk/pihlaja/src/pihlaja/PihlajaMain.d

@@ -202 +202 @@
-        
-        super();
+        
+        isDoubleSided = true;
-        
-        initVideo();
@@ -418 +420 @@
-    */
-    
-//rename to render() draw() or similar.
+
-    void render()
-    {
@@ -426 +428 @@
-            applyRotation();
-            applyScale();
+            
+            applyCulling();
-            applyColour();
-applyClipping();
+
-    
-        /*GLdouble eqn[4] = [0.0, 1.0, 0.0, 0.0];    // y < 0
@@ -483 +487 @@
-        
-        
+        //TODO draw children...
+        //Check if it's just this simple:
+        applyClipping();
+            doRend();
+        endClipping();
+        
-        glPopMatrix();
-    }
@@ -509 +519 @@
-                
-                glEnable(GL_TEXTURE_2D);
+                
+                //glEnable(GL_CULL_FACE);
-                
-        /*
@@ -608 +620 @@
-                float hh = fs.h / TEXTURE_HEIGHT;
-                
+            
+                
-                glColor4f( 1.0f, 1.0f, 1.0f, fs.alpha ); //Control Transparency
-                glBegin (GL_QUADS);
@@ -901 +915 @@
-        
-        myWindow2 = new SubWindow("Viewer");
+        
+        myWindow2.side1.container.isDoubleSided = true;//BUG WEIRD. Why do I have to do this too?
+        
-        //myWindow2.isRotate = true;
-        Trace.formatln("{}", myWindow2 );
@@ -908 +925 @@
-        //myWindow2.colour( 0.2, 0.5, 0.3, 0.5 );
-        myWindow2.signalMouseButtonPress.attach(&clickHandler);
+        
+        myWindow2.side2.a = 0.5f;//TEMP hack. Side2 alpha to 0.5.
+        auto isInterlacedButton = new Button("Interlaced");
+        isInterlacedButton.a = 0.5f;
+        isInterlacedButton.signalActivate.attach(&clickHandler3);
+        myWindow2.add2(isInterlacedButton);
-        
-        myWindow2.add(videoViewer);

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

@@ -976 +976 @@
-    protected float _scale = 1.0f;
-    
+    //If this Rectangle is double-sided or not.
+    //If it is, we'll use OpenGL culling to remove
+    //the back.
+    bool isDoubleSided() { return m_isDoubleSided; }
+    bool isDoubleSided(bool set) { return m_isDoubleSided = set; }
+    bool m_isDoubleSided = false;
+    
-    //To draw an outline or not...
-    bool isOutline() { return m_isOutline; }
@@ -993 +1000 @@
-            applyScale();
-            
+            applyCulling();
-            applyTexture();
-            applyColour();
@@ -1046 +1054 @@
-    }
-    
+    void applyCulling()
+    {
+        if( isDoubleSided == true )
+            glDisable(GL_CULL_FACE);
+        else glEnable(GL_CULL_FACE);
+    }
+    //TODO endCulling() ???
+    
-    void applyTexture()
-    {
@@ -1075 +1091 @@
-            applyScale();
-            
+            applyCulling();
-            applyTexture();
-            applyColour();
@@ -1444 +1461 @@
-        return _xPos + _ix1;
-    }
+    public float x1N( float set )//N versions don't do arrange and invalidate automatically.
+    {
+        float delt = set - x1;
+        _ix1 = _ix1 + (delt*0.5);//Move _ix1 half the delta.
+        _xPos = _xPos + (delt*0.5);//Move xPos half the delta.
+        _ix2 = _ix2 - (delt*0.5);//Move _ix2 half the delta to the other direction.
+        //arrange();
+        //invalidate();
+        return _xPos + _ix1;
+    }
-    public float ix1() { return _ix1; }
-    public float ix1( float set ) //{ return _ix1 = set; }
@@ -1450 +1477 @@
-        arrange();
-        invalidate();
+        return _ix1;
+    }
+    public float ix1N( float set ) //{ return _ix1 = set; }
+    {
+        _ix1 = set;
+        //arrange();
+        //invalidate();
-        return _ix1;
-    }
@@ -1466 +1500 @@
-        return _yPos + _iy1;
-    }
+    public float y1N( float set )
+    {
+        float delt = set - y1;
+        _iy1 = _iy1 + (delt*0.5);//Move _iy1 half the delta.
+        _yPos = _yPos + (delt*0.5);//Move yPos half the delta.
+        _iy2 = _iy2 - (delt*0.5);//Move _iy2 half the delta to the other direction.
+        //arrange();
+        //invalidate();
+        return _yPos + _iy1;
+    }
-    public float iy1() { return _iy1; }
-    public float iy1( float set ) //{ return _iy1 = set; }
@@ -1472 +1516 @@
-        arrange();
-        invalidate();
+        return _iy1;
+    }
+    public float iy1N( float set ) //{ return _iy1 = set; }
+    {
+        _iy1 = set;
+        //arrange();
+        //invalidate();
-        return _iy1;
-    }
@@ -1488 +1539 @@
-        return _xPos + _ix2;
-    }
+    public float x2N( float set )
+    {
+        float delt = set - x2;
+        _ix2 = _ix2 + (delt*0.5);//Move _ix2 half the delta.
+        _xPos = _xPos + (delt*0.5);//Move xPos half the delta.
+        _ix1 = _ix1 - (delt*0.5);//Move _ix1 half the delta to the other direction.
+        //arrange();
+        //invalidate();
+        return _xPos + _ix2;
+    }
-    
-    public float ix2() { return _ix2; }
@@ -1495 +1556 @@
-        arrange();
-        invalidate();
+        return _ix2;
+    }
+    public float ix2N( float set ) //{ return _ix2 = set; }
+    {
+        _ix2 = set;
+        //arrange();
+        //invalidate();
-        return _ix2;
-    }
@@ -1507 +1575 @@
-        arrange();
-        invalidate();
+        return _ix2 - _ix1;
+    }
+    public float wN( float set )
+    {
+        float delt = w - set;
+        _ix1 = _ix1 + (delt*0.5);//Move _ix1 half the delta.
+        _ix2 = _ix2 - (delt*0.5);//Move _ix2 half the delta.
+        //arrange();
+        //invalidate();
-        return _ix2 - _ix1;
-    }
@@ -1531 +1608 @@
-        return _yPos + _iy2;
-    }
+    public float y2N( float set )
+    {
+        float delt = set - y2;
+        _iy2 = _iy2 + (delt*0.5);//Move _iy2 half the delta.
+        _yPos = _yPos + (delt*0.5);//Move yPos half the delta.
+        _iy1 = _iy1 - (delt*0.5);//Move _iy1 half the delta to the other direction.
+        //arrange();
+        //invalidate();
+        return _yPos + _iy2;
+    }
-    
-    public float iy2() { return _iy2; }
@@ -1538 +1625 @@
-        arrange();
-        invalidate();
+        return _iy2;
+    }
+    public float iy2N( float set ) //{ return _iy2 = set; }
+    {
+        _iy2 = set;
+        //arrange();
+        //invalidate();
-        return _iy2;
-    }
@@ -1550 +1644 @@
-        arrange();
-        invalidate();
+        return _iy2 - _iy1;
+    }
+    public float hN( float set )
+    {
+        float delt = h - set;
+        _iy1 = _iy1 + (delt*0.5);//Move _iy1 half the delta.
+        _iy2 = _iy2 - (delt*0.5);//Move _iy2 half the delta.
+        //arrange();
+        //invalidate();
-        return _iy2 - _iy1;
-    }

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

@@ -2632 +2632 @@
-    void arrange()
-    {
-This size: {}", toString
+arrange() {}", fullName
-    
-        //checkZOrder();//This isn't entirely necessary on most
@@ -2660 +2660 @@
-                        //if( wid.hasMaxWidth == true && (w - (border*2.0)) > wid.maxWidth )
-                        if( wid.hasMaxHeight == true && (h - (wid.padding*2.0)) > wid.maxHeight )
-
+N
-                        //else if( wid.hasMinWidth == true && (w - (border*2.0)) < wid.minWidth )
-                        else if( wid.hasMinHeight == true && (h - (wid.padding*2.0)) < wid.minHeight )
-
+N
-                        else
-                            //wid.wc = w - (border*2.0);
-
+N
-                    }
-                    else if( wid.yPackOptions == PackOptions.SHRINK )
-                    {
-
+N
-                    }
-                    
@@ -2677 +2677 @@
-                        //if( wid.hasMaxWidth == true && (w - (border*2.0)) > wid.maxWidth )
-                        if( wid.hasMaxWidth == true && (w - (wid.padding*2.0)) > wid.maxWidth )
-
+N
-                        //else if( wid.hasMinWidth == true && (w - (border*2.0)) < wid.minWidth )
-                        else if( wid.hasMinWidth == true && (w - (wid.padding*2.0)) < wid.minWidth )
-
+N
-                        else
-                            //wid.wc = w - (border*2.0);
-
+N
-                    }
-                    else if( wid.yPackOptions == PackOptions.SHRINK )
-                    {
-
+N
-                    }
-                    
@@ -2791 +2791 @@
-                            //if( wid.hasMaxWidth == true && (w - (border*2.0)) > wid.maxWidth )
-                            if( wid.hasMaxHeight == true && (h - (wid.padding*2.0)) > wid.maxHeight )
-
+N
-                            //else if( wid.hasMinWidth == true && (w - (border*2.0)) < wid.minWidth )
-                            else if( wid.hasMinHeight == true && (h - (wid.padding*2.0)) < wid.minHeight )
-
+N
-                            else
-                                //wid.wc = w - (border*2.0);
-
+N
-                        }
-                        else if( wid.yPackOptions == PackOptions.SHRINK )
-                        {
-
+N
-                        }
-                        
@@ -2810 +2810 @@
-                            if( wid.hasMaxWidth == true && temp_width_shared > wid.maxWidth )
-                            {
-
+N
-                                debug(arrange) Trace.formatln("wid.w {} set to w.maxWidth {}", cast(double)wid.w, cast(double)wid.maxWidth );
-                            }
-                            else if( wid.hasMinWidth == true && temp_width_shared < wid.minWidth )
-                            {
-
+N
-                                debug(arrange) Trace.formatln("wid.w {} set to w.minWidth {}", cast(double)wid.w, cast(double)wid.minWidth );
-                            }
-                            else
-                            {
-
-
+N
+N
-                                debug(arrange)
-                                {
@@ -2838 +2838 @@
-                            if( wid.hasMinWidth == true && temp_width_shared > wid.minWidth )
-                            {
-
+N
-                                debug(arrange) Trace.formatln("wid.w {} set to w.minWidth {}", cast(double)wid.w, cast(double)wid.minWidth );
-                            }   
-                            else if( wid.defaultWidth < temp_width_shared )
-                            {
-
+N
-                                debug(arrange) Trace.formatln("wid.w {} set to w.defaultWidth {}", cast(double)wid.w, cast(double)wid.defaultWidth );
-                            }
-                            else
-                            {
-
+N
-                                debug(arrange) Trace.formatln("wid.w {} set to temp_width_shared {}", cast(double)wid.w, cast(double)temp_width_shared );
-                            }
@@ -2953 +2953 @@
-                            //if( wid.hasMaxWidth == true && (w - (border*2.0)) > wid.maxWidth )
-                            if( wid.hasMaxWidth == true && (w - (wid.padding*2.0)) > wid.maxWidth )
-
+N
-                            //else if( wid.hasMinWidth == true && (w - (border*2.0)) < wid.minWidth )
-                            else if( wid.hasMinWidth == true && (w - (wid.padding*2.0)) < wid.minWidth )
-
+N
-                            else
-                                //wid.wc = w - (border*2.0);
-
+N
-                        }
-                        
@@ -2965 +2965 @@
-                        {
-                            if( wid.hasMaxHeight == true && temp_height_shared > wid.maxHeight )
-
+N
-                        else if( wid.hasMinHeight == true && temp_height_shared < wid.minHeight )
-
+N
-                        else
-
-
+N
+N
-                        }
-                        /*
-                        else if( wid.yPackOptions == PackOptions.SHRINK )
-                        {
-
+N
-                        }
-                        */
@@ -3016 +3016 @@
-        if( parent !is null )
-            parent.arrangeParent();
+            
+        invalidate();
-    }
-    

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

@@ -171 +171 @@
-            applyScale();
-            
+            applyCulling();
+            
-            //float zero = 0.0f;
-            

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

@@ -53 +53 @@
-    {
-        super();
+        
+        name = "GradientRect";
-        
-        colour( 25.0f/255.0f, 35.0f/255.0f, 19.0f/255.0f, 1.0f);

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

@@ -218 +218 @@
-            applyRotation();
-            applyScale();
-
+
+
-            applyTexture();
-            applyColour();
@@ -304 +305 @@
-            }
-            
-
-
+
+
+
-            endClipping();
-            
@@ -383 +385 @@
-            applyScale();
-            
+            applyCulling();
+            
+            
-            //float zero = 0.0f;
-            
@@ -731 +736 @@
-            
-            applyClipping();
-            
-                doRend();
-            
-            endClipping();
-            
@@ -796 +799 @@
-        
-        leftSeparator = new Rectangle();
+        leftSeparator.name = "leftSeparator";//TEMP
-        //leftSeparator.maxWidth = 0.012f;
-        leftSeparator.maxWidth = 0.025f;
@@ -815 +819 @@
-        
-        rightSeparator = new Rectangle();
+        rightSeparator.name = "rightSeparator";//TEMP
-        //rightSeparator.maxWidth = 0.012f;
-        rightSeparator.maxWidth = 0.025f;
@@ -900 +905 @@
-            applyRotation();
-            applyScale();
-
+
+
-            //applyColour();
-            
@@ -937 +943 @@
-            }
-            
-
-
-
+
+
-            endClipping();
-        
@@ -1083 +1088 @@
-        if( input.mouse.button[MouseButton.LEFT] == true )
-        {
-
+N
-            controlWidget.y2 = controlWidget.y2 + input.mouse.yRel;
-            //myWindow4.moveTo( input.mouse.x, input.mouse.y );
@@ -1129 +1134 @@
-        //bottomHeader.set( 0.0, h/2.0, w, 0.1 );
-    }*/
+    
+    //Colour is overridden to control container widget.
+    float r() { return ((container is null) ? _colour_data[0] : container.r); }
+    float g() { return ((container is null) ? _colour_data[1] : container.g); }
+    float b() { return ((container is null) ? _colour_data[2] : container.b); }
+    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?
@@ -1161 +1180 @@
-        super();
-        
+        name = "Sides";
+        
-        padding = 0.0f;
-        
@@ -1182 +1203 @@
-            applyRotation();
-            applyScale();
-
+   
-            uint i = 0;
-            foreach( Rectangle rect; itemList )
@@ -1198 +1219 @@
-    synchronized bool mouseEvent( InputState input )//THIS , bool bypass_hittest = false )
-    {
-== 0.0f || yRot == 360.0f
+>= -90.0f && yRot <= 90.0f || yRot >= 270.0f && yRot <= 450.0f 
-        {
-!=
+>
-                return itemList[0].mouseEvent(input);
+        }
+        else if( yRot > 90.0f && yRot < 270.0f )
+        {
+            if( itemList.length > 1 )
+                return itemList[1].mouseEvent(input);
-        }
-        
@@ -1281 +1307 @@
-        side1.prepend( a_widget );
-    }
+    
+    void add2( Rectangle a_widget )
+    {
+        side2.append( a_widget );
+    }
+
+    void append2( Rectangle a_widget )
+    {
+        side2.append( a_widget );
+    }
+    
+    void prepend2( Rectangle a_widget )
+    {
+        side2.prepend( a_widget );
+    }
-
-    PlainWindow side1;

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

@@ -835 +835 @@
-        debug(Hitting) Trace.formatln("Window.mouseEvent() START.");
-        debug(Hitting) scope(exit) Trace.formatln("Window.mouseEvent() END.");
+    
+        //Trace.formatln("Window.mouseEvent() START.");
-    
-        bool was_handled = false;