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

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

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

Modified Files:
	View.java 
Log Message:
A little progress on final move
Improved handling of ignored geometry in hitdetection: Cannot click through a surface

Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.207
retrieving revision 1.208
diff -C2 -d -r1.207 -r1.208
*** View.java	8 May 2007 08:26:15 -0000	1.207
--- View.java	9 May 2007 08:33:27 -0000	1.208
***************
*** 2477,2481 ****
          Object current = getName(id);
  
!         if (!unWantedEntities.contains(current)) {
            if (current instanceof Surface) {
              if (near < nearestSurface) {
--- 2477,2481 ----
          Object current = getName(id);
  
!         if ((current instanceof Surface) || !unWantedEntities.contains(current)) {
            if (current instanceof Surface) {
              if (near < nearestSurface) {
***************
*** 2525,2528 ****
--- 2525,2531 ----
      }
  
+     
+     
+     
      if (surface != null) {
        // Test vertex and edge against surface
***************
*** 2544,2548 ****
      }
  
! 
  
      if (edge != null && vertex != null) {
--- 2547,2555 ----
      }
  
!     if (surface != null) {
!       if (unWantedEntities.contains(surface)) {
!         surface = null;
!       }
!     }
  
      if (edge != null && vertex != null) {