Changeset 78

Timestamp:

08/01/08 22:37:15 (4 months ago)

Author:

kaarna

Message:

Shadows.

Files:

• trunk/pihlaja/src/dsss.conf (modified) (2 diffs)
• trunk/pihlaja/src/pihlaja/PihlajaMain.d (modified) (3 diffs)
• trunk/pihlaja/src/shiraz/canvas/Image.d (modified) (5 diffs)
• trunk/pihlaja/src/shiraz/canvas/PlainRectangle.d (modified) (8 diffs)
• trunk/pihlaja/src/shiraz/canvas/Rectangle.d (modified) (1 diff)
• trunk/pihlaja/src/shiraz/canvas/ShapeShadow.d (added)
• trunk/pihlaja/src/shiraz/core/Theme.d (modified) (7 diffs)
• trunk/pihlaja/src/shiraz/ui/Button.d (modified) (1 diff)
• trunk/pihlaja/src/shiraz/ui/SubWindow.d (modified) (3 diffs)
• trunk/pihlaja/src/shiraz/ui/Window.d (modified) (1 diff)

trunk/pihlaja/src/dsss.conf

@@ -45 +45 @@
-    #buildflags += -debug=FBO
-    #buildflags += -debug=Shiraz
-
+#
-    #buildflags += -debug=ProjectWindow
-    #buildflags += -debug=Window
-    #buildflags += -debug=GtkOpenGLCanvas
-    #buildflags += -debug=SubWindow
-
+#
-    #buildflags += -debug=Widget
-    #buildflags += -debug=Rectangle
@@ -59 +59 @@
-    #buildflags += -debug=FindLeaf #warning: very much output
-    #buildflags += -debug=Animator
-
-
+#
+#
-}
-version(Windows) {

trunk/pihlaja/src/pihlaja/PihlajaMain.d

@@ -134 +134 @@
-        
-        videoViewerWindow = new SubWindow("Viewer", WindowHeaderType.SMALL, WindowHeaderType.SMALL);
+        videoViewerWindow.shadowType = ShadowType.NONE;
-        //videoViewerWindow.isClipByParent = false;
-        
@@ -275 +276 @@
-        
-        myWindow4 = new SubWindow("Timeline", WindowHeaderType.SMALL, WindowHeaderType.SMALL);
+        myWindow4.shadowType = ShadowType.NONE;
-        //myWindow4.isClipByParent = false;
-        myWindow4.moveTo( -0.3f, 0.4f );
@@ -366 +368 @@
-        
-        SubWindow awin28 = new SubWindow("Timeline", WindowHeaderType.SMALL, WindowHeaderType.SMALL);
+        awin28.shadowType = ShadowType.NONE;
-        //awin28.isClipByParent = false;
-        awin28.defaultSize( 0.4f, 0.4f );

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

@@ -15 +15 @@
- * along with Shiraz; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * The functions boxBlur() and fastBlur() were taken from librsvg-2.15.90
+ * rsvg-filter.c and are Copyright (C) 2004 Caleb Moore.
+ * Author: Caleb Moore <c.moore@student.unsw.edu.au>
+ * They are licenced as LGPL.
- */
-
+
-module shiraz.canvas.Image;
-
@@ -984 +989 @@
-    void blur(float blur_amount)
-    {
-_b
+B
-    }
-    
@@ -1108 +1113 @@
-    */
-    
-//The following two functions were taken from librsvg-2.15.90.
-//And modified to fit this class.
-//Here's the licence:
-
-/*
-   rsvg-filter.c: Provides filters
-
-   Copyright (C) 2004 Caleb Moore
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Author: Caleb Moore <c.moore@student.unsw.edu.au>
-*/
-
-
-static void
-_b
+B
-          int kh )//, RsvgIRect boundarys, RsvgFilterPrimitiveOutput op)
-{
@@ -1285 +1263 @@
-}
-
-_b
+B
-           float blur_amount_y )//, RsvgIRect boundarys, RsvgFilterPrimitiveOutput op)
-{
@@ -1298 +1276 @@
-    scope GLubyte[] intermediate = new GLubyte[max(kx, ky)];
-
-_b
+B
-              ky );//, boundarys, op);
-_b
+B
-              ky );//, boundarys, op);
-_b
+B
-              ky );//, boundarys, op);
-

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

