Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16881/src/net/sourceforge/bprocessor/gl/tool
Modified Files:
MoveTool.java
Log Message:
Changed MoveTool to use Surface.move etc.
Index: MoveTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/MoveTool.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** MoveTool.java 7 Sep 2005 11:30:34 -0000 1.9
--- MoveTool.java 8 Sep 2005 10:50:09 -0000 1.10
***************
*** 20,24 ****
import java.util.List;
- import java.util.Set;
import java.util.Iterator;
--- 20,23 ----
***************
*** 149,183 ****
Object elm = it.next();
if (elm instanceof Vertex) {
! move((Vertex)elm, delta);
} else if (elm instanceof Edge) {
! move((Edge)elm, delta);
} else if (elm instanceof Surface) {
! move((Surface)elm, delta);
! }
! }
! }
!
! /**
! * Move the give surface and its inner surfaces
! * @param surface The surface to move
! * @param delta The movement
! */
! private void move(Surface surface, double[] delta) {
! log.info("moved surface");
! List l = Util.traverse(surface);
! double[] coords;
! for (int i = 0; i < l.size(); i++) {
! Vertex v = (Vertex)l.get(i);
! coords = new double[] {v.getX() + delta[0],
! v.getY() + delta[1],
! v.getZ() + delta[2]};
! updateVertex(v, coords);
! }
!
! Set innerSurfaces = surface.getInnerSurfaces();
! if (innerSurfaces != null) {
! Iterator innerIt = innerSurfaces.iterator();
! while (innerIt.hasNext()) {
! move((Surface)innerIt.next(), delta);
}
}
--- 148,156 ----
Object elm = it.next();
if (elm instanceof Vertex) {
! ((Vertex)elm).move(delta[0], delta[1], delta[2]);
} else if (elm instanceof Edge) {
! ((Edge)elm).move(delta[0], delta[1], delta[2]);
} else if (elm instanceof Surface) {
! ((Surface) elm).move(delta[0], delta[1], delta[2]);
}
}
***************
*** 185,219 ****
/**
- * Move the give edge
- * @param edge The surface to move
- * @param delta The movement
- */
- private void move(Edge edge, double[] delta) {
- Vertex to = edge.getTo();
- Vertex from = edge.getFrom();
-
- double[] coords = new double[] {to.getX() + delta[0],
- to.getY() + delta[1],
- to.getZ() + delta[2]};
- updateVertex(to, coords);
- coords = new double[] {from.getX() + delta[0],
- from.getY() + delta[1],
- from.getZ() + delta[2]};
- updateVertex(from, coords);
- }
-
- /**
- * Move the give vertex
- * @param vertex The surface to move
- * @param delta The movement
- */
- private void move(Vertex vertex, double[] delta) {
- double[] coords = new double[] {vertex.getX() + delta[0],
- vertex.getY() + delta[1],
- vertex.getZ() + delta[2]};
- updateVertex(vertex, coords);
- }
-
- /**
* Invoked when a key has been pressed. Lets user control the speed
* and mode of movement.
--- 158,161 ----
|
