diff options
author | Jesse Morgan <jesse@jesterpm.net> | 2011-03-11 02:06:34 +0000 |
---|---|---|
committer | Jesse Morgan <jesse@jesterpm.net> | 2011-03-11 02:06:34 +0000 |
commit | 52308d9ab00d8a117f241abeaba8335c9374c2ba (patch) | |
tree | 2649fef03c35a573f5135dc754c882562a082116 /src/tesseract/TesseractUI.java | |
parent | 19007d3f4a1c69777cb01d50e433fb971519a1d2 (diff) |
Some remote code that isn't yet remote.
Diffstat (limited to 'src/tesseract/TesseractUI.java')
-rw-r--r-- | src/tesseract/TesseractUI.java | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/src/tesseract/TesseractUI.java b/src/tesseract/TesseractUI.java index 0378f64..b1d5335 100644 --- a/src/tesseract/TesseractUI.java +++ b/src/tesseract/TesseractUI.java @@ -4,6 +4,9 @@ import java.awt.GraphicsConfiguration; import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionAdapter; @@ -49,6 +52,7 @@ import tesseract.newmenu.NewPlanarPolygonMenuItem; import tesseract.newmenu.NewSurfBoardMenuItem; import tesseract.newmenu.NewToroidMenuItem; import tesseract.objects.PhysicalObject; +import tesseract.objects.remote.RemoteObjectMenu; import com.sun.j3d.utils.picking.PickCanvas; import com.sun.j3d.utils.picking.PickResult; @@ -128,6 +132,11 @@ public class TesseractUI extends JFrame { private PhysicalObject myCurrentObject; /** + * Remote Objects. + */ + private RemoteObjectMenu myRemoteObjects; + + /** * UI Constructor. */ public TesseractUI() { @@ -160,6 +169,9 @@ public class TesseractUI extends JFrame { new NewToroidMenuItem(myWorld), new NewSurfBoardMenuItem(myWorld) }; + + myRemoteObjects = new RemoteObjectMenu(myWorld); + createMenu(); setupCanvas(); pack(); @@ -390,11 +402,12 @@ public class TesseractUI extends JFrame { } }); networkMenu.add(chat); - //menuBar.add(networkMenu);//*/ - setJMenuBar(menuBar); + // Remote Objects + menuBar.add(myRemoteObjects); + setJMenuBar(menuBar); } /** @@ -538,6 +551,14 @@ public class TesseractUI extends JFrame { } }); + // Keyboard Events + myCanvas.addKeyListener(new KeyAdapter() { + @Override + public void keyPressed(KeyEvent e) { + myRemoteObjects.sendKeyToObjects(e); + } + }); + // Setup the timer. myTimer = new Timer(MILISECONDS_IN_SECOND / UPDATE_RATE, new ActionListener() { |