[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view View.java, 1.265, 1.266

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

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

Modified Files:
	View.java 
Log Message:
fixes related to using the facade modellor

Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.265
retrieving revision 1.266
diff -C2 -d -r1.265 -r1.266
*** View.java	30 Nov 2007 15:33:06 -0000	1.265
--- View.java	2 Dec 2007 12:02:04 -0000	1.266
***************
*** 1269,1287 ****
      Collection<Edge> edges = new HashSet<Edge>();
      
-     /* --- Selection buffer contains ---
-      * [0] number of names on names stack = n_0
-      * [1] minimum z value
-      * [2] maximum z value
-      * [3] top of names stack
-      * .
-      * .
-      * .
-      * [n_0+2] bottom of names stack
-      * [n_0+3] number of names on names stack for this record = n_1
-      * [n_0+4] minimum z value
-      * .
-      * .
-      * .
-      * */    
      for (int i = 0; i < hits; i++) { 
        names = selectBuffer.get(bufferOffset);
--- 1269,1272 ----
***************
*** 1383,1409 ****
      }
  
-     // Set the last surface pointed at:
-     // If pointing at something different than a surface then dont
-     // change the lastSurface pointed at.
-     // This makes it possible to find the intersection between an
-     // edge and a surface even when the edge belongs to some other
-     // surface.
-     // Surface may be null in which
-     // case the lastSurface pointed at will be cleared (happens when pointing
-     // into empty space.
      if (object == null && vertex == null && edge == null) {
        setLastSurface(surface);
      }
! 
!     // If lastsurface is null, then use the surface currently under
!     // any other object pointed at. Surface may be null in which
!     // case the lastSurface pointed at will be cleared (happens when pointing
!     // into empty space.
      if (lastSurface == null) {
        setLastSurface(surface);
      }
! 
!     // If an construction edge is hit, see if there is a real edge
!     // coincident with the construction-edge.
      if (edge != null) {
        edges.remove(edge);
--- 1368,1379 ----
      }
  
      if (object == null && vertex == null && edge == null) {
        setLastSurface(surface);
      }
!     
      if (lastSurface == null) {
        setLastSurface(surface);
      }
!     
      if (edge != null) {
        edges.remove(edge);