[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java,1.34,1.35 PencilTool
Status: Pre-Alpha
Brought to you by:
henryml
Menu
▾
▴
[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java,1.34,1.35 PencilTool.java,1.48,1.49 MoveTool.java,1.18,1.19 ExtrudeTool.java,1.1,1.2 TapeMeasureTool.java,1.3,1.4 ExtrusionTool.java,1.33,1.34 CameraTool.java,1.2,1.3
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27500/src/net/sourceforge/bprocessor/gl/tool Modified Files: AbstractTool.java PencilTool.java MoveTool.java ExtrudeTool.java TapeMeasureTool.java ExtrusionTool.java CameraTool.java Log Message: Changed to reflect to changes to view Index: ExtrudeTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtrudeTool.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExtrudeTool.java 5 Dec 2005 07:56:50 -0000 1.1 --- ExtrudeTool.java 12 Dec 2005 14:33:22 -0000 1.2 *************** *** 12,18 **** import net.sourceforge.bprocessor.gl.GLView; - import net.sourceforge.bprocessor.gl.view.AbstractView; - import net.sourceforge.bprocessor.gl.view.Transformation; import net.sourceforge.bprocessor.gl.view.View; import net.sourceforge.bprocessor.model.Edge; import net.sourceforge.bprocessor.model.Plane; --- 12,17 ---- import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gl.view.View; + import net.sourceforge.bprocessor.gl.view.Transformation; import net.sourceforge.bprocessor.model.Edge; import net.sourceforge.bprocessor.model.Plane; *************** *** 72,76 **** Transformation trans = view.transformation(); double x = prevX; ! double y = AbstractView.getHeight() - prevY; Vertex near = new Vertex("near", x, y, 0.0); Vertex far = new Vertex("far", x, y, 1.0); --- 71,75 ---- Transformation trans = view.transformation(); double x = prevX; ! double y = View.getHeight() - prevY; Vertex near = new Vertex("near", x, y, 0.0); Vertex far = new Vertex("far", x, y, 1.0); Index: MoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/MoveTool.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** MoveTool.java 25 Nov 2005 17:48:08 -0000 1.18 --- MoveTool.java 12 Dec 2005 14:33:22 -0000 1.19 *************** *** 9,13 **** import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gl.model.ClippingPlane; ! import net.sourceforge.bprocessor.gl.view.AbstractView; import net.sourceforge.bprocessor.gl.view.Transformation; --- 9,13 ---- import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gl.model.ClippingPlane; ! import net.sourceforge.bprocessor.gl.view.View; import net.sourceforge.bprocessor.gl.view.Transformation; *************** *** 169,173 **** Transformation trans = glv.getView().transformation(); double x = previousX; ! double y = AbstractView.getHeight() - previousY; Vertex near = new Vertex("near", x, y, 0.0); Vertex far = new Vertex("far", x, y, 1.0); --- 169,173 ---- Transformation trans = glv.getView().transformation(); double x = previousX; ! double y = View.getHeight() - previousY; Vertex near = new Vertex("near", x, y, 0.0); Vertex far = new Vertex("far", x, y, 1.0); Index: CameraTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/CameraTool.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CameraTool.java 1 Dec 2005 15:56:57 -0000 1.2 --- CameraTool.java 12 Dec 2005 14:33:22 -0000 1.3 *************** *** 9,13 **** import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gl.view.View; ! import net.sourceforge.bprocessor.gl.view.View3D; import net.sourceforge.bprocessor.model.Geometry; import net.sourceforge.bprocessor.model.Plane; --- 9,13 ---- import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gl.view.View; ! import net.sourceforge.bprocessor.model.Camera; import net.sourceforge.bprocessor.model.Geometry; import net.sourceforge.bprocessor.model.Plane; *************** *** 81,89 **** protected void dragged(MouseEvent e) { View view = glv.getView(); if ((e.getModifiersEx() & MouseEvent.BUTTON2_DOWN_MASK) == MouseEvent.BUTTON2_DOWN_MASK || e.getButton() == MouseEvent.BUTTON2) { glv.setCursor(dragCursor); ! double[] center = ((View3D)view).getCenter(); ! double[] camera = ((View3D)view).getCamera(); Vertex first = view.toPlaneCoords(new double[] {previousPos[0], previousPos[1]}, --- 81,92 ---- protected void dragged(MouseEvent e) { View view = glv.getView(); + Camera c = view.getCamera(); + double[] center = c.getCenter(); + double[] camera = c.getCamera(); + double[] roll = c.getRoll(); if ((e.getModifiersEx() & MouseEvent.BUTTON2_DOWN_MASK) == MouseEvent.BUTTON2_DOWN_MASK || e.getButton() == MouseEvent.BUTTON2) { glv.setCursor(dragCursor); ! Vertex first = view.toPlaneCoords(new double[] {previousPos[0], previousPos[1]}, *************** *** 96,109 **** (camera[1] - center[1]), (camera[2] - center[2]), 0)); ! view.translate(new double[] {first.getX() - second.getX(), first.getY() - second.getY(), first.getZ() - second.getZ()}); } else if ((e.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) == MouseEvent.BUTTON1_DOWN_MASK || e.getButton() == MouseEvent.BUTTON1) { - View3D view2 = (View3D) view; double[] pivot = super.selectionCenter(); - double[] camera = view2.getCamera(); - double[] center = view2.getCenter(); - double[] roll = view2.getRoll(); double[] zero = new double[]{0, 0, 0}; --- 99,108 ---- (camera[1] - center[1]), (camera[2] - center[2]), 0)); ! c.translate(new double[] {first.getX() - second.getX(), first.getY() - second.getY(), first.getZ() - second.getZ()}); } else if ((e.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) == MouseEvent.BUTTON1_DOWN_MASK || e.getButton() == MouseEvent.BUTTON1) { double[] pivot = super.selectionCenter(); double[] zero = new double[]{0, 0, 0}; Index: ExtrusionTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtrusionTool.java,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** ExtrusionTool.java 11 Dec 2005 17:50:58 -0000 1.33 --- ExtrusionTool.java 12 Dec 2005 14:33:22 -0000 1.34 *************** *** 9,13 **** import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gl.view.View; - import net.sourceforge.bprocessor.gl.view.AbstractView; import net.sourceforge.bprocessor.gl.view.Transformation; --- 9,12 ---- *************** *** 184,188 **** Transformation trans = view.transformation(); double x = prevX; ! double y = AbstractView.getHeight() - prevY; Vertex near = new Vertex("near", x, y, 0.0); Vertex far = new Vertex("far", x, y, 1.0); --- 183,187 ---- Transformation trans = view.transformation(); double x = prevX; ! double y = View.getHeight() - prevY; Vertex near = new Vertex("near", x, y, 0.0); Vertex far = new Vertex("far", x, y, 1.0); Index: PencilTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/PencilTool.java,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** PencilTool.java 11 Dec 2005 13:33:14 -0000 1.48 --- PencilTool.java 12 Dec 2005 14:33:22 -0000 1.49 *************** *** 16,20 **** import net.sourceforge.bprocessor.gl.GLView; - import net.sourceforge.bprocessor.gl.view.AbstractView; import net.sourceforge.bprocessor.gl.view.Transformation; import net.sourceforge.bprocessor.gl.view.View; --- 16,19 ---- *************** *** 546,550 **** boolean snap = false; double x = event.getX(); ! double y = AbstractView.getHeight() - event.getY(); View v = glv.getView(); Transformation transformation = v.transformation(); --- 545,549 ---- boolean snap = false; double x = event.getX(); ! double y = View.getHeight() - event.getY(); View v = glv.getView(); Transformation transformation = v.transformation(); Index: AbstractTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** AbstractTool.java 6 Dec 2005 16:49:19 -0000 1.34 --- AbstractTool.java 12 Dec 2005 14:33:22 -0000 1.35 *************** *** 7,10 **** --- 7,11 ---- package net.sourceforge.bprocessor.gl.tool; + import net.sourceforge.bprocessor.model.Camera; import net.sourceforge.bprocessor.model.Edge; import net.sourceforge.bprocessor.model.Project; *************** *** 12,16 **** import net.sourceforge.bprocessor.model.Vertex; import net.sourceforge.bprocessor.gl.view.View; - import net.sourceforge.bprocessor.gl.view.View3D; import net.sourceforge.bprocessor.gl.GLView; --- 13,16 ---- *************** *** 99,107 **** public void mouseWheelMoved(MouseWheelEvent e) { int rotation = e.getWheelRotation(); ! View v = glv.getView(); if (rotation > 0) { ! v.zoomout(); } else { ! v.zoomin(); } glv.repaint(false); --- 99,107 ---- public void mouseWheelMoved(MouseWheelEvent e) { int rotation = e.getWheelRotation(); ! Camera cam = (glv.getView()).getCamera(); if (rotation > 0) { ! cam.zoomout(); } else { ! cam.zoomin(); } glv.repaint(false); *************** *** 114,118 **** */ public double[] selectionCenter() { ! double[] center = ((View3D)glv.getView()).getCenter(); Iterator it = selection.iterator(); if (it.hasNext()) { --- 114,118 ---- */ public double[] selectionCenter() { ! double[] center = (glv.getView()).getCamera().getCenter(); Iterator it = selection.iterator(); if (it.hasNext()) { *************** *** 136,152 **** */ public void keyPressed(KeyEvent e) { ! View v = glv.getView(); if (e.getKeyCode() == KeyEvent.VK_UP) { ! v.translate(new double[] {0.0, -1.0, 0.0}); } else if (e.getKeyCode() == KeyEvent.VK_DOWN) { ! v.translate(new double[] {0.0, 1.0, 0.0}); } else if (e.getKeyCode() == KeyEvent.VK_LEFT) { ! v.translate(new double[] {-1.0, 0.0, 0.0}); } else if (e.getKeyCode() == KeyEvent.VK_RIGHT) { ! v.translate(new double[] {1.0, 0.0, 0.0}); } else if (e.getKeyCode() == KeyEvent.VK_Z) { ! v.zoomout(); } else if (e.getKeyCode() == KeyEvent.VK_X) { ! v.zoomin(); } else if (e.getKeyCode() == KeyEvent.VK_Q) { glv.changeTool(Tool.SELECT_TOOL); --- 136,152 ---- */ public void keyPressed(KeyEvent e) { ! Camera c = glv.getView().getCamera(); if (e.getKeyCode() == KeyEvent.VK_UP) { ! c.translate(new double[] {0.0, -1.0, 0.0}); } else if (e.getKeyCode() == KeyEvent.VK_DOWN) { ! c.translate(new double[] {0.0, 1.0, 0.0}); } else if (e.getKeyCode() == KeyEvent.VK_LEFT) { ! c.translate(new double[] {-1.0, 0.0, 0.0}); } else if (e.getKeyCode() == KeyEvent.VK_RIGHT) { ! c.translate(new double[] {1.0, 0.0, 0.0}); } else if (e.getKeyCode() == KeyEvent.VK_Z) { ! c.zoomout(); } else if (e.getKeyCode() == KeyEvent.VK_X) { ! c.zoomin(); } else if (e.getKeyCode() == KeyEvent.VK_Q) { glv.changeTool(Tool.SELECT_TOOL); *************** *** 160,170 **** glv.changeTool(Tool.EXTRUSION_TOOL); } else if (e.getKeyCode() == KeyEvent.VK_F1) { ! glv.changeView(View.VIEW_3D); } else if (e.getKeyCode() == KeyEvent.VK_F2) { ! glv.changeView(View.VIEW_XZ); } else if (e.getKeyCode() == KeyEvent.VK_F3) { ! glv.changeView(View.VIEW_XY); } else if (e.getKeyCode() == KeyEvent.VK_F4) { ! glv.changeView(View.VIEW_YZ); } else if (e.getKeyCode() == KeyEvent.VK_F5) { glv.getView().changeDrawMode(View.WIREFRAME_MODE); --- 160,170 ---- glv.changeTool(Tool.EXTRUSION_TOOL); } else if (e.getKeyCode() == KeyEvent.VK_F1) { ! glv.changeCamera(Camera.create(Camera.VIEW_3D)); } else if (e.getKeyCode() == KeyEvent.VK_F2) { ! glv.changeCamera(Camera.create(Camera.VIEW_XZ)); } else if (e.getKeyCode() == KeyEvent.VK_F3) { ! glv.changeCamera(Camera.create(Camera.VIEW_XY)); } else if (e.getKeyCode() == KeyEvent.VK_F4) { ! glv.changeCamera(Camera.create(Camera.VIEW_YZ)); } else if (e.getKeyCode() == KeyEvent.VK_F5) { glv.getView().changeDrawMode(View.WIREFRAME_MODE); *************** *** 202,206 **** AbstractTool.dy = y - pressPos[1]; - View v = glv.getView(); dragged(e); --- 202,205 ---- Index: TapeMeasureTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/TapeMeasureTool.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TapeMeasureTool.java 5 Dec 2005 17:26:37 -0000 1.3 --- TapeMeasureTool.java 12 Dec 2005 14:33:22 -0000 1.4 *************** *** 17,21 **** import net.sourceforge.bprocessor.gl.view.Transformation; - import net.sourceforge.bprocessor.gl.view.AbstractView; import net.sourceforge.bprocessor.gl.view.View; import net.sourceforge.bprocessor.gl.GLView; --- 17,20 ---- *************** *** 125,129 **** edgeNormal.scale(1 / edgeNormal.length()); double x = e.getX(); ! double y = AbstractView.getHeight() - e.getY(); View v = glv.getView(); Transformation transformation = v.transformation(); --- 124,128 ---- edgeNormal.scale(1 / edgeNormal.length()); double x = e.getX(); ! double y = View.getHeight() - e.getY(); View v = glv.getView(); Transformation transformation = v.transformation(); *************** *** 180,184 **** double x = e.getX(); ! double y = AbstractView.getHeight() - e.getY(); Transformation transformation = v.transformation(); Vertex near = new Vertex("near", x, y, 0.0); --- 179,183 ---- double x = e.getX(); ! double y = View.getHeight() - e.getY(); Transformation transformation = v.transformation(); Vertex near = new Vertex("near", x, y, 0.0); |
