[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool MoveTool.java,1.7,1.8
Status: Pre-Alpha
Brought to you by:
henryml
Menu
▾
▴
[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool MoveTool.java,1.7,1.8
|
From: Nordholt <nor...@us...> - 2005-09-06 13:40:19
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23262 Modified Files: MoveTool.java Log Message: small change Index: MoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/MoveTool.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MoveTool.java 2 Sep 2005 13:30:23 -0000 1.7 --- MoveTool.java 6 Sep 2005 13:40:10 -0000 1.8 *************** *** 130,135 **** int y = e.getY(); if (viewType == View.VIEW_3D) { ! double deltaX = x - lastX; ! double deltaY = y - lastY; double[] coords; if (selectedSurface != null) { --- 130,135 ---- int y = e.getY(); if (viewType == View.VIEW_3D) { ! double deltaX = ((double)(x - lastX)) / moveSpeed; ! double deltaY = ((double)(y - lastY)) / moveSpeed; double[] coords; if (selectedSurface != null) { *************** *** 138,152 **** Vertex v = (Vertex)l.get(i); if (moveMode == XY) { ! coords = new double[] {v.getX() + deltaX / moveSpeed, ! v.getY() - deltaY / moveSpeed, v.getZ() + 0}; updateVertex(v, coords); } else { ! coords = new double[] {v.getX() + deltaX / moveSpeed, v.getY() + 0, ! v.getZ() - deltaY / moveSpeed}; updateVertex(v, coords); } } Set innerSurfaces = selectedSurface.getInnerSurfaces(); if (innerSurfaces != null) { --- 138,153 ---- Vertex v = (Vertex)l.get(i); if (moveMode == XY) { ! coords = new double[] {v.getX() + deltaX, ! v.getY() - deltaY, v.getZ() + 0}; updateVertex(v, coords); } else { ! coords = new double[] {v.getX() + deltaX, v.getY() + 0, ! v.getZ() - deltaY}; updateVertex(v, coords); } } + Set innerSurfaces = selectedSurface.getInnerSurfaces(); if (innerSurfaces != null) { *************** *** 158,169 **** Vertex v = (Vertex)innerEdges.get(i); if (moveMode == XY) { ! coords = new double[] {v.getX() + deltaX / moveSpeed, ! v.getY() - deltaY / moveSpeed, v.getZ() + 0}; updateVertex(v, coords); } else { ! coords = new double[] {v.getX() + deltaX / moveSpeed, v.getY() + 0, ! v.getZ() - deltaY / moveSpeed}; updateVertex(v, coords); } --- 159,170 ---- Vertex v = (Vertex)innerEdges.get(i); if (moveMode == XY) { ! coords = new double[] {v.getX() + deltaX, ! v.getY() - deltaY, v.getZ() + 0}; updateVertex(v, coords); } else { ! coords = new double[] {v.getX() + deltaX, v.getY() + 0, ! v.getZ() - deltaY}; updateVertex(v, coords); } *************** *** 175,237 **** Vertex from = selectedEdge.getFrom(); if (moveMode == XY) { ! coords = new double[] {to.getX() + deltaX / moveSpeed, ! to.getY() - deltaY / moveSpeed, to.getZ() + 0}; updateVertex(to, coords); ! coords = new double[] {from.getX() + deltaX / moveSpeed, ! from.getY() - deltaY / moveSpeed, from.getZ() + 0}; updateVertex(from, coords); } else { ! coords = new double[] {to.getX() + deltaX / moveSpeed, to.getY() + 0, ! to.getZ() - deltaY / moveSpeed}; updateVertex(to, coords); ! coords = new double[] {from.getX() + deltaX / moveSpeed, from.getY() + 0, ! from.getZ() - deltaY / moveSpeed}; updateVertex(from, coords); } } ! } ! if (selectedVertex != null) { ! View view = glv.getView(); ! double[] coords = view.toCanvasCoords(new double[]{x, y}); ! coords = snapToGrid(coords); ! updateVertex(selectedVertex, coords); ! } else if (selectedSurface != null) { ! View view = glv.getView(); ! double[] coordsa = view.toCanvasCoords(new double[]{x, y}); ! double[] coordsb = view.toCanvasCoords(new double[]{lastX, lastY}); ! double[] delta = new double[] {coordsa[0] - coordsb[0], ! coordsa[1] - coordsb[1], ! coordsa[2] - coordsb[2]}; ! List l = Util.traverse(selectedSurface); ! for (int i = 0; i < l.size(); i++) { ! Vertex v = (Vertex)l.get(i); ! coordsa = new double[] {v.getX() + delta[0], ! v.getY() + delta[1], ! v.getZ() + delta[2]}; ! updateVertex(v, coordsa); } - } else if (selectedEdge != null) { - View view = glv.getView(); - double[] coordsa = view.toCanvasCoords(new double[]{x, y}); - double[] coordsb = view.toCanvasCoords(new double[]{lastX, lastY}); - double[] delta = new double[] {coordsa[0] - coordsb[0], - coordsa[1] - coordsb[1], - coordsa[2] - coordsb[2]}; - Vertex to = selectedEdge.getTo(); - Vertex from = selectedEdge.getFrom(); - - coordsa = new double[] {to.getX() + delta[0], - to.getY() + delta[1], - to.getZ() + delta[2]}; - updateVertex(to, coordsa); - coordsa = new double[] {from.getX() + delta[0], - from.getY() + delta[1], - from.getZ() + delta[2]}; - updateVertex(from, coordsa); } lastX = x; --- 176,239 ---- Vertex from = selectedEdge.getFrom(); if (moveMode == XY) { ! coords = new double[] {to.getX() + deltaX, ! to.getY() - deltaY, to.getZ() + 0}; updateVertex(to, coords); ! coords = new double[] {from.getX() + deltaX, ! from.getY() - deltaY, from.getZ() + 0}; updateVertex(from, coords); } else { ! coords = new double[] {to.getX() + deltaX, to.getY() + 0, ! to.getZ() - deltaY}; updateVertex(to, coords); ! coords = new double[] {from.getX() + deltaX, from.getY() + 0, ! from.getZ() - deltaY}; updateVertex(from, coords); } } ! } else { ! if (selectedVertex != null) { ! View view = glv.getView(); ! double[] coords = view.toCanvasCoords(new double[]{x, y}); ! coords = snapToGrid(coords); ! updateVertex(selectedVertex, coords); ! } else if (selectedSurface != null) { ! View view = glv.getView(); ! double[] coordsa = view.toCanvasCoords(new double[]{x, y}); ! double[] coordsb = view.toCanvasCoords(new double[]{lastX, lastY}); ! double[] delta = new double[] {coordsa[0] - coordsb[0], ! coordsa[1] - coordsb[1], ! coordsa[2] - coordsb[2]}; ! ! List l = Util.traverse(selectedSurface); ! for (int i = 0; i < l.size(); i++) { ! Vertex v = (Vertex)l.get(i); ! coordsa = new double[] {v.getX() + delta[0], ! v.getY() + delta[1], ! v.getZ() + delta[2]}; ! updateVertex(v, coordsa); ! } ! } else if (selectedEdge != null) { ! View view = glv.getView(); ! double[] coordsa = view.toCanvasCoords(new double[]{x, y}); ! double[] coordsb = view.toCanvasCoords(new double[]{lastX, lastY}); ! double[] delta = new double[] {coordsa[0] - coordsb[0], ! coordsa[1] - coordsb[1], ! coordsa[2] - coordsb[2]}; ! Vertex to = selectedEdge.getTo(); ! Vertex from = selectedEdge.getFrom(); ! coordsa = new double[] {to.getX() + delta[0], ! to.getY() + delta[1], ! to.getZ() + delta[2]}; ! updateVertex(to, coordsa); ! coordsa = new double[] {from.getX() + delta[0], ! from.getY() + delta[1], ! from.getZ() + delta[2]}; ! updateVertex(from, coordsa); } } lastX = x; |
