[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool SelectStrategy.java, 1.7, 1.8
Status: Pre-Alpha
Brought to you by:
henryml
|
From: Nordholt <nor...@us...> - 2007-02-20 15:16:23
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21915/src/net/sourceforge/bprocessor/gl/tool Modified Files: SelectStrategy.java Log Message: selecttool can select 3d cameras Index: SelectStrategy.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectStrategy.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SelectStrategy.java 29 Jan 2007 11:56:59 -0000 1.7 --- SelectStrategy.java 20 Feb 2007 15:16:10 -0000 1.8 *************** *** 13,17 **** --- 13,20 ---- import java.util.List; + import org.apache.log4j.Logger; + import net.sourceforge.bprocessor.gl.GLView; + import net.sourceforge.bprocessor.gl.model.GlCamera; import net.sourceforge.bprocessor.gl.view.Transformation; import net.sourceforge.bprocessor.gl.view.View; *************** *** 19,22 **** --- 22,26 ---- import net.sourceforge.bprocessor.model.Constructor; import net.sourceforge.bprocessor.model.Edge; + import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selection; import net.sourceforge.bprocessor.model.Space; *************** *** 28,31 **** --- 32,38 ---- */ public class SelectStrategy implements Strategy { + /** The logger */ + private static Logger log = Logger.getLogger(SelectStrategy.class); + /** The GLView **/ private GLView glv; *************** *** 120,125 **** ClippingPlane cp = (ClippingPlane)target; cp.setActive(!cp.isActive()); } ! } else { if (target == null) { selection.clear(); --- 127,135 ---- ClippingPlane cp = (ClippingPlane)target; cp.setActive(!cp.isActive()); + } else if (target instanceof GlCamera) { + GlCamera glcam = (GlCamera)target; + Project.getInstance().setCurrentCamera(glcam.getCamera()); } ! } else { if (target == null) { selection.clear(); *************** *** 131,134 **** --- 141,147 ---- selection.remove(target); } + } else if (target instanceof GlCamera) { + GlCamera glcam = (GlCamera)target; + Project.getInstance().setCurrentCamera(glcam.getCamera()); } else { if (!selection.contains(target)) { |