[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java, 1.113, 1.114
Status: Pre-Alpha
Brought to you by:
henryml
|
From: Nordholt <nor...@us...> - 2007-02-20 15:14:19
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21045/src/net/sourceforge/bprocessor/gl/tool Modified Files: AbstractTool.java Log Message: pressing s will show 3d cameras Index: AbstractTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v retrieving revision 1.113 retrieving revision 1.114 diff -C2 -d -r1.113 -r1.114 *** AbstractTool.java 13 Feb 2007 15:05:47 -0000 1.113 --- AbstractTool.java 20 Feb 2007 15:14:10 -0000 1.114 *************** *** 16,19 **** --- 16,20 ---- import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; + import net.sourceforge.bprocessor.gl.model.GlCamera; import net.sourceforge.bprocessor.gl.model.Widget; import net.sourceforge.bprocessor.gl.view.View; *************** *** 30,33 **** --- 31,35 ---- import java.net.URL; + import java.util.HashSet; import java.util.Iterator; import java.util.Set; *************** *** 128,131 **** --- 130,136 ---- protected Cursor metaCursor = null; + /** The gl Cameras */ + private Set<GlCamera> glCams = new HashSet<GlCamera> (); + /** * KeyListener for the GL Canvas *************** *** 270,274 **** } else { key(e); ! } glv.repaint(true); } --- 275,289 ---- } else { key(e); ! } ! if (e.getKeyCode() == KeyEvent.VK_S) { ! Collection cams = Project.getInstance().getCameras(); ! Iterator it = cams.iterator(); ! glv.getView().removeGlObjects3D(glCams); ! glCams.clear(); ! while (it.hasNext()) { ! glCams.add(new GlCamera((Camera)it.next())); ! } ! glv.getView().addGlObjects3D(glCams); ! } glv.repaint(true); } *************** *** 291,294 **** --- 306,314 ---- glv.setCursor(cursor); } + if (e.getKeyCode() == KeyEvent.VK_S) { + glv.getView().removeGlObjects3D(glCams); + glCams.clear(); + } + } |