diff --git a/DivaBot/DivaBot.jar b/DivaBot/DivaBot.jar index 21aae69..9d2eb0b 100644 Binary files a/DivaBot/DivaBot.jar and b/DivaBot/DivaBot.jar differ diff --git a/DivaBot/calibration_data.txt b/DivaBot/calibration_data.txt index f7e71d9..55c8a62 100644 --- a/DivaBot/calibration_data.txt +++ b/DivaBot/calibration_data.txt @@ -1,4 +1,4 @@ -437 +438 288 1330 793 diff --git a/DivaBot/capture_1.png b/DivaBot/capture_1.png index 494bc18..6e1aa78 100644 Binary files a/DivaBot/capture_1.png and b/DivaBot/capture_1.png differ diff --git a/DivaBot/capture_2.png b/DivaBot/capture_2.png index b682fde..06bd9e6 100644 Binary files a/DivaBot/capture_2.png and b/DivaBot/capture_2.png differ diff --git a/DivaBot/capture_3.png b/DivaBot/capture_3.png index cd6486c..06b0f04 100644 Binary files a/DivaBot/capture_3.png and b/DivaBot/capture_3.png differ diff --git a/DivaBot/src/sig/CustomRobot.java b/DivaBot/src/sig/CustomRobot.java index fd67249..1bbdacd 100644 --- a/DivaBot/src/sig/CustomRobot.java +++ b/DivaBot/src/sig/CustomRobot.java @@ -21,23 +21,23 @@ public class CustomRobot extends Robot{ BufferedImage scoreCurrentScreen; int[] calibration_data = new int[]{0,0,1,1}; long lastCalibrationTime = 0; - GraphicsEnvironment ge; - GraphicsDevice[] gs; + public static GraphicsEnvironment ge; + public static GraphicsDevice[] gs; public CustomRobot() throws AWTException { super(); GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); GraphicsDevice[] gs = ge.getScreenDevices(); - this.ge=ge; - this.gs=gs; + CustomRobot.ge=ge; + CustomRobot.gs=gs; } public CustomRobot(GraphicsDevice screen) throws AWTException { super(screen); GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); GraphicsDevice[] gs = ge.getScreenDevices(); - this.ge=ge; - this.gs=gs; + CustomRobot.ge=ge; + CustomRobot.gs=gs; } public synchronized BufferedImage getSizedCapture(Rectangle r) { diff --git a/DivaBot/src/sig/Overlay.java b/DivaBot/src/sig/Overlay.java index fc64b44..42f7591 100644 --- a/DivaBot/src/sig/Overlay.java +++ b/DivaBot/src/sig/Overlay.java @@ -179,7 +179,7 @@ public class Overlay extends JPanel implements MouseMotionListener,MouseListener @Override public void mouseDragged(MouseEvent e) { if (started) { - MyRobot.ENDDRAG=e.getLocationOnScreen(); + MyRobot.ENDDRAG=e.getPoint(); } }