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

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

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

Modified Files:
	View.java 
Log Message:
Improvements to hit-detection

Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.172
retrieving revision 1.173
diff -C2 -d -r1.172 -r1.173
*** View.java	20 Jan 2007 21:24:56 -0000	1.172
--- View.java	24 Jan 2007 22:42:58 -0000	1.173
***************
*** 850,854 ****
          Space current = active;
          while (current != null) {
!           edges.addAll(current.getEdges());
            current = current.getOwner();
          }
--- 850,860 ----
          Space current = active;
          while (current != null) {
!           if (current.isUnion()) {
!             Collection<Surface> surfaces = new LinkedList<Surface>();
!             current.collectSurfaces(surfaces);
!             edges.addAll(Surface.edges(surfaces));
!           } else {
!             edges.addAll(current.getEdges());
!           }
            current = current.getOwner();
          }
***************
*** 1997,2000 ****
--- 2003,2013 ----
      
      surfaces.addAll(space.getSurfaces());
+     
+     Collection<Space> elements = space.getElements();
+     for (Space element : elements) {
+       if (element.isUnion()) {
+         surfaces.addAll(element.getSurfaces());
+       }
+     }
      surfaces.addAll(tempSurfaces);