Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23632/src/net/sourceforge/bprocessor/gl/view
Modified Files:
View.java
Log Message:
Removed unused code from processselect
Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** View.java 2 May 2006 07:09:38 -0000 1.79
--- View.java 3 May 2006 07:19:36 -0000 1.80
***************
*** 1794,1802 ****
* @param intersections Are intersections wanted
* @param xy The default interseection plane
- * @param all Return all edges
* @return Selection
*/
private Object processSelect(Collection unWantedEntities,
! boolean intersections, Plane xy, boolean all) {
int bufferOffset = 0;
int names = 0;
--- 1794,1801 ----
* @param intersections Are intersections wanted
* @param xy The default interseection plane
* @return Selection
*/
private Object processSelect(Collection unWantedEntities,
! boolean intersections, Plane xy) {
int bufferOffset = 0;
int names = 0;
***************
*** 1978,1989 ****
return vertex;
} else if (edge != null) {
- if (all) {
- // FIXME this is a temporary hack to make move work
- List result = new LinkedList();
- result.add(edge);
- edges.remove(edge);
- result.addAll(edges);
- return result;
- }
return edge;
} else if (surface != null) {
--- 1977,1980 ----
***************
*** 1991,1995 ****
}
}
-
return null;
}
--- 1982,1985 ----
***************
*** 2017,2021 ****
glv.repaint(true);
! Object object = processSelect(unWantedEntities, intersections, xy, false);
clearNames();
return object;
--- 2007,2011 ----
glv.repaint(true);
! Object object = processSelect(unWantedEntities, intersections, xy);
clearNames();
return object;
***************
*** 2087,2117 ****
/**
- * Gets id of any Edges under a point. For use in selection.
- * @param x the x coordinate of the point in mouse coordinates
- * @param y the y coordinate of the point in mouse coordinates
- * @return The object under the point, null if no object is there
- */
- public List getEdgeAtPoint(double x, double y) {
- this.x = x;
- this.y = y;
-
- picking = 10;
- selectMode = EDGES;
- glv.repaint(true);
-
- List selection = new LinkedList();
- Object object = processSelect(new HashSet(), false, new Plane(0, 0, 1, 0), true);
- if (object != null) {
- if (object instanceof List) {
- selection = (List) object;
- } else {
- selection.add(object);
- }
- }
- clearNames();
- return selection;
- }
-
- /**
* Gets id of any Vertices under a point. For use in selection.
* @param x the x coordinate of the point in mouse coordinates
--- 2077,2080 ----
***************
*** 2128,2132 ****
List selection = new LinkedList();
! Object object = processSelect(new HashSet(), false, new Plane(0, 0, 1, 0), false);
if (object != null) {
selection.add(object);
--- 2091,2095 ----
List selection = new LinkedList();
! Object object = processSelect(new HashSet(), false, new Plane(0, 0, 1, 0));
if (object != null) {
selection.add(object);
|
