X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.editor%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Feditor%2FEditorUserInput.java;h=feae04f3aca4781bd735cdb9c4039ccf58dab2fc;hb=148a58630b38b30d4d24a21e3f55c357f5b4d0bc;hp=cb66e94f27d0f33c3000afa8eea5b307cf53ad44;hpb=47ea68ed5c444dd14864412639f6a6fd60ab8a0f;p=Mograsim.git

diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/EditorUserInput.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/EditorUserInput.java
index cb66e94f..feae04f3 100644
--- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/EditorUserInput.java
+++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/EditorUserInput.java
@@ -7,11 +7,15 @@ import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.MouseListener;
 
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
+import net.mograsim.logic.model.editor.ui.EditorGUI;
 
 public class EditorUserInput
 {
-	public EditorUserInput(Editor editor, EditorGUI gui)
+	private final EditorGUI gui;
+
+	public EditorUserInput(Editor editor)
 	{
+		this.gui = editor.gui;
 		gui.logicCanvas.addMouseListener(new MouseListener()
 		{
 			@Override
@@ -34,7 +38,9 @@ public class EditorUserInput
 			}
 
 			@Override
-			public void mouseUp(MouseEvent e) {}
+			public void mouseUp(MouseEvent e)
+			{
+			}
 		});
 
 		gui.logicCanvas.addMouseMoveListener((e) ->
@@ -45,14 +51,14 @@ public class EditorUserInput
 
 		gui.logicCanvas.addKeyListener(new KeyListener()
 		{
-			
+
 			@Override
 			public void keyReleased(KeyEvent e)
 			{
 				// TODO Auto-generated method stub
-				
+
 			}
-			
+
 			@Override
 			public void keyPressed(KeyEvent e)
 			{
@@ -92,4 +98,14 @@ public class EditorUserInput
 			}
 		});
 	}
+
+	public Point getCanvasMousePosition()
+	{
+		return new Point(gui.logicCanvas.toControl(gui.display.getCursorLocation()));
+	}
+
+	public Point getWorldMousePosition()
+	{
+		return gui.logicCanvas.canvasToWorldCoords(getCanvasMousePosition());
+	}
 }
\ No newline at end of file