@@ -50 +50 @@
-import shiraz.canvas.IShape;
-import shiraz.canvas.ShapeRectangle;
+import shiraz.canvas.ShapeShadow;
-import shiraz.canvas.Image;
-import shiraz.canvas.Gradient;
@@ -60 +61 @@
-import shiraz.canvas.rtree.Node;
-import shiraz.canvas.rtree.Index;
+
+public enum ShadowType
+{
+    NONE,
+    SQUARE,
+    ROUND
+}
-
-/*
@@ -1068 +1076 @@
-    protected IShape shape;
-    
+    //Shadows:
+    public ShadowType shadowType(ShadowType set)
+    {
+        if( set == m_shadowType )
+        {
+            return m_shadowType;
+        }
+    
+        m_shadowType = set;
+    
+        if( set == ShadowType.NONE )
+        {
+            if( shapeShadow !is null )
+                delete shapeShadow;
+        }
+        else
+        {
+            if( shapeShadow is null )
+                shapeShadow = new ShapeShadow(ix1, iy1, ix2, iy2);
+            updateShadowTexture();
+        }
+        return m_shadowType;
+    }
+    public ShadowType shadowType() { return m_shadowType; }
+    protected ShadowType m_shadowType = ShadowType.NONE;
+    //protected Shadow shadow;
+    protected IShape shapeShadow;
+    
+    protected void updateShadowTexture()
+    {
+        if( shapeShadow is null )
+            return;
+    
+        if( shadowType == ShadowType.SQUARE )
+        {
+            shapeShadow.texture = g_shiraz.getTextureFromTheme("Shiraz.ShapeShadow.square");
+        }
+        else if( shadowType == ShadowType.ROUND )
+        {
+            shapeShadow.texture = g_shiraz.getTextureFromTheme("Shiraz.ShapeShadow.round");
+        }
+        else Trace.formatln("PlainRectangle.updateShadowTexture() strange parameter for a shadow: ShadowType.NONE.");
+    }
+    
-    /*
-    TODO interface IShape
@@ -1135 +1187 @@
-                //draw.colour();
-                //draw.gradient( gradient );
+                
+                renderShadow(draw);
-                
-                //TODO
@@ -1166 +1220 @@
-            
-        
+    }
+    
+    void renderShadow( Draw draw )
+    {
+        if( shadowType != ShadowType.NONE )
+        {
+            glColor4f(1.0f, 1.0f, 1.0f, a);
+            
+            //HARDCODED PIXEL SIZE!
+            float hard_tex_width = (w / g_shiraz.pixel)+102.0f;//102.0f;
+            float hard_tex_height = (h / g_shiraz.pixel)+102.0f;//102.0f;
+            
+            shapeShadow.bounds(
+                //roundToPixels( 
+                icx - (pixel*hard_tex_width*0.5f),
+                //roundToPixels( 
+                icy + 0.005f - (pixel*hard_tex_height*0.5f),
+                //roundToPixels( 
+                icx + (pixel*hard_tex_width*0.5f),
+                //roundToPixels( 
+                icy + 0.005f + (pixel*hard_tex_height*0.5f),
+                iz);
+            
+            draw.fill( shapeShadow );
+        }
-    }
-    
@@ -1298 +1377 @@
-    void renderPixelPerPixel( Draw draw, float hard_tex_width, float hard_tex_height )
-    {
-
+PixelPerPixel
-    
-        beginRender(draw);
-        
-
+//
-                //These should be handled by the Shape:
-                //draw.colour();
@@ -1329 +1408 @@
-                
-                draw.fill( shape );
-
+//
-                
-                /*if(isOutline)
@@ -1354 +1433 @@
-    void renderPixelPerPixelHeight( Draw draw, float hard_tex_height )
-    {
-
+PixelPerPixelHeight
-    
-        beginRender(draw);

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

@@ -39 +39 @@
-
-
-
-
+public 
+public 
-import shiraz.canvas.IRootWindow;
-import shiraz.canvas.Draw;

trunk/pihlaja/src/shiraz/core/Theme.d

@@ -112 +112 @@
-        createTopWindowHeaderImage();
-        createBottomWindowHeaderImage();
+        createWindowShadowImage();
-    }
-    
@@ -122 +123 @@
-        addImage( "Shiraz.Menu", my_image );
-    }
+    
+    void createWindowShadowImage()
+    {
+        Image my_image = new Image(256, 256, 4);
+        my_image.name = "Shiraz.ShapeShadow.round";
+        drawWindowShadow(my_image, true);
+        my_image.blur(6.0f);
+        my_image.writeToPng("/home/joonaz/testi/WindowShadow.png");
+        my_image.createTexture();
+        addImage( "Shiraz.ShapeShadow.round", my_image );
+        
+        Image my_image2 = new Image(256, 256, 4);
+        my_image2.name = "Shiraz.ShapeShadow.square";
+        drawWindowShadow(my_image2, false);
+        my_image2.blur(6.0f);
+        my_image2.writeToPng("/home/joonaz/testi/WindowShadowSquare.png");
+        my_image2.createTexture();
+        addImage( "Shiraz.ShapeShadow.square", my_image2 );
+    }
+    
+    void drawWindowShadow( Image an_image, bool is_rounded = true )
+    {
+        cairo_format_t form = cairo_format_t.ARGB32;
+        
+        if( an_image.channels == 4 )
+            form = cairo_format_t.ARGB32;
+        else if( an_image.channels == 3 )
+            form = cairo_format_t.RGB24;
+        else if( an_image.channels == 1 )
+            form = cairo_format_t.A8;
+        //TODO other cairo_format_t.
+    
+        ImageSurface imageSurface = ImageSurface.createForData(an_image.imageData.ptr, form, an_image.width, an_image.height, an_image.width * an_image.channels);
+        scope(exit) delete imageSurface;    
+        auto cr = Context.create(imageSurface);
+        scope(exit) delete cr;
+    
+        //TODO theme the SMALL and NORMAL window sizes...
+        float hei = g_shiraz.getValueFromTheme("Shiraz.WindowHeader.SMALL.defaultHeight") / g_shiraz.pixel;
+    
+        cr.save();
+            cr.setLineWidth(1.0);
+            float xRender = an_image.width/5;
+            float yRender = an_image.height/5;//32.0f;//(an_image.height - hei) * 0.5f;//an_image.height/3;
+            float x2Render = an_image.width - xRender;
+            float y2Render = an_image.height - yRender;//(an_image.height - yRender) + hei;
+            double curve_size = hei * 0.5f;//(y2Render - yRender) * 0.5f;
+            
+            
+            //Clipping:
+            
+            //cr.rectangle( xRender, yRender, x2Render, y2Render );
+            //cr.clip();
+            
+            /*
+            Gradient gradient;
+            //gradient = g_shiraz.getGradientFromTheme("Shiraz.Button");
+            gradient = getGradient("Shiraz.WindowHeader.Top");
+            
+            scope Pattern linear = Pattern.createLinear( xRender, yRender, xRender, yRender + hei );//(0.0, 0.0, 0.0, 20.0) );
+            ColourStop last_colourstop;
+            foreach( ColourStop colstop; gradient )
+            {
+                //We store the last colourstop:
+                last_colourstop = colstop;
+            
+                //BGRA
+                //I checked, and with the current settings the cairo images
+                //are BGRA and not RGBA. That's why I found it easiest to just
+                //swap the order here, in the drawing phase:
+            
+                //linear.addColorStopRgba( colstop.position, colstop.colour.r, colstop.colour.g, colstop.colour.b, colstop.colour.a );
+                linear.addColorStopRgba( colstop.position, colstop.colour.b, colstop.colour.g, colstop.colour.r, colstop.colour.a );
+            }
+    
+            if( is_top == true )
+            {
+                cr.setSource( linear );
+            }
+            else
+            {
+                cr.setSourceRgba(last_colourstop.colour.b, last_colourstop.colour.g, last_colourstop.colour.r, last_colourstop.colour.a);
+                cr.translate(0.0f, -hei);
+            }
+            */
+    
+            cr.setSourceRgba(0.0f, 0.0f, 0.0f, 0.5f);
+    
+            if( is_rounded == true )
+            {
+                cr.moveTo(xRender, yRender + curve_size);//up-left, lowerpoint
+                            cr.curveTo(xRender, yRender + curve_size, xRender, yRender, xRender + curve_size, yRender);//up-left, upperpoint
+                            cr.lineTo(x2Render - curve_size, yRender);//up-right, upperpoint
+                            cr.curveTo(x2Render - curve_size, yRender, x2Render, yRender, x2Render, yRender + curve_size);//up-right, lowerpoint
+                            cr.lineTo(x2Render, y2Render - curve_size);//down-right, upperpoint
+                            cr.curveTo(x2Render, y2Render - curve_size, x2Render, y2Render, x2Render - curve_size, y2Render);//down-right, lowerpoint
+                            cr.lineTo(xRender + curve_size, y2Render);//down-left, lowerpoint
+                            cr.curveTo(xRender + curve_size, y2Render, xRender, y2Render, xRender, y2Render - curve_size);//down-left, upperpoint
+                            cr.lineTo(xRender, yRender + curve_size);//up-left, lowerpoint
+            }
+            else
+            {
+                cr.rectangle( xRender, yRender, x2Render-xRender, y2Render-yRender );
+            }
+            
+            cr.fill;//Preserve();
+                    //cr.setSourceRgba(0.0, 0.0, 0.0, 1.0);
+                    //cr.setSourceRgba( outlineColour.r, outlineColour.g, outlineColour.b, outlineColour.a );
+                    //cr.stroke();
+                
+        cr.restore();
+        
+        cr.destroy();
+        imageSurface.destroy();
+    }
+    
-    
-    void createButtonImage()
@@ -177 +294 @@
-            //cr.setSourceRgba(set_colour[0], set_colour[1], set_colour[2], set_colour[3]);
-            
-8
+5
-            float yRender = an_image.height/3;
-            float x2Render = an_image.width - xRender;
@@ -209 +326 @@
-            {
-                cr.setSourceRgba(0.0f, 0.0f, 0.0f, 0.5f);
-1
+0
-            }
-    
@@ -292 +409 @@
-        cr.save();
-            cr.setLineWidth(1.0);
-8
+5
-            float yRender = (an_image.height - hei) * 0.5f;//an_image.height/3;
-            float x2Render = an_image.width - xRender;
@@ -300 +417 @@
-            //Clipping:
-            
-
+
+
-            cr.clip();
-            
@@ -352 +470 @@
-        cr.restore();
-        
-
+//
-        
-        cr.destroy();

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

