Re-implement independent x and y accel

Author: MEEPofFaith

src/progressed/entities/bullet/pseudo3d/ArcBasicBulletType.java

@@ -4,14 +4,12 @@
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.util.*;
-import mindustry.entities.bullet.*;
 import mindustry.gen.*;
 import progressed.graphics.*;
-import progressed.util.*;
 
 import static progressed.graphics.Draw3D.*;
 
-public class ArcBasicBulletType extends ArcBulletType{
+public abstract class ArcBasicBulletType extends ArcBulletType{
     public String sprite;
     public boolean bloomSprite = true;
     public boolean drawShadow = false, spinShade = true;
@@ -43,16 +41,6 @@ public void load(){
         shadowRegion = Core.atlas.find(sprite + "-shadow", region);
     }
 
-    @Override
-    public ArcBulletData createData(){
-        return new BasicArcBulletData();
-    }
-
-    @Override
-    public ArcBulletData createData(float z, float zVel, float gravity){
-        return new BasicArcBulletData(z, zVel, gravity);
-    }
-
     @Override
     public void draw(Bullet b){
         drawTargetZone(b);
@@ -101,88 +89,4 @@ public void draw(Bullet b){
 
         drawHomingDebug(b);
     }
-
-    public static class BasicArcBulletData extends ArcBulletData{
-        public float accel;
-
-        public BasicArcBulletData(float z, float zVel, float gravity){
-            super(z, zVel, gravity);
-        }
-
-        public BasicArcBulletData(){
-            super();
-        }
-
-        @Override
-        public void backMove(Bullet b){
-            float vSub = accel * Time.delta;
-            if(vSub > b.vel.len()){
-                b.vel.setLength(0); //Prevent rotation from being reversed
-            }else{
-                b.vel.sub(Tmp.v1.trns(b.rotation(), vSub));
-            }
-
-            super.backMove(b);
-        }
-
-        @Override
-        public void updateAccel(Bullet b){
-            float life = b.lifetime() - b.time();
-            float d = Mathf.dst(b.x, b.y, b.aimX, b.aimY);
-            accel = (2 * (d - b.vel.len() * life)) / (life * life);
-        }
-
-        @Override
-        public void update(Bullet b){
-            b.vel.add(Tmp.v1.trns(b.rotation(), accel * Time.delta));
-            super.update(b);
-        }
-
-        @Override
-        public void updateHoming(Bullet b, Teamc target){
-            BulletType type = b.type;
-
-            Tmp.v31.set(b.vel, zVel); //Current velocity
-
-            float v2 = Tmp.v31.len();
-            float pitch = Math3D.homingPitch(b.x, b.y, z, target.x(), target.y(), v2, accel, gravity); //Find target pitch between -pi/2 and pi/2
-
-            float polar = Mathf.pi - (pitch + Mathf.halfPi); //0 = up, pi - down. Convert -pi/2-pi/2 -> pi-0
-
-            Tmp.v32.setFromSpherical(b.angleTo(target) * Mathf.degRad, polar).setLength2(v2); //Target velocity
-
-            float angle = (float)Math.acos(Tmp.v31.dot(Tmp.v32) / v2) * Mathf.radDeg;
-
-            float h = type.homingPower * Time.delta;
-            if(angle <= h){
-                Tmp.v31.set(Tmp.v32);
-            }else{
-                //idk what I'm doing, but https://stackoverflow.com/questions/22099490/calculate-vector-after-rotating-it-towards-another-by-angle-θ-in-3d-space
-                Tmp.v33.set(Tmp.v31).crs(Tmp.v32).crs(Tmp.v31).nor();
-
-                float c = Mathf.cosDeg(h);
-                float s = Mathf.sinDeg(h);
-                Tmp.v31.scl(c).add(Tmp.v33.scl(s));
-            }
-
-            b.vel.set(Tmp.v31);
-            zVel = Tmp.v31.z;
-        }
-
-        @Override
-        public ArcBulletData setAccel(float a){
-            accel = a;
-            return this;
-        }
-
-        @Override
-        public float xAccel(Bullet b){
-            return accel * Mathf.cosDeg(b.rotation());
-        }
-
-        @Override
-        public float yAccel(Bullet b){
-            return accel * Mathf.sinDeg(b.rotation());
-        }
-    }
 }

src/progressed/entities/bullet/pseudo3d/ArcBoltBulletType.java

@@ -0,0 +1,130 @@
+package progressed.entities.bullet.pseudo3d;
+
+import arc.util.*;
+import mindustry.entities.bullet.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import progressed.util.*;
+
+public class ArcBoltBulletType extends ArcBasicBulletType{
+    public ArcBoltBulletType(float speed, float damage, String sprite){
+        super(speed, damage, sprite);
+    }
+
+    public ArcBoltBulletType(float speed, float damage){
+        this(speed, damage, "bullet");
+
+        spinShade = drawZone = drawTarget = drawProgress = false;
+    }
+
+    public ArcBoltBulletType(float speed){
+        this(speed, 0f);
+    }
+
+    @Override
+    public ArcBulletData createData(){
+        return new ArcBoltData();
+    }
+
+    @Override
+    public ArcBulletData createData(float z, float zVel, float gravity){
+        return new ArcBoltData(z, zVel, gravity);
+    }
+
+    /** Assuming accel and gravity stay constant, the bullet travels in a straight trajectory, */
+    public Bullet create3DStraight(Entityc owner, Team team, float x, float y, float z, float angle, float tilt, float vel, float accel){
+        Math3D.rotate(Tmp.v31, vel, angle, 0f, tilt);
+        Math3D.rotate(Tmp.v32, accel, angle, 0f, tilt);
+        Tmp.v1.set(Tmp.v31.x, Tmp.v31.y);
+
+        ArcBoltData data = new ArcBoltData(z, Tmp.v31.z, -Tmp.v32.z);
+        data.xAccel = Tmp.v32.x;
+        data.yAccel = Tmp.v32.y;
+
+        Bullet bullet = beginBulletCreate(owner, team, x, y);
+        bullet.vel.set(Tmp.v1);
+        bullet.rotation(Tmp.v1.angle());
+        if(backMove){
+            bullet.set(x - bullet.vel.x * Time.delta, y - bullet.vel.y * Time.delta);
+            data.backMove(bullet);
+        }else{
+            bullet.set(x, y);
+        }
+        bullet.data = data;
+        bullet.drag = drag;
+        bullet.hitSize = hitSize;
+        if(bullet.trail != null){
+            bullet.trail.clear();
+        }
+        data.updateLifetime(bullet);
+        data.updateAimPos(bullet);
+        bullet.add();
+        return bullet;
+    }
+
+    public static class ArcBoltData extends ArcBulletData{
+        public float xAccel, yAccel;
+
+        public ArcBoltData(float z, float zVel, float gravity){
+            super(z, zVel, gravity);
+        }
+
+        public ArcBoltData(float z, float zVel){
+            this(z, zVel, 1f);
+        }
+
+        public ArcBoltData(){
+            this(0, 0);
+        }
+
+        @Override
+        public void backMove(Bullet b){
+            b.vel.sub(xAccel * Time.delta, yAccel * Time.delta);
+            super.backMove(b);
+        }
+
+        @Override
+        public void updateAccel(Bullet b){
+            float life = b.lifetime() - b.time();
+            //Calculate accels
+            float dx = b.aimX - b.x;
+            xAccel = (2 * (dx - b.vel.x * life)) / (life * life);
+            float dy = b.aimY - b.y;
+            yAccel = (2 * (dy - b.vel.y * life)) / (life * life);
+        }
+
+        @Override
+        public void updateHoming(Bullet b, Teamc target){
+            BulletType type = b.type;
+
+            Tmp.v1.set(b.aimX, b.aimY).approachDelta(Tmp.v2.set(target), type.homingPower);
+            b.aimX = Tmp.v1.x;
+            b.aimY = Tmp.v1.y;
+            updateAccel(b);
+        }
+
+        @Override
+        public void update(Bullet b){
+            b.vel.add(xAccel * Time.delta, yAccel * Time.delta);
+            super.update(b);
+        }
+
+        @Override
+        public ArcBulletData setAccel(float a){
+            Tmp.v1.set(xAccel, yAccel).setLength(a);
+            xAccel = Tmp.v1.x;
+            yAccel = Tmp.v1.y;
+            return this;
+        }
+
+        @Override
+        public float xAccel(Bullet b){
+            return xAccel;
+        }
+
+        @Override
+        public float yAccel(Bullet b){
+            return yAccel;
+        }
+    }
+}

src/progressed/entities/bullet/pseudo3d/ArcBulletType.java

@@ -35,7 +35,7 @@ public abstract class ArcBulletType extends BulletType{
 
     public boolean bloomTrail = true;
 
-    public boolean drawZone = false;
+    public boolean drawZone = false, drawTarget = true, drawProgress = true;
     public float zoneLayer = Layer.bullet;
     public float targetRadius = 12f, zoneRadius = 3f * 8f, progressRadius = -1f;
     public float spikesWidth1 = -1f, spikesLength1 = -1f;
@@ -307,19 +307,24 @@ public void drawTargetZone(Bullet b){
             }
         }
 
-        float fin = b.fin() / lifetimeScl;
-        float pR = split ? Mathf.lerp(splitFrom.progressRadius, progressRadius, grow) * fout : progressRadius * scl;
-        PMDrawf.progressRing(x, y, pR, pR + 4f, fin);
-
-        float tR = split ? Mathf.lerp(splitFrom.targetRadius, targetRadius, grow) * fout : targetRadius * scl,
-            sW = split ? Mathf.lerp(splitFrom.spokeWidth, spokeWidth, grow) * fout : spokeWidth * scl,
-            sL = split ? Mathf.lerp(splitFrom.spokeLength, spokeLength, grow) * fout : spokeLength * scl;
-        PMDrawf.ring(x, y, tR, tR + 2);
-        Lines.stroke(sW);
-        for(int i = 0; i < 4; i++){
-            float a = -ang + 90 * i;
-            Lines.lineAngleCenter(x + Angles.trnsx(a, tR), y + Angles.trnsy(a, tR), a, sL, false);
+        if(drawProgress){
+            float fin = b.fin() / lifetimeScl;
+            float pR = split ? Mathf.lerp(splitFrom.progressRadius, progressRadius, grow) * fout : progressRadius * scl;
+            PMDrawf.progressRing(x, y, pR, pR + 4f, fin);
         }
+
+        if(drawTarget){
+            float tR = split ? Mathf.lerp(splitFrom.targetRadius, targetRadius, grow) * fout : targetRadius * scl,
+                sW = split ? Mathf.lerp(splitFrom.spokeWidth, spokeWidth, grow) * fout : spokeWidth * scl,
+                sL = split ? Mathf.lerp(splitFrom.spokeLength, spokeLength, grow) * fout : spokeLength * scl;
+            PMDrawf.ring(x, y, tR, tR + 2);
+            Lines.stroke(sW);
+            for(int i = 0; i < 4; i++){
+                float a = -ang + 90 * i;
+                Lines.lineAngleCenter(x + Angles.trnsx(a, tR), y + Angles.trnsy(a, tR), a, sL, false);
+            }
+        }
+
         Draw.color();
     }
 
@@ -418,35 +423,6 @@ public Bullet create3DVel(Entityc owner, Team team, float x, float y, float z, f
         return bullet;
     }
 
-    public Bullet create3DStraight(Entityc owner, Team team, float x, float y, float z, float angle, float tilt, float vel, float accel){
-        Math3D.rotate(Tmp.v31, vel, angle, 0f, tilt);
-        Math3D.rotate(Tmp.v32, accel, angle, 0f, tilt);
-        Tmp.v1.set(Tmp.v31.x, Tmp.v31.y);
-
-        ArcBulletData data = createData(z, Tmp.v31.z, -Tmp.v32.z);
-        data.setAccel(Tmp.v32.len());
-
-        Bullet bullet = beginBulletCreate(owner, team, x, y);
-        bullet.vel.set(Tmp.v1);
-        bullet.rotation(Tmp.v1.angle());
-        if(backMove){
-            bullet.set(x - bullet.vel.x * Time.delta, y - bullet.vel.y * Time.delta);
-            data.backMove(bullet);
-        }else{
-            bullet.set(x, y);
-        }
-        bullet.data = data;
-        bullet.drag = drag;
-        bullet.hitSize = hitSize;
-        if(bullet.trail != null){
-            bullet.trail.clear();
-        }
-        data.updateLifetime(bullet);
-        data.updateAimPos(bullet);
-        bullet.add();
-        return bullet;
-    }
-
     public Bullet create3DInherit(Bullet b, float angle, float inaccCone){
         return create3DInherit(b, angle, inaccCone, gravity);
     }