Changeset 33

Timestamp:

03/19/08 10:10:08 (9 months ago)

Author:

kaarna

Message:

Updated to GDC trunk (0.25ish).RTree doesn't segfault anymore.Almost works.

Files:

• trunk/pihlaja/src/dsss.conf (modified) (1 diff)
• trunk/pihlaja/src/helpers/gdkkeysyms.d (modified) (1 diff)
• trunk/pihlaja/src/lqt/colormodels.d (modified) (1 diff)
• trunk/pihlaja/src/pihlaja/PihlajaMain.d (modified) (5 diffs)
• trunk/pihlaja/src/shiraz/av/AudioFileQT.d (modified) (1 diff)
• trunk/pihlaja/src/shiraz/av/PortAudioPlaybackCore.d (modified) (2 diffs)
• trunk/pihlaja/src/shiraz/canvas/ICanvasItem.d (modified) (3 diffs)
• trunk/pihlaja/src/shiraz/canvas/Rectangle.d (modified) (34 diffs)
• trunk/pihlaja/src/shiraz/canvas/rtree/AblNode.d (modified) (1 diff)
• trunk/pihlaja/src/shiraz/canvas/rtree/AbstractNode.d (modified) (28 diffs)
• trunk/pihlaja/src/shiraz/canvas/rtree/Comparator.d (modified) (1 diff)
• trunk/pihlaja/src/shiraz/canvas/rtree/Data.d (modified) (1 diff)
• trunk/pihlaja/src/shiraz/canvas/rtree/HashTable.d (moved) (moved from trunk/pihlaja/src_old/ptl/hashtable.d) (4 diffs)
• trunk/pihlaja/src/shiraz/canvas/rtree/HyperCube.d (modified) (1 diff)
• trunk/pihlaja/src/shiraz/canvas/rtree/Index.d (modified) (19 diffs)
• trunk/pihlaja/src/shiraz/canvas/rtree/Leaf.d (modified) (25 diffs)
• trunk/pihlaja/src/shiraz/canvas/rtree/MemoryPageFile.d (modified) (8 diffs)
• trunk/pihlaja/src/shiraz/canvas/rtree/Node.d (modified) (5 diffs)
• trunk/pihlaja/src/shiraz/canvas/rtree/PageFile.d (modified) (5 diffs)
• trunk/pihlaja/src/shiraz/canvas/rtree/RTree.d (modified) (65 diffs)
• trunk/pihlaja/src/shiraz/canvas/rtree/Sort.d (modified) (1 diff)
• trunk/pihlaja/src/shiraz/exception/IllegalArgumentException.d (moved) (moved from trunk/pihlaja/src/shiraz/exception/illegalargumentexception.d) (2 diffs)
• trunk/pihlaja/src/shiraz/exception/RuntimeException.d (added)
• trunk/pihlaja/src/shiraz/exception/runtimeexception.d (deleted)
• trunk/pihlaja/src/shiraz/ui/Animator.d (modified) (1 diff)
• trunk/pihlaja/src/shiraz/ui/SubWindow.d (modified) (2 diffs)
• trunk/pihlaja/src/shiraz/ui/Widget.d (modified) (8 diffs)
• trunk/pihlaja/src/shiraz/ui/Window.d (modified) (8 diffs)
• trunk/pihlaja/src_old/ptl/exception (deleted)

trunk/pihlaja/src/dsss.conf

@@ -33 +33 @@
-    buildflags += -debug=Widget
-    buildflags += -debug=Window
+    buildflags += -debug=RTree
-    #buildflags += -debug=Animator
-    #buildflags += -debug=Window

trunk/pihlaja/src/helpers/gdkkeysyms.d

@@ -1 +1 @@
-/* Converted to D from ./gdkkeysyms.h by htod */
-
+helpers.
-//module gdk.Keysyms;
-/* GDK - The GIMP Drawing Kit

trunk/pihlaja/src/lqt/colormodels.d

@@ -1 +1 @@
-/* Converted to D from colormodels.h by htod */
-
+lqt.
-/*******************************************************************************
- colormodels.h

trunk/pihlaja/src/pihlaja/PihlajaMain.d

@@ -771 +771 @@
-    }
-    
-Widget
+Rectangle
-    {
-        switch( input.eventType )
@@ -797 +797 @@
-    
-    
-Widget
+Rectangle
-    {
-        //Trace.formatln("mouseHandler.");
@@ -818 +818 @@
-    }
-    
-Widget
+Rectangle
-    {
-        Trace.formatln("You clicked me {}.", wid.name);
-    }
-    
-Widget
+Rectangle
-    {
-        Trace.formatln("You clicked the exportButton.");
@@ -933 +933 @@
-    }
-    
-Widget
+Rectangle
-    {
-        static bool clickcol = false;
@@ -952 +952 @@
-    }
-    
-Widget
+Rectangle
-    {
-        //Trace.formatln("VideoViewer.clickHandler() START!");

trunk/pihlaja/src/shiraz/av/AudioFileQT.d

@@ -22 +22 @@
- */
-
-I
+
-
-debug(logging) import tango.util.log.Trace;//Thread safe console output.

