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

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

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

Modified Files:
	AbstractPencil.java 
Log Message:
Improved hit-detection in element-editing

Index: AbstractPencil.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractPencil.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** AbstractPencil.java	18 Aug 2006 08:24:16 -0000	1.59
--- AbstractPencil.java	24 Aug 2006 09:19:09 -0000	1.60
***************
*** 181,188 ****
        Space space = Project.getInstance().getActiveSpace();
        Vertex v = intersection.vertex();
!       Set vertices = space.findByLocation(v.getX(), v.getY(), v.getZ(), 0.0000001);
!       if (!vertices.isEmpty()) {
!         v = (Vertex) vertices.iterator().next();
!         intersection = new Intersection(v, Intersection.VERTEX, v);
        }
      }
--- 181,197 ----
        Space space = Project.getInstance().getActiveSpace();
        Vertex v = intersection.vertex();
!       if (intersection.type() == Intersection.VERTEX) {
!         if (v.getOwner() != space) {
!           intersection = new Intersection(v.copy(), Intersection.EDGE_INTERSECTION, null);
!         }
!       }
!       
!       v = intersection.vertex();
!       if (v.getOwner() != space) {
!         Set vertices = space.findByLocation(v.getX(), v.getY(), v.getZ(), 0.0000001);
!         if (!vertices.isEmpty()) {
!           v = (Vertex) vertices.iterator().next();
!           intersection = new Intersection(v, Intersection.VERTEX, v);
!         }
        }
      }