Commit: 1b989c04d2141aa0ece861857da161b0ee18eb30 - SpaceRocket (hg)

Commit MetaInfo

• Révision: 1b989c04d2141aa0ece861857da161b0ee18eb30 (tree)
• l'heure: 2022-01-08 01:31:30
• Auteur: sebastian_bugiu
• Commiter: sebastian_bugiu

Message de Log

The arrows now act like a joystick.

Change Summary

• modified: android/build.gradle
• modified: core/src/com/headwayent/spacerocket/InGameInputProcessor.java
• modified: core/src/com/headwayent/spacerocket/Preferences.java
• modified: core/src/com/headwayent/spacerocket/Utility.java
• modified: core/src/com/headwayent/spacerocket/old/GraphicsManager.java
• modified: ios/robovm.properties

Modification

diff -r fcb7b2f8c29e -r 1b989c04d214 android/build.gradle
--- a/android/build.gradle	Thu Jan 06 20:21:53 2022 +0200
+++ b/android/build.gradle	Fri Jan 07 18:31:30 2022 +0200
@@ -30,7 +30,7 @@
         applicationId "com.headwayent.spacerocket"
         minSdkVersion 14
         targetSdkVersion 32
-        versionCode 1
+        versionCode 3
         versionName "1.0"
     }
     buildTypes {

diff -r fcb7b2f8c29e -r 1b989c04d214 core/src/com/headwayent/spacerocket/InGameInputProcessor.java
--- a/core/src/com/headwayent/spacerocket/InGameInputProcessor.java	Thu Jan 06 20:21:53 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/InGameInputProcessor.java	Fri Jan 07 18:31:30 2022 +0200
@@ -1,14 +1,17 @@
 package com.headwayent.spacerocket;
 
 import com.badlogic.gdx.InputProcessor;
+import com.badlogic.gdx.math.Vector2;
 import com.headwayent.spacerocket.old.ExtendedCanvas;
 import com.headwayent.spacerocket.old.ExtendedSprite;
 import com.headwayent.spacerocket.old.GraphicsManager;
 
 public class InGameInputProcessor implements InputProcessor {
 
+    private static float IGNORED_OFFSET = 7.0f;
     private int firePointer = -1;
     private int arrowsPointer = -1;
+    private Vector2 arrowPointerInitialPos = new Vector2();
     private boolean fireSet;
     private boolean firePressed;
     private boolean arrowsPressed;
@@ -16,7 +19,11 @@
             arrowsRightPressed,
             arrowsUpPressed,
             arrowsDownPressed;
-    
+    private float xLeftArrows;
+    private float xRightArrows;
+    private float yTopArrows;
+    private float yBottomArrows;
+
     @Override
     public boolean keyDown(int keycode) {
 //        ExtendedCanvas sc = game.getCanvas();
@@ -209,10 +216,10 @@
 //        } else if (!fireSprite.isVisible()) {
 //            return false;
 //        }
-        float xLeftArrows = arrowsSprite.getX();
-        float xRightArrows = xLeftArrows + arrowsSprite.getWidth();
-        float yTopArrows = arrowsSprite.getY();
-        float yBottomArrows = yTopArrows + arrowsSprite.getHeight();
+        xLeftArrows = arrowsSprite.getX();
+        xRightArrows = xLeftArrows + arrowsSprite.getWidth();
+        yTopArrows = arrowsSprite.getY();
+        yBottomArrows = yTopArrows + arrowsSprite.getHeight();
         float xLeftFire = fireSprite.getX();
         float xRightFire = xLeftFire + fireSprite.getWidth();
         float yTopFire = fireSprite.getY();
@@ -233,29 +240,30 @@
             firePressed = true;
         } else if ((xPos > xLeftArrows) && (xPos < xRightArrows) &&
                 (yPos > yTopArrows) && (yPos < yBottomArrows)) {
-            boolean upperDiagonal = isLeft(
-                    xRightArrows, yBottomArrows,
-                    xLeftArrows, yTopArrows,
-                    xPos, yPos);
-            boolean lowerDiagonal = isLeft(
-                    xRightArrows, yTopArrows,
-                    xLeftArrows, yBottomArrows,
-                    xPos, yPos);
-
+            arrowPointerInitialPos.set(screenX, screenY);
+//            boolean upperDiagonal = isLeft(
+//                    xRightArrows, yBottomArrows,
+//                    xLeftArrows, yTopArrows,
+//                    xPos, yPos);
+//            boolean lowerDiagonal = isLeft(
+//                    xRightArrows, yTopArrows,
+//                    xLeftArrows, yBottomArrows,
+//                    xPos, yPos);
+//
             arrowsPointer = pointer;
-            if ((upperDiagonal) && (lowerDiagonal)) {
-                game.getCanvas().recordKeyPressed(ExtendedCanvas.UP);
-                arrowsUpPressed = true;
-            } else if ((upperDiagonal) && (!lowerDiagonal)) {
-                game.getCanvas().recordKeyPressed(ExtendedCanvas.RIGHT);
-                arrowsRightPressed = true;
-            } else if ((!upperDiagonal) && (!lowerDiagonal)) {
-                game.getCanvas().recordKeyPressed(ExtendedCanvas.DOWN);
-                arrowsDownPressed = true;
-            } else if ((!upperDiagonal) && (lowerDiagonal)) {
-                game.getCanvas().recordKeyPressed(ExtendedCanvas.LEFT);
-                arrowsLeftPressed = true;
-            }
+//            if ((upperDiagonal) && (lowerDiagonal)) {
+//                game.getCanvas().recordKeyPressed(ExtendedCanvas.UP);
+//                arrowsUpPressed = true;
+//            } else if ((upperDiagonal) && (!lowerDiagonal)) {
+//                game.getCanvas().recordKeyPressed(ExtendedCanvas.RIGHT);
+//                arrowsRightPressed = true;
+//            } else if ((!upperDiagonal) && (!lowerDiagonal)) {
+//                game.getCanvas().recordKeyPressed(ExtendedCanvas.DOWN);
+//                arrowsDownPressed = true;
+//            } else if ((!upperDiagonal) && (lowerDiagonal)) {
+//                game.getCanvas().recordKeyPressed(ExtendedCanvas.LEFT);
+//                arrowsLeftPressed = true;
+//            }
 
 //                gfx.getArrowsSprite().setImage(gfx.getArrowsPressedBitmap(),
 //                        gfx.getArrowsPressedBitmap().getWidth(),
@@ -328,6 +336,7 @@
             game.getCanvas().recordKeyReleased(ExtendedCanvas.RIGHT);
             game.getCanvas().recordKeyReleased(ExtendedCanvas.DOWN);
             game.getCanvas().recordKeyReleased(ExtendedCanvas.LEFT);
+            gfx.resetArrowSpritePosition();
         }
         return true;
     }
@@ -337,10 +346,6 @@
         SpaceRocket game = SpaceRocket.getGame();
         ExtendedSprite arrowsSprite = game.getCanvas().getGraphicsManager().getArrowsSprite();
         ExtendedSprite fireSprite = game.getCanvas().getGraphicsManager().getFireSprite();
-        float xLeftArrows = arrowsSprite.getX();
-        float xRightArrows = xLeftArrows + arrowsSprite.getWidth();
-        float yTopArrows = arrowsSprite.getY();
-        float yBottomArrows = yTopArrows + arrowsSprite.getHeight();
         float xLeftFire = fireSprite.getX();
         float xRightFire = xLeftFire + fireSprite.getWidth();
         float yTopFire = fireSprite.getY();
@@ -351,41 +356,67 @@
         if (arrowsPointer == pointer) {
             if ((xPos > xLeftArrows) && (xPos < xRightArrows) &&
                     (yPos > yTopArrows) && (yPos < yBottomArrows)) {
-                boolean upperDiagonal = isLeft(
-                        xRightArrows, yBottomArrows,
-                        xLeftArrows, yTopArrows,
-                        xPos, yPos);
-                boolean lowerDiagonal = isLeft(
-                        xRightArrows, yTopArrows,
-                        xLeftArrows, yBottomArrows,
-                        xPos, yPos);
-
-                if ((upperDiagonal) && (lowerDiagonal)) {
-                    game.getCanvas().recordKeyPressed(ExtendedCanvas.UP);
-                    arrowsUpPressed = true;
-                } else if ((upperDiagonal) && (!lowerDiagonal)) {
+                float xDiff = screenX - arrowPointerInitialPos.x;
+                float yDiff = screenY - arrowPointerInitialPos.y;
+                xDiff = Utility.clamp(xDiff, -GraphicsManager.ARROWS_X_OFFSET, GraphicsManager.ARROWS_X_OFFSET);
+                yDiff = Utility.clamp(yDiff, -GraphicsManager.ARROWS_X_OFFSET, GraphicsManager.ARROWS_X_OFFSET);
+                gfx.resetArrowSpritePosition();
+                gfx.getArrowsSprite().move(xDiff, yDiff);
+                if (xDiff > IGNORED_OFFSET) {
+                    game.getCanvas().recordKeyReleased(ExtendedCanvas.LEFT);
                     game.getCanvas().recordKeyPressed(ExtendedCanvas.RIGHT);
-                    arrowsRightPressed = true;
-                } else if ((!upperDiagonal) && (!lowerDiagonal)) {
+                } else if (xDiff < -IGNORED_OFFSET) {
+                    game.getCanvas().recordKeyReleased(ExtendedCanvas.RIGHT);
+                    game.getCanvas().recordKeyPressed(ExtendedCanvas.LEFT);
+                } else {
+                    game.getCanvas().recordKeyReleased(ExtendedCanvas.LEFT);
+                    game.getCanvas().recordKeyReleased(ExtendedCanvas.RIGHT);
+                }
+                if (yDiff > IGNORED_OFFSET) {
+                    game.getCanvas().recordKeyReleased(ExtendedCanvas.UP);
                     game.getCanvas().recordKeyPressed(ExtendedCanvas.DOWN);
-                    arrowsDownPressed = true;
-                } else if ((!upperDiagonal) && (lowerDiagonal)) {
-                    game.getCanvas().recordKeyPressed(ExtendedCanvas.LEFT);
-                    arrowsLeftPressed = true;
+                } else if (yDiff < -IGNORED_OFFSET) {
+                    game.getCanvas().recordKeyReleased(ExtendedCanvas.DOWN);
+                    game.getCanvas().recordKeyPressed(ExtendedCanvas.UP);
+                } else {
+                    game.getCanvas().recordKeyReleased(ExtendedCanvas.UP);
+                    game.getCanvas().recordKeyReleased(ExtendedCanvas.DOWN);
                 }
-
-//                gfx.getArrowsSprite().setImage(gfx.getArrowsPressedBitmap(),
-//                        gfx.getArrowsPressedBitmap().getWidth(),
-//                        gfx.getArrowsPressedBitmap().getHeight());
-                if ((upperDiagonal) && (lowerDiagonal)) {
-                    game.getCanvas().recordKeyReleased(ExtendedCanvas.UP);
-                } else if ((upperDiagonal) && (!lowerDiagonal)) {
-                    game.getCanvas().recordKeyReleased(ExtendedCanvas.RIGHT);
-                } else if ((!upperDiagonal) && (!lowerDiagonal)) {
-                    game.getCanvas().recordKeyReleased(ExtendedCanvas.DOWN);
-                } else if ((!upperDiagonal) && (lowerDiagonal)) {
-                    game.getCanvas().recordKeyReleased(ExtendedCanvas.LEFT);
-                }
+//                boolean upperDiagonal = isLeft(
+//                        xRightArrows, yBottomArrows,
+//                        xLeftArrows, yTopArrows,
+//                        xPos, yPos);
+//                boolean lowerDiagonal = isLeft(
+//                        xRightArrows, yTopArrows,
+//                        xLeftArrows, yBottomArrows,
+//                        xPos, yPos);
+//
+//                if ((upperDiagonal) && (lowerDiagonal)) {
+//                    game.getCanvas().recordKeyPressed(ExtendedCanvas.UP);
+//                    arrowsUpPressed = true;
+//                } else if ((upperDiagonal) && (!lowerDiagonal)) {
+//                    game.getCanvas().recordKeyPressed(ExtendedCanvas.RIGHT);
+//                    arrowsRightPressed = true;
+//                } else if ((!upperDiagonal) && (!lowerDiagonal)) {
+//                    game.getCanvas().recordKeyPressed(ExtendedCanvas.DOWN);
+//                    arrowsDownPressed = true;
+//                } else if ((!upperDiagonal) && (lowerDiagonal)) {
+//                    game.getCanvas().recordKeyPressed(ExtendedCanvas.LEFT);
+//                    arrowsLeftPressed = true;
+//                }
+//
+////                gfx.getArrowsSprite().setImage(gfx.getArrowsPressedBitmap(),
+////                        gfx.getArrowsPressedBitmap().getWidth(),
+////                        gfx.getArrowsPressedBitmap().getHeight());
+//                if ((upperDiagonal) && (lowerDiagonal)) {
+//                    game.getCanvas().recordKeyReleased(ExtendedCanvas.UP);
+//                } else if ((upperDiagonal) && (!lowerDiagonal)) {
+//                    game.getCanvas().recordKeyReleased(ExtendedCanvas.RIGHT);
+//                } else if ((!upperDiagonal) && (!lowerDiagonal)) {
+//                    game.getCanvas().recordKeyReleased(ExtendedCanvas.DOWN);
+//                } else if ((!upperDiagonal) && (lowerDiagonal)) {
+//                    game.getCanvas().recordKeyReleased(ExtendedCanvas.LEFT);
+//                }
             }
         }
         return true;

diff -r fcb7b2f8c29e -r 1b989c04d214 core/src/com/headwayent/spacerocket/Preferences.java
--- a/core/src/com/headwayent/spacerocket/Preferences.java	Thu Jan 06 20:21:53 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/Preferences.java	Fri Jan 07 18:31:30 2022 +0200
@@ -60,7 +60,7 @@
     }
 
     public int getShipMovementType() {
-        return prefs.getInteger(SHIP_MOVEMENT_TYPE, 3);
+        return prefs.getInteger(SHIP_MOVEMENT_TYPE, 2);
     }
 
     public void setShipMovementType(int shipMovementType) {

diff -r fcb7b2f8c29e -r 1b989c04d214 core/src/com/headwayent/spacerocket/Utility.java
--- a/core/src/com/headwayent/spacerocket/Utility.java	Thu Jan 06 20:21:53 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/Utility.java	Fri Jan 07 18:31:30 2022 +0200
@@ -47,4 +47,8 @@
     public static boolean intersects(Sprite s0, Sprite s1) {
         return s0.getX() < s1.getX() + s1.getWidth() && s0.getX() + s0.getWidth() > s1.getX() && s0.getY() < s1.getY() + s1.getHeight() && s0.getY() + s0.getHeight() > s1.getY();
     }
+
+    public static float clamp(float val, float min, float max) {
+        return Math.max(min, Math.min(max, val));
+    }
 }

diff -r fcb7b2f8c29e -r 1b989c04d214 core/src/com/headwayent/spacerocket/old/GraphicsManager.java
--- a/core/src/com/headwayent/spacerocket/old/GraphicsManager.java	Thu Jan 06 20:21:53 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/old/GraphicsManager.java	Fri Jan 07 18:31:30 2022 +0200
@@ -50,6 +50,7 @@
     private static final int PLANET_NUM = 8;
     public static final int ENEMY_LAUNCH_MISSILE_RAND = 100;
     public static final int STAR_SPRITE_LAUNCH_RAND = 50;
+    public static final int ARROWS_X_OFFSET = 20;
     private final TextureAtlas.AtlasRegion spaceRocketRegion;
     private final TextureAtlas.AtlasRegion otherSpaceRocketRegion;
     private final TextureAtlas.AtlasRegion touchArrowsPressedRegion;
@@ -768,13 +769,17 @@
                         ExtendedCanvas.getScreenHeight() - atmosphereSprite.getHeight());
     	}
     }
