Commit: 773ac24449fb2b8b88723bf9bf2b887bf27bf623 - SpaceRocket (hg)

Commit MetaInfo

• Révision: 773ac24449fb2b8b88723bf9bf2b887bf27bf623 (tree)
• l'heure: 2021-12-03 07:04:58
• Auteur: sebastian_bugiu
• Commiter: sebastian_bugiu

Message de Log

Various improvements. Animation texture region split seems to be working.

Change Summary

• 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/RocketSprite.java
• modified: core/src/com/headwayent/spacerocket/old/SpaceRocketSprite.java
• add: core/src/com/headwayent/spacerocket/Utility.java

Modification

diff -r 9547586d5610 -r 773ac24449fb core/src/com/headwayent/spacerocket/Utility.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/src/com/headwayent/spacerocket/Utility.java	Fri Dec 03 00:04:58 2021 +0200
@@ -0,0 +1,45 @@
+package com.headwayent.spacerocket;
+
+import com.badlogic.gdx.graphics.g2d.TextureRegion;
+
+public class Utility {
+
+    public static TextureRegion[][] splitFlipped(TextureRegion region, int tileWidth, int tileHeight) {
+        int x = region.getRegionX();
+        int y = Math.round(region.getV2() * region.getTexture().getHeight());
+        int width = region.getRegionWidth();
+        int height = region.getRegionHeight();
+
+        int rows = height / tileHeight;
+        int cols = width / tileWidth;
+
+        int startX = x;
+        TextureRegion[][] tiles = new TextureRegion[rows][cols];
+        for (int row = 0; row < rows; row++, y += tileHeight) {
+            x = startX;
+            for (int col = 0; col < cols; col++, x += tileWidth) {
+                tiles[row][col] = new TextureRegion(region.getTexture(), x, y, tileWidth, tileHeight);
+                tiles[row][col].flip(false, true);
+            }
+        }
+
+        return tiles;
+    }
+
+    public static void printStackTrace() {
+        System.out.println("Printing stack trace:");
+        StackTraceElement[] elements = Thread.currentThread().getStackTrace();
+        for (int i = 1; i < elements.length; i++) {
+            StackTraceElement s = elements[i];
+            System.out.println("\tat " + s.getClassName() + "." + s.getMethodName() + "(" + s.getFileName() + ":" + s.getLineNumber() + ")");
+        }
+    }
+
+    public static boolean hasTimePassed(long beginTime, long waitTime) {
+        return System.currentTimeMillis() - beginTime > waitTime;
+    }
+
+    public static long currentTimeMillis() {
+        return System.currentTimeMillis();
+    }
+}

diff -r 9547586d5610 -r 773ac24449fb core/src/com/headwayent/spacerocket/old/ExtendedSprite.java
--- a/core/src/com/headwayent/spacerocket/old/ExtendedSprite.java	Wed Dec 01 21:08:58 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/old/ExtendedSprite.java	Fri Dec 03 00:04:58 2021 +0200
@@ -9,6 +9,7 @@
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.headwayent.spacerocket.SpaceRocket;
+import com.headwayent.spacerocket.Utility;
 
 public class ExtendedSprite extends Sprite {
 
@@ -41,18 +42,20 @@
         super(textureRegion);
         this.numFrames = frames;
         if (frames > 1) {
-            textureRegion.setRegionWidth(textureRegion.getRegionWidth() / frames);
-            setRegion(textureRegion);
-            setSize(textureRegion.getRegionWidth(), textureRegion.getRegionHeight());
-            TextureRegion[][] split = TextureRegion.split(textureRegion.getTexture(), textureRegion.getTexture().getWidth() / frames, 1);
+            TextureRegion[][] split = Utility.splitFlipped(textureRegion, textureRegion.getRegionWidth() / frames, textureRegion.getRegionHeight());
+            if (split[0].length != frames) {
+                throw new IllegalArgumentException(frames + " frames split len: " + split[0].length);
+            }
+            setRegion(split[0][0]);
+            setSize(split[0][0].getRegionWidth(), split[0][0].getRegionHeight());
             animation = new Animation<>(0.25f, split[0]);
-//            setRegion(split[0][0]);
         }
+        setOrigin(0, 0);
         setBounds(leftBound, rightBound, upperBound, bottomBound);
         this.name = name;
         setVisible(false);
     }
-    
+
     public void setBounds(float leftBound, float rightBound, float upperBound, float bottomBound) {
     	this.leftBound = leftBound;
         this.rightBound = rightBound;
@@ -81,12 +84,14 @@
     }
 
     public void reset() {
+        System.out.println("Resetting " + name);
         setVisible(false);
         if (animation != null) {
             animationStateTime = 0;
             lastFrameReached = false;
         }
         if (pool != null) {
+            System.out.println("Readding " + name + " to pool " + pool);
             pool.add(this);
         }
     }