@@ -190 +190 @@
-        //TODO Naturally we'd want to get rid of these hardcoded sizes...
-        //renderPixelPerPixel( draw, 128.0f, 64.0f );
-
+
+
+
+
+
+
-        //renderPixelPerPixelHeight( draw, 64.0f );
-    }

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

@@ -935 +935 @@
-        isFrontSide = set_is_frontside;
-        
+        if( set_bottom_header_type == WindowHeaderType.NONE )//&& set_top_header_type == WindowHeaderType.NONE )
+        {
+            //We only evaluate bottomheader for the shadow roundness, for now.
+            //Because we only have round or square from both ends shadows.
+            //And because the bottom is where the shadow is shown most.
+            shadowType = ShadowType.SQUARE;
+        }
+        else
+        {
+            shadowType = ShadowType.ROUND;
+        }
+        
+        
-        //g_shiraz.registerWindow(this);
-        
@@ -1247 +1260 @@
-            
-        beginRender( draw );    
+            
+            renderShadow(draw);
-            
-            draw.pushTexture( framebufferObject );
@@ -1797 +1812 @@
-    }
-
-
+
+
+
+
+
+
-
-    PlainWindow side1;

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

@@ -694 +694 @@
-        plainWindow = new PlainWindow(set_name, WindowHeaderType.NONE, WindowHeaderType.NONE, true, false );//isfrontside=true, use_fbo_clipping=false
-        addToCanvas(plainWindow);
+        plainWindow.shadowType = shiraz.canvas.PlainRectangle.ShadowType.NONE;//Remove the shadow from here as it isn't even shown.
-        
-        Trace.formatln("After Window.super().");