From e2a8d1304b35a0b400f1040cbfd43a4aeae3143a Mon Sep 17 00:00:00 2001 From: Markil3 <75867393+Markil3@users.noreply.github.com> Date: Fri, 18 Dec 2020 09:51:25 -0700 Subject: [PATCH] Removed the Lemur dependency (again). Again, we want this to be as accessible to users as possible, and not everyone uses Lemur in their game. --- build.gradle | 2 - .../controller/CalibrateInputScreen.java | 380 ++++++++++-------- src/main/java/markil3/controller/Main.java | 26 +- 3 files changed, 233 insertions(+), 175 deletions(-) diff --git a/build.gradle b/build.gradle index fd80eb1..60d7f67 100644 --- a/build.gradle +++ b/build.gradle @@ -41,8 +41,6 @@ dependencies { implementation "${jme3.g}:jme3-core:${jme3.version}" implementation "${jme3.g}:jme3-desktop:${jme3.version}" implementation "${jme3.g}:jme3-lwjgl3:${jme3.version}" - implementation "org.codehaus.groovy:groovy-all:2.4.5" - implementation "com.simsilica:lemur:1.14.0" } // Define the main class for the application diff --git a/src/main/java/markil3/controller/CalibrateInputScreen.java b/src/main/java/markil3/controller/CalibrateInputScreen.java index f7d1661..1179638 100644 --- a/src/main/java/markil3/controller/CalibrateInputScreen.java +++ b/src/main/java/markil3/controller/CalibrateInputScreen.java @@ -3,12 +3,18 @@ package markil3.controller; import com.jme3.app.Application; import com.jme3.app.SimpleApplication; import com.jme3.app.state.BaseAppState; +import com.jme3.collision.CollisionResult; +import com.jme3.collision.CollisionResults; import com.jme3.font.BitmapFont; import com.jme3.font.BitmapText; +import com.jme3.font.Rectangle; import com.jme3.input.Joystick; import com.jme3.input.JoystickAxis; import com.jme3.input.JoystickButton; +import com.jme3.input.MouseInput; import com.jme3.input.RawInputListener; +import com.jme3.input.controls.ActionListener; +import com.jme3.input.controls.MouseButtonTrigger; import com.jme3.input.event.JoyAxisEvent; import com.jme3.input.event.JoyButtonEvent; import com.jme3.input.event.KeyInputEvent; @@ -17,18 +23,14 @@ import com.jme3.input.event.MouseMotionEvent; import com.jme3.input.event.TouchEvent; import com.jme3.material.Material; import com.jme3.math.ColorRGBA; +import com.jme3.math.Ray; +import com.jme3.math.Vector2f; +import com.jme3.math.Vector3f; import com.jme3.renderer.Camera; import com.jme3.scene.Geometry; import com.jme3.scene.Node; +import com.jme3.scene.Spatial; import com.jme3.scene.shape.Quad; -import com.simsilica.lemur.Axis; -import com.simsilica.lemur.Button; -import com.simsilica.lemur.Command; -import com.simsilica.lemur.Container; -import com.simsilica.lemur.FillMode; -import com.simsilica.lemur.HAlignment; -import com.simsilica.lemur.Label; -import com.simsilica.lemur.component.BoxLayout; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -62,7 +64,7 @@ import static markil3.controller.Main.CALIBRATION_FILE; * @author Markil3 */ public class CalibrateInputScreen extends BaseAppState - implements Command