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

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

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

Modified Files:
	AbstractPencil.java 
Log Message:
Small improvement to shift-locking mechanism in AbstractPencil

Index: AbstractPencil.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractPencil.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** AbstractPencil.java	20 Jul 2006 11:08:39 -0000	1.45
--- AbstractPencil.java	20 Jul 2006 11:33:16 -0000	1.46
***************
*** 117,122 ****
                            planeNormal.getZ() *  start.vertex().getZ()));
        if (!constrain) {
!         locked = start.vertex().minus(current.vertex());
!         locked.normalize();
        }
      }
--- 117,126 ----
                            planeNormal.getZ() *  start.vertex().getZ()));
        if (!constrain) {
!         if (current.type() == Intersection.EDGE) {
!           locked = start.vertex().minus(current.vertex());
!           locked.normalize();
!         } else {
!           locked = null;
!         }
        }
      }
***************
*** 129,133 ****
        (Intersection) glv.getView().getObjectAtPoint(e.getX(), e.getY(),
                                                      unwanted, true, plane);
!     if (constrain) {
        intersection = lockedIntersection(intersection);
      }    
--- 133,137 ----
        (Intersection) glv.getView().getObjectAtPoint(e.getX(), e.getY(),
                                                      unwanted, true, plane);
!     if (constrain && locked != null) {
        intersection = lockedIntersection(intersection);
      }