@@ -216,6 +221,8 @@
 
     public void setVisible(boolean visible) {
         this.visible = visible;
+        System.out.println("visibility: " + visible + " name: " + name);
+//        Utility.printStackTrace();
     }
 
     public boolean isHiddenAfterLastFrame() {

diff -r 9547586d5610 -r 773ac24449fb core/src/com/headwayent/spacerocket/old/ExtendedSpritePool.java
--- a/core/src/com/headwayent/spacerocket/old/ExtendedSpritePool.java	Wed Dec 01 21:08:58 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/old/ExtendedSpritePool.java	Fri Dec 03 00:04:58 2021 +0200
@@ -9,8 +9,13 @@
         if (sprite.isVisible()) {
             throw new IllegalStateException(sprite.getName() + " is still visible");
         }
-        sprite.setPool(this);
-        spriteList.add(sprite);
+//        if (spriteList.contains(sprite)) {
+//            throw new IllegalArgumentException(sprite.getName() + " is already in the list");
+//        }
+        if (!spriteList.contains(sprite)) {
+            sprite.setPool(this);
+            spriteList.add(sprite);
+        }
     }
 
     public T removeOne() {

diff -r 9547586d5610 -r 773ac24449fb core/src/com/headwayent/spacerocket/old/GraphicsManager.java
--- a/core/src/com/headwayent/spacerocket/old/GraphicsManager.java	Wed Dec 01 21:08:58 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/old/GraphicsManager.java	Fri Dec 03 00:04:58 2021 +0200
@@ -9,7 +9,6 @@
 import com.headwayent.spacerocket.SpaceRocket;
 
 import java.util.Random;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 public class GraphicsManager extends LayerManager {
 	
@@ -884,11 +883,9 @@
 
             if (explode) {
                 Vector2 p = spaceRocket.getSPPos();
-                for (int j = 0; j < explosion.length; ++j) {
-                    if (explosion[j].isVisible() == false) {
-                        explosion[j].launch(p.x, p.y);
-                        break;
-                    }
+                ExplosionSprite explosionSprite = getExplosionPool().removeOne();
+                if (explosionSprite != null) {
+                    explosionSprite.launch(p.x, p.y);
                 }
             }
             if (spaceCanvas.getStatus().livesRemaining == 0) {
@@ -1144,7 +1141,7 @@
                                     spaceRocket.changeFrame(SpaceRocketSprite.TRIPLE_FIRE_FRAME);
                                     break;
                                 case 4: //Invincibility
-                                    spaceRocket.EnableInvincibility();
+                                    spaceRocket.enableInvincibility();
                                     break;
                                 default:
                                     System.out.println("Powerup Type error " + type);
@@ -1179,7 +1176,7 @@
                             otherSpaceRocket.changeFrame(SpaceRocketSprite.TRIPLE_FIRE_FRAME);
                             break;
                         case 3:
-                            otherSpaceRocket.EnableInvincibility();
+                            otherSpaceRocket.enableInvincibility();
                             break;
                         default:
                             break;
@@ -1531,7 +1528,6 @@
                     flamesSprite[1].setVisible(false);
                 }
                 if ((otherSpaceRocket.isInvincibilityEnabled()) && (otherSpaceRocket.isVisible())) {
-                    otherSpaceRocket.DecrementInvincibilityTicks();
                     shieldSprite[1].setPosition(otherSpaceRocket.getX(), otherSpaceRocket.getY());
                     shieldSprite[1].setVisible(true);
 //                    shieldSprite[1].nextFrame();
@@ -1597,12 +1593,10 @@
             for (int j = 0; j < enemyrocketSprite.length; ++j) {
                 if ((rocket[i].isVisible()) && (enemyrocketSprite[j].isVisible())) {
                     if (rocket[i].checkCollision(enemyrocketSprite[j])) {
-                        for (int k = 0; k < explosion.length; ++k) {
-                            if (explosion[k].isVisible() == false) {
-                                explosion[k].launch(rocket[i].getX(),
-                                        rocket[i].getY());
-                                break;
-                            }
+                        ExplosionSprite explosionSprite = getExplosionPool().removeOne();
+                        if (explosionSprite != null) {
+                            explosionSprite.launch(rocket[i].getX(),
+                                    rocket[i].getY());
                         }
                         if (i < rocket.length - 1) {
                             ++i;

diff -r 9547586d5610 -r 773ac24449fb core/src/com/headwayent/spacerocket/old/RocketSprite.java
--- a/core/src/com/headwayent/spacerocket/old/RocketSprite.java	Wed Dec 01 21:08:58 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/old/RocketSprite.java	Fri Dec 03 00:04:58 2021 +0200
@@ -4,10 +4,10 @@
 
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import com.headwayent.spacerocket.SpaceRocket;
 
 public class RocketSprite extends ExtendedSprite {
 
-    private Random rand;
     private boolean upDirection;
     private boolean doubleDamage;
     public static final int _SR_SPEED = -12;
@@ -23,8 +23,6 @@
         super(textureRegion, name,
                 leftBound, rightBound, upperBound, bottomBound, numFrames,
                 true);
-        rand = new Random(System.currentTimeMillis());
-        setVisible(false);
         this.upDirection = upDirection;
         SR_SPEED = (ExtendedCanvas.getScreenWidth() > GraphicsManager.MIN_WIDTH ||
                 ExtendedCanvas.getScreenHeight() > ExtendedCanvas.getScreenHeight()) ? _SR_SPEED : _SR_SPEED_SM;
@@ -51,29 +49,6 @@
         return ret;
     }
 
-    /*	public void SetPosition(int x, int y) {
-    XPos = x;
-    YPos = y;
-    }
-
-    public int GetXPos() {
-    return XPos;
-    }
-
-    public int GetYPos() {
-    return YPos;
-    }*/
-    /*	public void SetVisible(boolean b) {
-    setVisible(b);
-    }*/
-    /*	public void reset() {
-    setVisible(false);
-    released = true;
-    }*/
-    /*	public boolean isReleased() {
-    return released;
-    }*/
-
     @Override
     public void launch(float x, float y) {
         //	this.upDirection = upDirection;
@@ -83,7 +58,7 @@
         if (upDirection) {
             speedY = SR_SPEED;
         } else {
-            speedY = rand.nextInt(ENEMY_SPEED) + (ENEMY_SPEED >> 2);
+            speedY = SpaceRocket.getRandom().nextInt(ENEMY_SPEED) + (ENEMY_SPEED >> 2);
         }
         setSpeed(0, speedY);
 //		released = true;

diff -r 9547586d5610 -r 773ac24449fb core/src/com/headwayent/spacerocket/old/SpaceRocketSprite.java
--- a/core/src/com/headwayent/spacerocket/old/SpaceRocketSprite.java	Wed Dec 01 21:08:58 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/old/SpaceRocketSprite.java	Fri Dec 03 00:04:58 2021 +0200
@@ -6,13 +6,15 @@
 import com.badlogic.gdx.math.Vector2;
 import com.headwayent.spacerocket.Preferences;
 import com.headwayent.spacerocket.SpaceRocket;
+import com.headwayent.spacerocket.Utility;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
 
 public class SpaceRocketSprite extends ExtendedSprite {
     private float initialXPos, initialYPos;// XPos, YPos;
-    private int invincibilityTicks;
+    private long invincibilityTime;
+    private long currentInvincibilityTime;
     private static final int FIRE_DELAY = 500;
     public static int SR_ACC_SPEED;
     public static int SR_MAX_SPEED;
@@ -36,7 +38,7 @@
     public static final int TRIPLE_FIRE_FRAME = 2;
     public static final int INVINCIBILITY_FRAME = 0;
     private static final int NUM_FRAMES = 3;
-    private static final int INVINCIBILITY_TICKS = 90;
+    private static final long INVINCIBILITY_TICKS = 5000;
     private static final int _DOUBLE_DAMAGE_SPEED = -7;
     private static final int _DOUBLE_DAMAGE_SPEED_SM = -4;
     private static int DOUBLE_DAMAGE_SPEED;
@@ -150,7 +152,7 @@
                     
                     s.resetExplode();
                 }
-                if ((invincibilityTicks == 0)) {
+                if (Utility.hasTimePassed(currentInvincibilityTime, invincibilityTime)) {
                     //    if(gfxMgmt.getStatus().LivesRemaining  - 1 > 0) {
                     spPos.x = this.getX();
                     spPos.y = this.getY();
@@ -190,8 +192,13 @@
         return ret;
     }
 
-    public void EnableInvincibility() {
-        invincibilityTicks = INVINCIBILITY_TICKS;
+    public void enableInvincibility() {
+        enableInvincibilityInternal(INVINCIBILITY_TICKS);
+    }
+
+    private void enableInvincibilityInternal(long invincibilityTicks) {
+        invincibilityTime = invincibilityTicks;
+        currentInvincibilityTime = Utility.currentTimeMillis();
     }
 
     public void reset() {
@@ -201,7 +208,7 @@
         speedX = 0;
         speedY = 0;
         currentDelay = 0;
-        invincibilityTicks = 30;
+        enableInvincibilityInternal(2000);
         lives = NUM_LIVES;
         changeFrame(STD_FRAME);
         shouldReset = true;
@@ -264,11 +271,7 @@
     }
 
     public boolean isInvincibilityEnabled() {
-        if (invincibilityTicks > 0) {
-            return true;
-        } else {
-            return false;
-        }
+        return !Utility.hasTimePassed(currentInvincibilityTime, invincibilityTime);
     }
 
     synchronized public void move(boolean useDelta) {
@@ -285,12 +288,6 @@
         }
     }
 
-    synchronized public void DecrementInvincibilityTicks() {
-        if (invincibilityTicks > 0) {
-            --invincibilityTicks;
-        }
-    }
-
     synchronized public void launchRocket() {
         if ((System.currentTimeMillis() - currentDelay) > FIRE_DELAY) {
             currentDelay = System.currentTimeMillis();
@@ -425,9 +422,6 @@
     }
 
     void advance(int left, int up, int shoot) {   
-        if (invincibilityTicks > 0) {
-            --invincibilityTicks;
-        }
         synchronized (this) {
             if (left == -1) {
                 if (speedX - SR_ACC_SPEED < -SR_MAX_SPEED) {