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

[Nordholt <nor...@us...>]

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

Modified Files:
	View.java 
Log Message:
hit detection also returns globjects

Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.187
retrieving revision 1.188
diff -C2 -d -r1.187 -r1.188
*** View.java	15 Feb 2007 15:12:13 -0000	1.187
--- View.java	20 Feb 2007 15:16:38 -0000	1.188
***************
*** 2544,2547 ****
--- 2544,2556 ----
        }
      }
+     
+     if (glo != null && object == null && 
+         nearestGLO < nearestVertex &&
+         nearestGLO < nearestEdge &&
+         nearestGLO < nearestSurface) {
+       surface = null;
+       edge = null;
+       vertex = null;      
+     }
      if (intersections) {
        Transformation transformation = this.transformation();
***************
*** 2652,2655 ****
--- 2661,2666 ----
        } else if (surface != null) {
          return surface;
+       } else if (glo != null) {
+         return glo;
        }
      }
***************
*** 3265,3271 ****
      return glObjects3D.remove(glo);
    }
  
    /**
!    * Add a whole list of GLObject
     * @param glObjects The glObjects to add.
     */
--- 3276,3290 ----
      return glObjects3D.remove(glo);
    }
+   
+   /**
+    * remove a whole set of GLObject
+    * @param glObjects The glObjects to remove.
+    */
+   public void removeGlObjects3D(Set glObjects) {
+     this.glObjects3D.removeAll(glObjects);
+   }
  
    /**
!    * Add a whole set of GLObject
     * @param glObjects The glObjects to add.
     */