+
+    public void resetArrowSpritePosition() {
+        float arrowsX = ExtendedCanvas.getScreenWidth() - ARROWS_X_OFFSET - touchArrowsPressedRegion.getRegionWidth();
+        float arrowsY = ExtendedCanvas.getScreenHeight() - 100 - touchArrowsPressedRegion.getRegionHeight();
+        arrowsSprite.setPosition(arrowsX, arrowsY);
+    }
     
     public void setControlsVisible(boolean visible) {
     	float fireX = 10;
     	float fireY = ExtendedCanvas.getScreenHeight() - 100 - touchFireRegion.getRegionHeight();
-        float arrowsX = ExtendedCanvas.getScreenWidth() - 10 - touchArrowsPressedRegion.getRegionWidth();
-        float arrowsY = ExtendedCanvas.getScreenHeight() - 100 - touchArrowsPressedRegion.getRegionHeight();
-    	arrowsSprite.setPosition(arrowsX, arrowsY);
+        resetArrowSpritePosition();
     	fireSprite.setPosition(fireX, fireY);
     	if (!Preferences.getInstance().isAccelerometerEnabled()) {
     		arrowsSprite.setVisible(visible);

diff -r fcb7b2f8c29e -r 1b989c04d214 ios/robovm.properties
--- a/ios/robovm.properties	Thu Jan 06 20:21:53 2022 +0200
+++ b/ios/robovm.properties	Fri Jan 07 18:31:30 2022 +0200
@@ -1,6 +1,6 @@
-app.version=1.0
+app.version=1.1
 app.id=com.headwayent.spacerocket
 app.mainclass=com.headwayent.spacerocket.IOSLauncher
 app.executable=IOSLauncher
-app.build=1
+app.build=3
 app.name=Hotshot 2D