Commit: a2c236d367a9541c667e675b18a635d09c56f0a2 - SpaceRocket (hg)

Commit MetaInfo

• Révision: a2c236d367a9541c667e675b18a635d09c56f0a2 (tree)
• l'heure: 2021-12-10 04:20:51
• Auteur: sebastian_bugiu
• Commiter: sebastian_bugiu

Message de Log

Various improvements.

Change Summary

• modified: core/src/com/headwayent/spacerocket/MainMenuActivity.java
• modified: core/src/com/headwayent/spacerocket/OptionsMenuActivity.java
• modified: core/src/com/headwayent/spacerocket/old/ExtendedCanvas.java
• modified: core/src/com/headwayent/spacerocket/old/ExtendedSprite.java
• modified: core/src/com/headwayent/spacerocket/old/ExtendedSpritePool.java
• modified: core/src/com/headwayent/spacerocket/old/GraphicsManager.java
• modified: core/src/com/headwayent/spacerocket/old/LayerManager.java
• modified: core/src/com/headwayent/spacerocket/old/SpaceRocketSprite.java

Modification

diff -r d48be19f1594 -r a2c236d367a9 core/src/com/headwayent/spacerocket/MainMenuActivity.java
--- a/core/src/com/headwayent/spacerocket/MainMenuActivity.java	Tue Dec 07 19:30:32 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/MainMenuActivity.java	Thu Dec 09 21:20:51 2021 +0200
@@ -15,12 +15,9 @@
 
 public class MainMenuActivity extends ScreenAdapter {
 
-    private final SpaceRocket game;
     private final Stage stage;
 
     public MainMenuActivity(SpaceRocket game) {
-        this.game = game;
-
         stage = new Stage(new ScreenViewport());
         Gdx.input.setInputProcessor(stage);
     }
@@ -28,6 +25,7 @@
     @Override
     public void show() {
         super.show();
+        stage.clear();
         Table table = new Table();
         table.setFillParent(true);
         table.setDebug(true);
@@ -59,17 +57,17 @@
         newGame.addListener(new ChangeListener() {
             @Override
             public void changed(ChangeEvent event, Actor actor) {
-                game.changeScreen(SpaceRocket.Screen.SELECT_DIFFICULTY);
+                SpaceRocket.getGame().changeScreen(SpaceRocket.Screen.SELECT_DIFFICULTY);
             }
         });
 
         preferences.addListener(new ChangeListener() {
             @Override
             public void changed(ChangeEvent event, Actor actor) {
-                game.changeScreen(SpaceRocket.Screen.OPTIONS);
+                SpaceRocket.getGame().changeScreen(SpaceRocket.Screen.OPTIONS);
             }
         });
-        game.changeScreen(SpaceRocket.Screen.SELECT_DIFFICULTY);
+//        SpaceRocket.getGame().changeScreen(SpaceRocket.Screen.SELECT_DIFFICULTY);
     }
 
     @Override

diff -r d48be19f1594 -r a2c236d367a9 core/src/com/headwayent/spacerocket/OptionsMenuActivity.java
--- a/core/src/com/headwayent/spacerocket/OptionsMenuActivity.java	Tue Dec 07 19:30:32 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/OptionsMenuActivity.java	Thu Dec 09 21:20:51 2021 +0200
@@ -1,15 +1,111 @@
 package com.headwayent.spacerocket;
 
+import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.ScreenAdapter;
-import com.headwayent.spacerocket.old.SpaceRocketSprite;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.Event;
+import com.badlogic.gdx.scenes.scene2d.EventListener;
+import com.badlogic.gdx.scenes.scene2d.Stage;
+import com.badlogic.gdx.scenes.scene2d.ui.CheckBox;
+import com.badlogic.gdx.scenes.scene2d.ui.Label;
+import com.badlogic.gdx.scenes.scene2d.ui.SelectBox;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.badlogic.gdx.utils.Align;
+import com.badlogic.gdx.utils.ScreenUtils;
+import com.badlogic.gdx.utils.viewport.ScreenViewport;
 
 public class OptionsMenuActivity extends ScreenAdapter {
 
+	private final Stage stage;
+	private Label titleLabel;
+	private Label soundLabel;
+	private Label accelerometerLabel;
+	private Label shipMovementLabel;
+
+	public OptionsMenuActivity() {
+		stage = new Stage(new ScreenViewport());
+
+	}
+
 	@Override
 	public void show() {
 		super.show();
+		stage.clear();
+		Table table = new Table();
+		table.setFillParent(true);
+		table.setDebug(true);
+		stage.addActor(table);
+
+		Gdx.input.setInputProcessor(stage);
+
+		Skin skin = new Skin(Gdx.files.internal("uiskin.json"));
+
+		titleLabel = new Label("Options", skin);
+		soundLabel = new Label("Sound enabled", skin);
+		accelerometerLabel = new Label("Accelerometer for orientation", skin);
+		shipMovementLabel = new Label("Ship movement type", skin);
+
+		final CheckBox soundCheckbox = new CheckBox(null, skin);
+		soundCheckbox.setChecked(Preferences.getInstance().isSoundEnabled());
+		soundCheckbox.addListener(new EventListener() {
+			@Override
+			public boolean handle(Event event) {
+				Preferences.getInstance().setSoundsEnabled(soundCheckbox.isChecked());
+				return false;
+			}
+		});
+
+		final SelectBox<String> shipMovementSelectBox = new SelectBox<>(skin);
+		final String[] strings = {"retain inertia", "slowly stop", "stop immediately"};
+		shipMovementSelectBox.setItems(strings);
+		shipMovementSelectBox.setSelected(strings[Preferences.getInstance().getShipMovementType()]);
+		shipMovementSelectBox.addListener(new ChangeListener() {
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				String selected = shipMovementSelectBox.getSelected();
+				for (int i = 0; i < strings.length; ++i) {
+					if (strings[i].equalsIgnoreCase(selected)) {
+						Preferences.getInstance().setShipMovementType(i);
+						break;
+					}
+				}
+			}
+		});
+
+
+		final TextButton backButton = new TextButton("Back", skin); // the extra argument here "small" is used to set the button to the smaller version instead of the big default version
+		backButton.addListener(new ChangeListener() {
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				SpaceRocket.getGame().changeScreen(SpaceRocket.Screen.MAIN_MENU);
+			}
+		});
+
+		table.add(titleLabel).colspan(2);
+		table.row().pad(10, 10, 10, 10);
+		table.add(soundLabel).left();
+		table.add(soundCheckbox);
+		table.row().pad(10, 10, 10, 10);
+		table.add(shipMovementLabel).left();
+		table.add(shipMovementSelectBox);
+		table.row().pad(10, 10, 10, 10);
+		table.add(backButton).colspan(2);
+
 
 		// sounds accel ship movement options (retain inertia, grind to a halt, stop immediately).
 		// Screen orientation?
 	}