trunk/pihlaja/src/shiraz/av/PortAudioPlaybackCore.d

@@ -220 +220 @@
-    return true;
-error:
-
+
+
-    //Old Tango:
-
+//
-    return false;
-}
@@ -243 +244 @@
-    
-error:
-
+
+
-    //Old Tango:
-
+//
-    return false;
-}

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

@@ -19 +19 @@
-module shiraz.canvas.ICanvasItem;
-
+//Circular import/LinkSeq/GDC bug is the reason
+//for this insanity. ICanvasItem and stuff is all
+//in Rectangle until that bug is fixed in GDC.
+
+
+
+/+
+
-debug(logging) import tango.util.log.Trace;//Thread safe console output.
+
+import tango.util.collection.LinkSeq;
-
-import shiraz.ui.Animator;
-import shiraz.canvas.Point;
-
+
+
+
+
+
+
-
-/*
@@ -169 +184 @@
-
-    void adjustTree();
+    
+    LinkSeq!(ICanvasItem) enclosureList( double tx, double ty, inout LinkSeq!(ICanvasItem) hit_items = null );
+    LinkSeq!(ICanvasItem) enclosureList( double tx, double ty, double tw, double th, inout LinkSeq!(ICanvasItem) hit_items = null );
+    bool mouseEvent( InputState input, bool bypass_hittest = false );
-
-//END HyperCube compatibility stuff for RTree:
-//*******************************************
-
+    char[] name();
+    char[] name(char[] set);
+
+    bool isSelected();
+    bool isSelected(bool set);
+
+    char[] toString();
-    
-    //Returns a newly allocated copy of this object.
@@ -261 +287 @@
-    
-    void add( Animator set_anim );
+    
+    //LinkSeq!(ICanvasItem) enclosureList( double tx, double ty, double tw, double th, inout LinkSeq!(ICanvasItem) hit_items = null );
-}
-
++/
+
+

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

@@ -22 +22 @@
-import Float = tango.text.convert.Float;
-
+import tango.core.Signal;
+import tango.util.collection.LinkSeq;
-
-version(sdl)
@@ -38 +40 @@
-
-import shiraz.canvas.ICanvasItem;
+import shiraz.canvas.PlainRectangle;
-import shiraz.canvas.Image;
+import shiraz.canvas.Bezier;
-import shiraz.ui.Animator;
+import shiraz.ui.InputState;
-import shiraz.canvas.Point;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/*
@@ -67 +414 @@
-unittest
-{
-
-
-Rectangle rect = new 
-Rectangle rect = new 
+Plain
+
+PlainRectangle rect = new Plain
+PlainRectangle rect = new Plain
-    Trace.formatln("rect: {}", rect.toString() );
-    rect.setXYWH( 0.0, 0.0, 1.0, 1.0 );
@@ -146 +493 @@
-
-//class ICanvasItem : public ICanvasItem //TODO
-
+Plain
-{
-public:
@@ -156 +503 @@
-    this(Point p1, Point p2)
-    {
-Rectangle) Trace.formatln("
-Rectangle) scope(exit) Trace.formatln("
+PlainRectangle) Trace.formatln("Plain
+PlainRectangle) scope(exit) Trace.formatln("Plain
-        //super();
-
-
-
-
+Plain
+
+Plain
-
-        for (int i = 0; i < p1.getDimension(); i++)
-        {
-
+Plain
-        }
-
@@ -217 +564 @@
-
-    /**
-
+Plain
-    * object (or vice versa), it returns true.
-    *
-
+Plain
-    */
-    bool intersection(ICanvasItem rect)
-    {
-Rectangle.intersection(..) : 
-
-Rectangle.intersection(..) : 
+PlainRectangle.intersection(..) : Plain
+
+PlainRectangle.intersection(..) : Plain
-        /*
-        bool intersect = true;
@@ -241 +588 @@
-        //return isOverlap( h );//I guess this is the same thing as the above???
-        
-Rectangle) Trace.formatln("Rectangle.isOverlap(
+PlainRectangle) Trace.formatln("PlainRectangle.isOverlap(Plain
-        /*
-        //This version thinks that if they are equal they overlap.
@@ -267 +614 @@
-
-    /**
-
+Plain
-    * as this object, it is considered to be inside.
-    *
@@ -275 +622 @@
-    {
-        //if (h is null)
-Rectangle.enclosure(..) : 
+PlainRectangle.enclosure(..) : Plain
-
-        //if (h.getDimension() != getDimension()) throw new
-Rectangle.enclosure(..) : 
+PlainRectangle.enclosure(..) : Plain
-
-        /*bool inside = true;
@@ -365 +712 @@
-
-    /**
-
-
+Plain
+Plain
-    *
-    * @return True if <B>p</B> is inside, false otherwise.
@@ -373 +720 @@
-    {
-        if (p is null) throw new
-
+Plain
-
-        if (p.getDimension() != getDimension()) throw new
-Rectangle.enclosure(Point p) Error: Point dimension is different from 
-
-
+PlainRectangle.enclosure(Point p) Error: Point dimension is different from Plain
+
+Plain
-    }
-
-    /**
-
+Plain
-    *
-    * Below, all possible situations are depicted.
@@ -393 +740 @@
-    *     -------   -------      ---------   ---------      ------         ------
-    *
-
+Plain
-    * @return Area of intersecting region.
-    */
-    float intersectingArea(ICanvasItem h)
-    {
-
+Plain
-        //defined differently than the HyperCubes... Let's make a
-        //unittest.
@@ -461 +808 @@
-    static ICanvasItem getUnionMbb(ICanvasItem[] a)
-    {
-Rectangle) Trace.formatln("Rectangle.getUnionMbb(
-Rectangle) scope(exit) Trace.formatln("Rectangle.getUnionMbb(
+PlainRectangle) Trace.formatln("PlainRectangle.getUnionMbb(Plain
+PlainRectangle) scope(exit) Trace.formatln("PlainRectangle.getUnionMbb(Plain
-        
-        if (a is null || a.length == 0) throw new
-Rectangle.getUnionMbb(Rectangle a[]) : 
-
-
-Rectangle h = new 
-
-
-
-Rectangle.getUnionMbb(
-Rectangle.getUnionMbb(
-Rectangle.getUnionMbb(
+PlainRectangle.getUnionMbb(PlainRectangle a[]) : Plain
+
+Plain
+PlainRectangle h = new Plain
+
+Plain
+
+PlainRectangle.getUnionMbb(Plain
+PlainRectangle.getUnionMbb(Plain
+PlainRectangle.getUnionMbb(Plain
-        }*/
-
@@ -481 +828 @@
-            if(a[i] is null) Trace.formatln("a[i] is null i:", i);
-            //h = cast(PlainRectangle) h.getUnionMbb(a[i]);
-
+Plain
-        }
-        
@@ -488 +835 @@
-
-    /**
-Rectangle representing the mbb of the union of this 
+PlainRectangle representing the mbb of the union of this Plain
-    *
-Rectangle that we want to union with this 
-
+PlainRectangle that we want to union with this Plain
+Plain
-    */
-    public ICanvasItem getUnionMbb(ICanvasItem h)
-    {
-        if (h is null)
-Rectangle.getUnionMbb(Rectangle h) : 
-
-
+PlainRectangle.getUnionMbb(PlainRectangle h) : Plain
+
+Plain
-
-        //if (h.getDimension() != getDimension())
-Rectangle.getUnionMbb(
+PlainRectangle.getUnionMbb(Plain
-
-        float[2] min;// = new float[2];//getDimension()];//2
@@ -519 +866 @@
-
-        //PlainRectangle reslt = new PlainRectangle();
-Rectangle reslt = new 
+PlainRectangle reslt = new Plain
-        reslt.setXYXY( min[0], min[1], max[0], max[1] );
-
-
+Plain
-    }
-
-    /**
-
+Plain
-    *
-    * @return The area as a float.
@@ -550 +897 @@
-    {
-        if (p is null) throw new
-
+Plain
-
-        if (p.getDimension() != getDimension()) throw new
-Rectangle.getMinDist(Point p) Error: Point dimension is different from 
+PlainRectangle.getMinDist(Point p) Error: Point dimension is different from Plain
-
-        float ret = 0;
@@ -575 +922 @@
-    //ICanvasItem clone()//Object clone()
-    //{
-
+Plain
-    //}
-
@@ -584 +931 @@
-        debug(RTree)
-        {
-Stdout("CanvasItemAbstract.rtreeNode(Node set) This item:
-Stdout(" new rtreeNode: 
+Trace.formatln("CanvasItemAbstract.rtreeNode(Node set) This item:{}
+Trace.formatln(" new rtreeNode: {}
-        }
-        return m_rtreeNode;
@@ -633 +980 @@
-        }
-
-
+/*
-        {
-            debug(AdjustTree) Stdout("CanvasItemAbstract.adjustTree() going to call parent.adjustTree().");
@@ -640 +987 @@
-        }
-        else debug(AdjustTree) Stdout("CanvasItemAbstract.adjustTree() Didn't have a parent.");
+        */
-
-        debug(AdjustTree) Stdout("CanvasItemAbstract.adjustTree() END.").newline;
-    }
+
+
+LinkSeq!(ICanvasItem) enclosureList( double tx, double ty, inout LinkSeq!(ICanvasItem) hit_items = null )
+{
+    return enclosureList( tx, ty, 0.0, 0.0, hit_items );
+}
+
+LinkSeq!(ICanvasItem) enclosureList( double tx, double ty, double tw, double th, inout LinkSeq!(ICanvasItem) hit_items = null )
+{
+    throw new Exception("PlainRectangle.enclosureList(...) is not implemented.");
+    return null;
+}
+
+bool mouseEvent( InputState input, bool bypass_hittest = false )
+{
+    throw new Exception("PlainRectangle.mouseEvent(...) is not implemented.");
+    return false;
+}
-
-//End hypercube compatibility stuff.
-//********************************************
-
+
+
-    this()
-    {
-Rectangle) Trace.formatln("
-Rectangle) scope(exit) Trace.formatln("
+PlainRectangle) Trace.formatln("Plain
+PlainRectangle) scope(exit) Trace.formatln("Plain
-        
-        colour( 1.0f, 1.0f, 1.0f, 1.0f );
@@ -658 +1026 @@
-    this( float sx1, float sy1, float sx2, float sy2 )
-    {
-Rectangle) Trace.formatln("
-Rectangle) scope(exit) Trace.formatln("
+PlainRectangle) Trace.formatln("Plain
+PlainRectangle) scope(exit) Trace.formatln("Plain
-        
-        /*
@@ -679 +1047 @@
-    this( float set_pos_x, float set_pos_y, float six1, float siy1, float six2, float siy2 )
-    {
-Rectangle) Trace.formatln("
-Rectangle) scope(exit) Trace.formatln("
+PlainRectangle) Trace.formatln("Plain
+PlainRectangle) scope(exit) Trace.formatln("Plain
-        
-        _xPos = set_pos_x;
@@ -705 +1073 @@
-    }
-    
-
+Plain
-    {
-        _xPos = setme.xPos;
@@ -725 +1093 @@
-    ICanvasItem dup()
-    {
-
+Plain
-    }
-    
@@ -757 +1125 @@
-    //name
-    
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    //Position
@@ -791 +1169 @@
-    //drawn. This is usually 0.0 in Shiraz. It doesn't reflect
-    //which of the objects is topmost.
-r
+PlainR
-    //is drawn. It could be different than zPos, but usually
-    //it's just 0.0. Maybe it is redundant? I don't know yet.
@@ -823 +1201 @@
-        else glDisable(GL_TEXTURE_2D);
-    
-
+Plain
-        glPushMatrix();
-            applyPosition();
@@ -899 +1277 @@
-    }
-    
-
+Plain
-    void add( Animator a_anim )
-    {
@@ -925 +1303 @@
-
-    //LinkSeq!(RectangleMesh) m_mesh; //How about something like this later on...
-
+Plain
-    //could do something like this.
-
@@ -969 +1347 @@
-    bool enclosure( float tx, float ty )
-    {
-Rectangle) Trace.formatln("
+PlainRectangle) Trace.formatln("Plain
-        
-        /*Trace.formatln("tx: ")(tx);
@@ -999 +1377 @@
-        */
-        
+        //These will translate the incoming coordinates
+        //into this widgets coordinates. It's the same
+        //as xp2i() in the old system.
-        tx -= xPos;
-        ty -= yPos;
@@ -1235 +1616 @@
-    protected float _iz = 0.0f;
-    
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+