[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool DrawTool.java,1.1,1.2
Status: Pre-Alpha
Brought to you by:
henryml
From: rimestad <rim...@us...> - 2005-07-27 08:36:21
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16648 Modified Files: DrawTool.java Log Message: use equals instead of == Index: DrawTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/DrawTool.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DrawTool.java 26 Jul 2005 12:35:44 -0000 1.1 --- DrawTool.java 27 Jul 2005 08:36:12 -0000 1.2 *************** *** 46,61 **** */ protected void moved(MouseEvent e) { ! int x = e.getX(); ! int y = e.getY(); ! View v = glv.getView(); ! double[] coord = v.toCanvasCoords(new double[] {x, y}); ! ! coord = snapToGrid(coord); ! // snap to vertexes ! coord = aligned(coord); ! //check for snap point change ! checkVertexSnap(coord); ! //change the activeEdge according to mouse position ! changeTo(coord); } --- 46,63 ---- */ protected void moved(MouseEvent e) { ! if (view.getActiveEdge != null) { ! int x = e.getX(); ! int y = e.getY(); ! View v = glv.getView(); ! double[] coord = v.toCanvasCoords(new double[] {x, y}); ! ! coord = snapToGrid(coord); ! // snap to vertexes ! coord = aligned(coord); ! //check for snap point change ! checkVertexSnap(coord); ! //change the activeEdge according to mouse position ! changeTo(coord); ! } } *************** *** 154,158 **** glv.getView().setAlignVertex(null); } else { ! // we did end a edgelist endSurface(coord); } --- 156,160 ---- glv.getView().setAlignVertex(null); } else { ! // we did end a edgelist endSurface(coord); } *************** *** 179,194 **** */ protected Vertex vertexCollide(double[] coord) { - Set vertexes = VertexFacade.getInstance().findAll(); - Iterator it = vertexes.iterator(); Edge e = glv.getView().getActiveEdge(); ! while (it.hasNext()) { ! Vertex v = (Vertex)it.next(); ! if (collide(v.getX(), coord[0]) && ! collide(v.getY(), coord[1]) && ! collide(v.getZ(), coord[2]) && ! e != null && ! v != e.getTo() && ! v != e.getFrom()) { ! return v; } } --- 181,197 ---- */ protected Vertex vertexCollide(double[] coord) { Edge e = glv.getView().getActiveEdge(); ! if (e != null) { ! Set vertexes = VertexFacade.getInstance().findAll(); ! Iterator it = vertexes.iterator(); ! while (it.hasNext()) { ! Vertex v = (Vertex)it.next(); ! if (collide(v.getX(), coord[0]) && ! collide(v.getY(), coord[1]) && ! collide(v.getZ(), coord[2]) && ! !v.equals(e.getTo()) && ! !v.equals(e.getFrom())) { ! return v; ! } } } *************** *** 216,220 **** View view = glv.getView(); Edge e = view.getActiveEdge(); ! if (v != null && v != view.getActiveEdge().getTo() && v != view.getActiveEdge().getFrom()) { view.setAlignVertex(v); view.setSnapVertex(v); --- 219,223 ---- View view = glv.getView(); Edge e = view.getActiveEdge(); ! if (v != null && !v.equals(e.getTo()) && !v.equals(e.getFrom())) { view.setAlignVertex(v); view.setSnapVertex(v); |