Changeset 49

Timestamp:

05/03/08 07:40:36 (7 months ago)

Author:

kaarna

Message:

Slow clipping working with a hack.Should be made better.

Files:

• trunk/pihlaja/src/shiraz/canvas/Draw.d (modified) (3 diffs)
• trunk/pihlaja/src/shiraz/canvas/PlainRectangle.d (modified) (3 diffs)
• trunk/pihlaja/src/shiraz/canvas/Rectangle.d (modified) (1 diff)

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

@@ -122 +122 @@
-            glColor3f(1.0f, 1.0f, 1.0f);
-        
-/*
+
-            //This doesn't work anymore with GL_CCW?...
-
-
-
-
-*/
+//
+//
+//
+//
+
-            glBegin(GL_QUADS);
-                glNormal3f(0.0f, 0.0f, 1.0f);
@@ -205 +205 @@
-    void pushClipping(float ix1, float iy1, float ix2, float iy2, float iz = 0.0f)
-    {
+        debug(clipping) 
+        {
+            Trace.formatln("Draw.pushClipping() START.");
+        
+            Trace.format("ix1:{}, ", cast(double) ix1 );
+            Trace.format("iy1:{}, ", cast(double) iy1 );
+            Trace.format("ix2:{}, ", cast(double) ix2 );
+            Trace.format("iy2:{}, ", cast(double) iy2 );
+        }
+    
-        ClippingInfo clipinfo = new ClippingInfo(ix1, iy1, ix2, iy2, iz);
-
+/*
-        {
-            clipStack.tail.clip( clipinfo );//Wow! We clip it with the old clip.
-
+*/
-        clipStack.push( clipinfo );
+        debug(clipping) Trace.formatln("Draw.pushClipping() push. size: {}", clipStack.length );
-        clipinfo.startClipping();
-    }
@@ -216 +227 @@
-    void popClipping()
-    {
+        debug(clipping) Trace.formatln("Draw.popClipping() START.");
+    
-        scope ClippingInfo clipinfo = clipStack.pop();
+        
+        debug(clipping) Trace.formatln("Draw.popClipping() pop. size: {}", clipStack.length );
+        
+        clipinfo.endClipping();
+        
-        if( clipStack.length > 0 )
-        {
-            clipStack.tail.startClipping();
-        }
-
+//
-    }
-    

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

@@ -1042 +1042 @@
-    }
-    
+    //Maybe remove this. It's just
+    //for debug in render().
+    public char[] fullName(char[] recursive = "")
+    {
+        return name ~ "." ~ recursive; 
+    }
+    
+    public bool isClipping() { return m_isClipping; }
+    public bool isClipping(bool set) { return m_isClipping = set; }
+    protected bool m_isClipping = false;
+    
-    void render( Draw draw )
-    {
+        debug(clipping) Trace.formatln("PlainRectangle.render() START. name: {}", fullName() );
+    
-        beginRender(draw);
-        
@@ -1050 +1063 @@
-                //draw.colour();
-                //draw.gradient( gradient );
+                
+                //TODO
+                glColor4f(r, g, b, a);
-                
-                shape.bounds(ix1, iy1, ix2, iy2, iz);
@@ -1062 +1078 @@
-                }
-            
-//
+
-                draw.pushClipping(ix1, iy1, ix2, iy2, iz);
-                    
-                    renderChildren(draw);
-                    
-
+
+
+
-                draw.popClipping();
-            
-            
-endRender(draw);
+
-    }
-    

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

@@ -3040 +3040 @@
-    }
-    
-    public bool isClipping() { return m_isClipping; }
-    public bool isClipping(bool set) { return m_isClipping = set; }
-    protected bool m_isClipping = false;
-    
-    public double tempclip = 0.0f;
-    public double tempclip2 = 0.0f;