bprocessor-commit

[rimestad <rim...@us...>]

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14172/src/net/sourceforge/bprocessor/gl/tool

Modified Files:
	MoveTool.java SelectStrategy.java ConstructorTool.java 
	RotationTool.java ArcTool.java MultiExtrudeTool.java 
Log Message:
Renamed the constructor boolean in Edge to Strippled and the same with the get and set methods for it

Index: ConstructorTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ConstructorTool.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ConstructorTool.java	31 Jul 2006 11:25:57 -0000	1.8
--- ConstructorTool.java	3 Aug 2006 14:35:28 -0000	1.9
***************
*** 99,103 ****
        if (p2 != null) {
          Edge edge = new Edge(p1.vertex(), p2.vertex());
!         edge.setConstructor(true);
          constructors.add(edge);
          points.add(p2.vertex());
--- 99,103 ----
        if (p2 != null) {
          Edge edge = new Edge(p1.vertex(), p2.vertex());
!         edge.setStrippled(true);
          constructors.add(edge);
          points.add(p2.vertex());
***************
*** 105,109 ****
        if (current != null) {
          Edge edge = new Edge(p1.vertex(), current.vertex());
!         edge.setConstructor(true);
          constructors.add(edge);
        }
--- 105,109 ----
        if (current != null) {
          Edge edge = new Edge(p1.vertex(), current.vertex());
!         edge.setStrippled(true);
          constructors.add(edge);
        }

Index: ArcTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ArcTool.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ArcTool.java	31 Jul 2006 11:29:56 -0000	1.10
--- ArcTool.java	3 Aug 2006 14:35:29 -0000	1.11
***************
*** 103,108 ****
        v2.scale(10 / v2.length());
        Edge l2 = new Edge(m2.minus(v2), m2.add(v2));
!       l1.setConstructor(true);
!       l2.setConstructor(true);
        
        Edge inter = l1.intersection(l2);
--- 103,108 ----
        v2.scale(10 / v2.length());
        Edge l2 = new Edge(m2.minus(v2), m2.add(v2));
!       l1.setStrippled(true);
!       l2.setStrippled(true);
        
        Edge inter = l1.intersection(l2);
***************
*** 146,152 ****
            Edge side2 = new Edge(system.unTranslate(center), end);
            Edge side3 = new Edge(system.unTranslate(center), mid);
!           side1.setConstructor(true);
!           side2.setConstructor(true);
!           side3.setConstructor(true);
            edges.add(side1);
            edges.add(side2);
--- 146,152 ----
            Edge side2 = new Edge(system.unTranslate(center), end);
            Edge side3 = new Edge(system.unTranslate(center), mid);
!           side1.setStrippled(true);
!           side2.setStrippled(true);
!           side3.setStrippled(true);
            edges.add(side1);
            edges.add(side2);

Index: SelectStrategy.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectStrategy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SelectStrategy.java	21 Jun 2006 13:26:18 -0000	1.1
--- SelectStrategy.java	3 Aug 2006 14:35:28 -0000	1.2
***************
*** 63,73 ****
      this.glv = glv;
      e1 = new Edge();
!     e1.setConstructor(true);
      e2 = new Edge();
!     e2.setConstructor(true);
      e3 = new Edge();
!     e3.setConstructor(true);
      e4 = new Edge();
!     e4.setConstructor(true);
      
      box = new HashSet();
--- 63,73 ----
      this.glv = glv;
      e1 = new Edge();
!     e1.setStrippled(true);
      e2 = new Edge();
!     e2.setStrippled(true);
      e3 = new Edge();
!     e3.setStrippled(true);
      e4 = new Edge();
!     e4.setStrippled(true);
      
      box = new HashSet();

Index: MoveTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/MoveTool.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** MoveTool.java	21 Jul 2006 19:23:33 -0000	1.62
--- MoveTool.java	3 Aug 2006 14:35:28 -0000	1.63
***************
*** 239,243 ****
        super.updateConstructors();
        moveConstructor = new Edge(start.vertex(), current.vertex());
!       moveConstructor.setConstructor(true);
        Set constcopy = new HashSet();
        constcopy.addAll(constructors);
--- 239,243 ----
        super.updateConstructors();
        moveConstructor = new Edge(start.vertex(), current.vertex());
!       moveConstructor.setStrippled(true);
        Set constcopy = new HashSet();
        constcopy.addAll(constructors);

Index: RotationTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/RotationTool.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** RotationTool.java	6 Jun 2006 09:22:25 -0000	1.14
--- RotationTool.java	3 Aug 2006 14:35:28 -0000	1.15
***************
*** 113,117 ****
            prev = initial;
            Edge edge = new Edge(center, initial);
!           edge.setConstructor(true);
            guide.clear();
            guide.add(edge);
--- 113,117 ----
            prev = initial;
            Edge edge = new Edge(center, initial);
!           edge.setStrippled(true);
            guide.clear();
            guide.add(edge);
***************
*** 143,147 ****
      // make selection
      if (target != null && target instanceof Entity) {
!       if (target instanceof Edge && ((Edge)target).getConstructor()) {
          // If it is a constructor it should not be rotateable
          return;
--- 143,147 ----
      // make selection
      if (target != null && target instanceof Entity) {
!       if (target instanceof Edge && ((Edge)target).getStrippled()) {
          // If it is a constructor it should not be rotateable
          return;
***************
*** 274,282 ****
        parent = new Vertex(xr + center.getX(), yr + center.getY(), center.getZ());
        Edge e = new Edge(prev, parent);
!       e.setConstructor(true);
        zCircle.add(e);
      }
      Edge e = new Edge(parent, first);
!     e.setConstructor(true);
      zCircle.add(e);
      displayConstructors(zCircle);
--- 274,282 ----
        parent = new Vertex(xr + center.getX(), yr + center.getY(), center.getZ());
        Edge e = new Edge(prev, parent);
!       e.setStrippled(true);
        zCircle.add(e);
      }
      Edge e = new Edge(parent, first);
!     e.setStrippled(true);
      zCircle.add(e);
      displayConstructors(zCircle);
***************
*** 294,302 ****
        parent = new Vertex(center.getX(), yr + center.getY(), zr + center.getZ());
        e = new Edge(prev, parent);
!       e.setConstructor(true);
        xCircle.add(e);
      }
      e = new Edge(parent, first);
!     e.setConstructor(true);
      xCircle.add(e);
      displayConstructors(xCircle);
--- 294,302 ----
        parent = new Vertex(center.getX(), yr + center.getY(), zr + center.getZ());
        e = new Edge(prev, parent);
!       e.setStrippled(true);
        xCircle.add(e);
      }
      e = new Edge(parent, first);
!     e.setStrippled(true);
      xCircle.add(e);
      displayConstructors(xCircle);
***************
*** 314,322 ****
        parent = new Vertex(xr + center.getX(), center.getY(), zr + center.getZ());
        e = new Edge(prev, parent);
!       e.setConstructor(true);
        yCircle.add(e);
      }
      e = new Edge(parent, first);
!     e.setConstructor(true);
      yCircle.add(e);
      displayConstructors(yCircle);
--- 314,322 ----
        parent = new Vertex(xr + center.getX(), center.getY(), zr + center.getZ());
        e = new Edge(prev, parent);
!       e.setStrippled(true);
        yCircle.add(e);
      }
      e = new Edge(parent, first);
