[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AbstractPencil.java,1.18,1.19

[Michael L. <he...@us...>]

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

Modified Files:
	AbstractPencil.java 
Log Message:
Do not show the yellow line if parrallel to an axis since it is superfluous

Index: AbstractPencil.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractPencil.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** AbstractPencil.java	29 Mar 2006 21:52:51 -0000	1.18
--- AbstractPencil.java	30 Mar 2006 06:28:41 -0000	1.19
***************
*** 260,263 ****
--- 260,291 ----
    
    /**
+    * Test if an edge is parrallel with an axiz (x, y or z)
+    * @param edge The edge to test
+    * @return True if edge is parrallel to an axis
+    */
+   protected boolean isAxisAligned(Edge edge) {
+     Vertex vector = edge.getDirection();
+     {
+       Vertex cross = vector.cross(new Vertex(1, 0 , 0));
+       if (cross.isZero()) {
+         return true;
+       }
+     }
+     {
+       Vertex cross = vector.cross(new Vertex(0, 1 , 0));
+       if (cross.isZero()) {
+         return true;
+       }
+     }
+     {
+       Vertex cross = vector.cross(new Vertex(0, 0 , 1));
+       if (cross.isZero()) {
+         return true;
+       }
+     }
+     return false;
+   }
+   
+   /**
     * Update constructors based on start, current and incident.
     */
***************
*** 279,285 ****
            parrallel = new Edge(incident.vertex().minus(v), incident.vertex().add(v));
          }
!         parrallel.setConstructor(true);
!         glv.getView().changeColor(parrallel, new float[] {1, 1, 0});
!         constructors.add(parrallel);
        }
      }
--- 307,316 ----
            parrallel = new Edge(incident.vertex().minus(v), incident.vertex().add(v));
          }
!         
!         if (!isAxisAligned(parrallel)) {
!           parrallel.setConstructor(true);
!           glv.getView().changeColor(parrallel, new float[] {1, 1, 0});
!           constructors.add(parrallel);
!         }
        }
      }