+
+	@Override
+	public void render(float delta) {
+		super.render(delta);
+		ScreenUtils.clear(0, 0, 0, 1);
+
+		// tell our stage to do actions and draw itself
+		stage.act(Math.min(Gdx.graphics.getDeltaTime(), 1 / 30f));
+		stage.draw();
+	}
 }

diff -r d48be19f1594 -r a2c236d367a9 core/src/com/headwayent/spacerocket/old/ExtendedCanvas.java
--- a/core/src/com/headwayent/spacerocket/old/ExtendedCanvas.java	Tue Dec 07 19:30:32 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/old/ExtendedCanvas.java	Thu Dec 09 21:20:51 2021 +0200
@@ -47,7 +47,7 @@
     public static final float ACCELEROMETER_ERROR = 3.0f;
 	public static final float FLOAT_EPSILON = 0.00001f;
     private static final float CORNER_X = 0, CORNER_Y = 0;
-    private static final int NUM_LIVES = 10;
+    private static final int NUM_LIVES = 1000;
     private static final int HIDDEN_KEY_NUM_PRESSES = 10;
     private static float FONT_HEIGHT;
     private static float SCORE_WIDTH;

diff -r d48be19f1594 -r a2c236d367a9 core/src/com/headwayent/spacerocket/old/ExtendedSprite.java
--- a/core/src/com/headwayent/spacerocket/old/ExtendedSprite.java	Tue Dec 07 19:30:32 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/old/ExtendedSprite.java	Thu Dec 09 21:20:51 2021 +0200
@@ -92,8 +92,8 @@
 
     public void reset() {
 //        System.out.println("Resetting " + name);
-        if (name.contains("miniBossSprite")) {
-            System.out.println();
+        if (name.contains("srrocket")) {
+            System.out.println("Resetting: " + name);
         }
         setVisible(false);
         if (animation != null) {

diff -r d48be19f1594 -r a2c236d367a9 core/src/com/headwayent/spacerocket/old/ExtendedSpritePool.java
--- a/core/src/com/headwayent/spacerocket/old/ExtendedSpritePool.java	Tue Dec 07 19:30:32 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/old/ExtendedSpritePool.java	Thu Dec 09 21:20:51 2021 +0200
@@ -9,6 +9,9 @@
         if (sprite.isVisible()) {
             throw new IllegalStateException(sprite.getName() + " is still visible");
         }
+        if (sprite.getName().contains("srrocket")) {
+            System.out.println("readding " + sprite.getName() + " spriteList size: " + spriteList.size());
+        }
 //        if (spriteList.contains(sprite)) {
 //            throw new IllegalArgumentException(sprite.getName() + " is already in the list");
 //        }

diff -r d48be19f1594 -r a2c236d367a9 core/src/com/headwayent/spacerocket/old/GraphicsManager.java
--- a/core/src/com/headwayent/spacerocket/old/GraphicsManager.java	Tue Dec 07 19:30:32 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/old/GraphicsManager.java	Thu Dec 09 21:20:51 2021 +0200
@@ -62,6 +62,12 @@
     private ExtendedSpritePool<RocketSprite> rocketTripleLeftPool = new ExtendedSpritePool<>();
     private ExtendedSpritePool<RocketSprite> rocketTripleRightPool = new ExtendedSpritePool<>();
     private ExtendedSpritePool<RocketSprite> rocketDoubleDamagePool = new ExtendedSpritePool<>();
+    private ExtendedSpritePool<RocketSprite> otherRocketLeftPool = new ExtendedSpritePool<>();
+    private ExtendedSpritePool<RocketSprite> otherRocketRightPool = new ExtendedSpritePool<>();
+    private ExtendedSpritePool<RocketSprite> otherRocketTripleCenterPool = new ExtendedSpritePool<>();
+    private ExtendedSpritePool<RocketSprite> otherRocketTripleLeftPool = new ExtendedSpritePool<>();
+    private ExtendedSpritePool<RocketSprite> otherRocketTripleRightPool = new ExtendedSpritePool<>();
+    private ExtendedSpritePool<RocketSprite> otherRocketDoubleDamagePool = new ExtendedSpritePool<>();
     private ExtendedSpritePool<ExplosionSprite> explosionPool = new ExtendedSpritePool<>();
     private ExtendedSpritePool<BossSprite> bossPool = new ExtendedSpritePool<>();
     private ExtendedSpritePool<PowerupSprite> powerupPool = new ExtendedSpritePool<>();
@@ -338,6 +344,24 @@
             append(srrocketRightSprite[i]);
             rocketRightPool.add(srrocketRightSprite[i]);
         }
+        otherRocketLeftSprite = new RocketSprite[64];
+        for (int i = 0; i < otherRocketLeftSprite.length; ++i) {
+            otherRocketLeftSprite[i] = new RocketSprite(
+                    rocketLeftRegion, "otherRocketLeftSprite" + i,
+                    x, width, y, height, true, 8);
+            otherRocketLeftSprite[i].setLastFrameStick(true);
+            append(otherRocketLeftSprite[i]);
+            otherRocketLeftPool.add(otherRocketLeftSprite[i]);
+        }
+        otherRocketRightSprite = new RocketSprite[64];
+        for (int i = 0; i < otherRocketRightSprite.length; ++i) {
+            otherRocketRightSprite[i] = new RocketSprite(
+                    rocketRightRegion, "otherRocketRightSprite" + i,
+                    x, width, y, height, true, 8);
+            otherRocketRightSprite[i].setLastFrameStick(true);
+            append(otherRocketRightSprite[i]);
+            otherRocketRightPool.add(otherRocketRightSprite[i]);
+        }
         tripleRocketSpriteCenter = new RocketSprite[64];
         otherTripleRocketSpriteCenter = new RocketSprite[64];
         for (int i = 0; i < tripleRocketSpriteCenter.length; ++i) {
@@ -349,7 +373,7 @@
                     centerRocketMultiRegion, "otherTripleRocketSpriteCenter" + i,
                     x, width, y, height, true, 1);
             append(otherTripleRocketSpriteCenter[i]);
-            rocketTripleCenterPool.add(otherTripleRocketSpriteCenter[i]);
+            otherRocketTripleCenterPool.add(otherTripleRocketSpriteCenter[i]);
         }
         tripleRocketSpriteLeft = new RocketSprite[64];
         otherTripleRocketSpriteLeft = new RocketSprite[64];
@@ -361,7 +385,7 @@
             otherTripleRocketSpriteLeft[i] = new RocketSprite(leftRocketMultiRegion, "otherTripleRocketSpriteLeft" + i,
                     x, width, y, height, true, 1);
             append(otherTripleRocketSpriteLeft[i]);
-            rocketTripleLeftPool.add(otherTripleRocketSpriteLeft[i]);
+            otherRocketTripleLeftPool.add(otherTripleRocketSpriteLeft[i]);
         }
         tripleRocketSpriteRight = new RocketSprite[64];
         otherTripleRocketSpriteRight = new RocketSprite[64];