!     e.setStrippled(true);
      yCircle.add(e);
      displayConstructors(yCircle);

Index: MultiExtrudeTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/MultiExtrudeTool.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** MultiExtrudeTool.java	20 Jul 2006 13:46:42 -0000	1.20
--- MultiExtrudeTool.java	3 Aug 2006 14:35:29 -0000	1.21
***************
*** 122,126 ****
            normalCopy.scale(20);
            dir = new Edge(start.vertex().add(normalCopy), start.vertex().minus(normalCopy));
!           dir.setConstructor(true);
            glv.getView().changeColor(dir, new float[] {255f, 0, 0});
            planeinfo.add(dir);
--- 122,126 ----
            normalCopy.scale(20);
            dir = new Edge(start.vertex().add(normalCopy), start.vertex().minus(normalCopy));
!           dir.setStrippled(true);
            glv.getView().changeColor(dir, new float[] {255f, 0, 0});
            planeinfo.add(dir);
***************
*** 327,331 ****
        //super.updateConstructors();
        moveConstructor = new Edge(start.vertex(), current.vertex());
!       moveConstructor.setConstructor(true);
        LinkedList constCopy = new LinkedList();
        constCopy.add(moveConstructor);
--- 327,331 ----
        //super.updateConstructors();
        moveConstructor = new Edge(start.vertex(), current.vertex());
!       moveConstructor.setStrippled(true);
        LinkedList constCopy = new LinkedList();
        constCopy.add(moveConstructor);