Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22745/src/net/sourceforge/bprocessor/gl/tool
Modified Files:
FocusTool.java AbstractTool.java SelectStrategy.java
SelectTool.java
Log Message:
SelectTool does not mark target
Index: SelectStrategy.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectStrategy.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** SelectStrategy.java 3 Sep 2007 11:31:34 -0000 1.18
--- SelectStrategy.java 24 Sep 2007 13:02:17 -0000 1.19
***************
*** 96,101 ****
*/
public void moved(MouseEvent e) {
! target = glv.getView().getObjectAtPoint(e.getX(), e.getY(), View.OBJECTS);
! glv.getView().makeTarget(target);
}
--- 96,101 ----
*/
public void moved(MouseEvent e) {
! // target = glv.getView().getObjectAtPoint(e.getX(), e.getY(), View.OBJECTS);
! // glv.getView().makeTarget(target);
}
***************
*** 112,115 ****
--- 112,116 ----
x = e.getX();
y = e.getY();
+ target = glv.getView().getObjectAtPoint(e.getX(), e.getY(), View.OBJECTS);
if (target == null || target instanceof Geometric) {
activated = true;
Index: FocusTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/FocusTool.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FocusTool.java 20 Jun 2007 13:17:55 -0000 1.3
--- FocusTool.java 24 Sep 2007 13:02:17 -0000 1.4
***************
*** 38,41 ****
--- 38,42 ----
glv.getView().makeTarget(target);
} else {
+ glv.getView().makeTarget(null);
target = null;
}
***************
*** 63,67 ****
if (target instanceof Surface) {
Camera.focusOn(Project.getInstance().getCurrentCamera(), (Surface)target);
! } else {
Camera.focusOn(Project.getInstance().getCurrentCamera(), (ClippingPlane)target);
}
--- 64,68 ----
if (target instanceof Surface) {
Camera.focusOn(Project.getInstance().getCurrentCamera(), (Surface)target);
! } else if (target instanceof ClippingPlane) {
Camera.focusOn(Project.getInstance().getCurrentCamera(), (ClippingPlane)target);
}
Index: SelectTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectTool.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** SelectTool.java 3 Sep 2007 11:31:34 -0000 1.65
--- SelectTool.java 24 Sep 2007 13:02:17 -0000 1.66
***************
*** 35,40 ****
protected void moved(MouseEvent e) {
select.moved(e);
- // findTarget(e);
- // glv.getView().makeTarget(target);
}
--- 35,38 ----
Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.130
retrieving revision 1.131
diff -C2 -d -r1.130 -r1.131
*** AbstractTool.java 7 Sep 2007 13:21:10 -0000 1.130
--- AbstractTool.java 24 Sep 2007 13:02:17 -0000 1.131
***************
*** 306,309 ****
--- 306,311 ----
if (e.getKeyCode() == KeyEvent.VK_CONTROL) {
setActiveStrategy(AbstractTool.select);
+ glv.getView().makeTarget(null);
+ glv.repaint();
return;
}
|
