[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool CameraFlyTool.java, 1.6, 1.7 Rotation
Status: Pre-Alpha
Brought to you by:
henryml
Menu
▾
▴
[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool CameraFlyTool.java, 1.6, 1.7 RotationTool.java, 1.17, 1.18 MultiExtrudeTool.java, 1.21, 1.22 CameraWalkTool.java, 1.4, 1.5
|
From: Michael L. <he...@us...> - 2006-09-07 13:35:29
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31065/src/net/sourceforge/bprocessor/gl/tool Modified Files: CameraFlyTool.java RotationTool.java MultiExtrudeTool.java CameraWalkTool.java Log Message: Renamed keyPressed to key Index: CameraWalkTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/CameraWalkTool.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CameraWalkTool.java 11 Feb 2006 17:22:17 -0000 1.4 --- CameraWalkTool.java 7 Sep 2006 13:35:19 -0000 1.5 *************** *** 75,79 **** * @param e The KeyEvent */ ! public void keyPressed(KeyEvent e) { Camera c = Project.getInstance().getCurrentCamera(); Vertex up = new Vertex(c.getRoll()[0], c.getRoll()[1], c.getRoll()[2]); --- 75,79 ---- * @param e The KeyEvent */ ! public void key(KeyEvent e) { Camera c = Project.getInstance().getCurrentCamera(); Vertex up = new Vertex(c.getRoll()[0], c.getRoll()[1], c.getRoll()[2]); *************** *** 94,99 **** } else if (e.getKeyCode() == KeyEvent.VK_RIGHT) { c.translate(new double[] {-sidewards.getX(), -sidewards.getY(), 0}); - } else { - super.keyPressed(e); } Project.getInstance().changed(c); --- 94,97 ---- Index: CameraFlyTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/CameraFlyTool.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CameraFlyTool.java 11 Feb 2006 17:22:17 -0000 1.6 --- CameraFlyTool.java 7 Sep 2006 13:35:19 -0000 1.7 *************** *** 75,79 **** * @param e The KeyEvent */ ! public void keyPressed(KeyEvent e) { Camera c = Project.getInstance().getCurrentCamera(); Vertex up = new Vertex(c.getRoll()[0], c.getRoll()[1], c.getRoll()[2]); --- 75,79 ---- * @param e The KeyEvent */ ! public void key(KeyEvent e) { Camera c = Project.getInstance().getCurrentCamera(); Vertex up = new Vertex(c.getRoll()[0], c.getRoll()[1], c.getRoll()[2]); *************** *** 94,99 **** } else if (e.getKeyCode() == KeyEvent.VK_RIGHT) { c.translate(new double[] {-sidewards.getX(), -sidewards.getY(), -sidewards.getZ()}); - } else { - super.keyPressed(e); } Project.getInstance().changed(c); --- 94,97 ---- Index: MultiExtrudeTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/MultiExtrudeTool.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** MultiExtrudeTool.java 3 Aug 2006 14:35:29 -0000 1.21 --- MultiExtrudeTool.java 7 Sep 2006 13:35:19 -0000 1.22 *************** *** 9,13 **** import java.awt.Cursor; - import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.awt.event.MouseEvent; --- 9,12 ---- *************** *** 428,512 **** } } - - /** - * Invoked when a key has been pressed. - * @param e The KeyEvent - */ - public void keyPressed(KeyEvent e) { - /*a length can only be typed in if some surface is selected - for extrusion, and if the "number"-variable has been initialised - */ - if ((e.getModifiersEx() & KeyEvent.CTRL_DOWN_MASK) == KeyEvent.CTRL_DOWN_MASK) { - controlled = !controlled; - log.info("Controlle pressed"); - } - if ((e.getModifiersEx() & KeyEvent.ALT_DOWN_MASK) == KeyEvent.ALT_DOWN_MASK) { - extrudeAll = false; - log.info("Alt pressed"); - } - super.keyPressed(e); - } - - /** - * Invoked when a key has been pressed. - * @param e The KeyEvent - */ - public void keyReleased(KeyEvent e) { - /*a length can only be typed in if some surface is selected - for extrusion, and if the "number"-variable has been initialised - */ - if ((e.getModifiersEx() & KeyEvent.ALT_DOWN_MASK) == KeyEvent.ALT_DOWN_MASK) { - extrudeAll = true; - log.info("Alt pressed"); - } - super.keyPressed(e); - } } - // } else if (e.getKeyCode() == KeyEvent.VK_2) { - // number += "2"; - // } else if (e.getKeyCode() == KeyEvent.VK_3) { - // number += "3"; - // } else if (e.getKeyCode() == KeyEvent.VK_4) { - // number += "4"; - // } else if (e.getKeyCode() == KeyEvent.VK_5) { - // number += "5"; - // } else if (e.getKeyCode() == KeyEvent.VK_6) { - // number += "6"; - // } else if (e.getKeyCode() == KeyEvent.VK_7) { - // number += "7"; - // } else if (e.getKeyCode() == KeyEvent.VK_8) { - // number += "8"; - // } else if (e.getKeyCode() == KeyEvent.VK_9) { - // number += "9"; - // } else if (e.getKeyCode() == KeyEvent.VK_0) { - // number += "0"; - // } else if (e.getKeyCode() == KeyEvent.VK_MINUS) { - // if (number.equals("")) { - // number += "-"; - // } - // } else if (e.getKeyCode() == KeyEvent.VK_ENTER) { - // if (!number.equals("")) { - // double length = glv.getLength(); - // apply(length); - // glv.repaint(); - // number = ""; - // } - // } else if (e.getKeyCode() == KeyEvent.VK_BACK_SPACE) { - // int length = number.length(); - // if (length > 0) { - // number = number.substring(0, length - 1); - // } - // } - // } - // - // if (number.equals("") || number.equals("-")) { - // glv.setLength(0); - // } else { - // try { - // double d = Double.parseDouble(number); - // glv.setLength(d / 1000); - // } catch (NumberFormatException exp) { - // System.out.println(exp); - // } - // } - --- 427,429 ---- Index: RotationTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/RotationTool.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** RotationTool.java 28 Aug 2006 05:53:53 -0000 1.17 --- RotationTool.java 7 Sep 2006 13:35:19 -0000 1.18 *************** *** 25,29 **** import java.awt.Cursor; import java.awt.event.MouseEvent; - import java.awt.event.KeyEvent; import java.util.HashSet; --- 25,28 ---- *************** *** 186,204 **** /** - * Invoked when a key has been pressed. Lets user control the mode of movement. - * After movement in one direction a length can be typed in to adjust the movement - * to a specific length. - * ESCAPE - cancel movement. - * 0-9 - type length in length field. - * ENTER - perform move of the specified length. - * @param e The KeyEvent - */ - public void keyPressed(KeyEvent e) { - if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { - rotate(initial, from, this.center); - } - } - - /** * Rotate the selected vertexes the angle from v1 to v2 * @param v1 The from vertex --- 185,188 ---- |