@@ -373,7 +397,7 @@
             otherTripleRocketSpriteRight[i] = new RocketSprite(rightRocketMultiRegion, "otherTripleRocketSpriteRight" + i,
                     x, width, y, height, true, 1);
             append(otherTripleRocketSpriteRight[i]);
-            rocketTripleRightPool.add(otherTripleRocketSpriteRight[i]);
+            otherRocketTripleRightPool.add(otherTripleRocketSpriteRight[i]);
         }
         doubleDamageRocketSprite = new RocketSprite[64];
         otherDoubleDamageRocketSprite = new RocketSprite[64];
@@ -387,7 +411,7 @@
                     x, width, y, height, true, 4);
             otherDoubleDamageRocketSprite[i].setDoubleDamage(true);
             append(otherDoubleDamageRocketSprite[i]);
-            rocketDoubleDamagePool.add(otherDoubleDamageRocketSprite[i]);
+            otherRocketDoubleDamagePool.add(otherDoubleDamageRocketSprite[i]);
         }
         enemyrocketSprite = new RocketSprite[64];
         for (int i = 0; i < enemyrocketSprite.length; ++i) {
@@ -440,24 +464,6 @@
             enemyPool.add(enemy[i]);
         }
             
-        otherRocketLeftSprite = new RocketSprite[64];
-        for (int i = 0; i < otherRocketLeftSprite.length; ++i) {
-            otherRocketLeftSprite[i] = new RocketSprite(
-                    rocketLeftRegion, "otherRocketLeftSprite" + i,
-                    x, width, y, height, true, 8);
-            otherRocketLeftSprite[i].setLastFrameStick(true);
-            append(otherRocketLeftSprite[i]);
-            rocketLeftPool.add(otherRocketLeftSprite[i]);
-        }
-        otherRocketRightSprite = new RocketSprite[64];
-        for (int i = 0; i < otherRocketRightSprite.length; ++i) {
-            otherRocketRightSprite[i] = new RocketSprite(
-                    rocketRightRegion, "otherRocketRightSprite" + i,
-                    x, width, y, height, true, 8);
-            otherRocketRightSprite[i].setLastFrameStick(true);
-            append(otherRocketRightSprite[i]);
-            rocketRightPool.add(otherRocketRightSprite[i]);
-        }
         miniBossSprite = new ExtendedSprite[4];
         for (int i = 0; i < miniBossSprite.length; ++i) {
             miniBossSprite[i] = new ExtendedSprite(miniBossRegion[i], "miniBossSprite" + i,
@@ -1681,6 +1687,30 @@
         return giveLifePool;
     }
 
+    public ExtendedSpritePool<RocketSprite> getOtherRocketLeftPool() {
+        return otherRocketLeftPool;
+    }
+
+    public ExtendedSpritePool<RocketSprite> getOtherRocketRightPool() {
+        return otherRocketRightPool;
+    }
+
+    public ExtendedSpritePool<RocketSprite> getOtherRocketTripleCenterPool() {
+        return otherRocketTripleCenterPool;
+    }
+
+    public ExtendedSpritePool<RocketSprite> getOtherRocketTripleLeftPool() {
+        return otherRocketTripleLeftPool;
+    }
+
+    public ExtendedSpritePool<RocketSprite> getOtherRocketTripleRightPool() {
+        return otherRocketTripleRightPool;
+    }
+
+    public ExtendedSpritePool<RocketSprite> getOtherRocketDoubleDamagePool() {
+        return otherRocketDoubleDamagePool;
+    }
+
     public ExtendedSprite getArrowsSprite() {
         return arrowsSprite;
     }

diff -r d48be19f1594 -r a2c236d367a9 core/src/com/headwayent/spacerocket/old/LayerManager.java
--- a/core/src/com/headwayent/spacerocket/old/LayerManager.java	Tue Dec 07 19:30:32 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/old/LayerManager.java	Thu Dec 09 21:20:51 2021 +0200
@@ -244,11 +244,6 @@
 		for (int i = nlayers; --i >= 0;) {
 			ExtendedSprite comp = (ExtendedSprite) component[i];
 			if (comp.isVisible()) {
-				// IMPL NOTE: do this if outside Graphics clip region don't
-				// paint
-				// (comp.contains(x - comp.x, y - comp.y)) &&
-				// paint will happen only in clipped region of view window
-				// comp.paint(g);
 				comp.draw(batch);
 			}
 		}

diff -r d48be19f1594 -r a2c236d367a9 core/src/com/headwayent/spacerocket/old/SpaceRocketSprite.java
--- a/core/src/com/headwayent/spacerocket/old/SpaceRocketSprite.java	Tue Dec 07 19:30:32 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/old/SpaceRocketSprite.java	Thu Dec 09 21:20:51 2021 +0200
@@ -296,11 +296,15 @@
                 if (rocketLeftSprite != null) {
                     rocketLeftSprite.launch(getX() + (getWidth() * 0.5f) - (rocketLeftSprite.getWidth() * 0.5f),
                             getY() - rocketLeftSprite.getHeight() - normalRocketDist);
+                } else {
+                    System.out.println("rocketLeftSprite == null");
                 }
                 RocketSprite rocketRightSprite = graphicsManager.getRocketRightPool().removeOne();
                 if (rocketRightSprite != null) {
                     rocketRightSprite.launch(getX() + (getWidth() * 0.5f) - (rocketRightSprite.getWidth() * 0.5f),
                             getY() - rocketRightSprite.getHeight() - normalRocketDist);
+                } else {
+                    System.out.println("rocketRightSprite == null");
                 }
                 if (Preferences.getInstance().isSoundEnabled()) {
 				    launchSnd.play();