Gravitational lensing

Author: MEEPofFaith

assets/shaders/gravitationallensing.frag

@@ -0,0 +1,35 @@
+#define HIGHP
+
+#define HALFPI 3.1415926535897932384626433832795 / 2.0
+
+uniform sampler2D u_texture;
+
+uniform vec2 u_campos;
+uniform vec2 u_resolution;
+
+uniform vec2 u_center;
+uniform vec2 u_radii;
+
+varying vec2 v_texCoords;
+
+float interp(float a){
+    return 1.0 - cos(a * HALFPI);
+}
+
+void main() {
+    vec2 c = v_texCoords.xy;
+    vec2 coords = (c * u_resolution) + u_campos;
+    float dst = distance(u_center, coords);
+
+    if(dst < u_radii.x){
+        gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);
+    }else if(dst > u_radii.y){
+        gl_FragColor = texture2D(u_texture, c);
+    }else{
+        float p = (dst - u_radii.x) / (u_radii.y - u_radii.x);
+        p = interp(p);
+        float a = atan(coords.x - u_center.x, coords.y - u_center.y) + HALFPI;
+        vec2 pos = u_center + vec2(-u_radii.y * cos(a) * p, u_radii.y * sin(a) * p);
+        gl_FragColor = texture2D(u_texture, (pos - u_campos) / u_resolution);
+    }
+}

assets/shaders/passThrough.frag

@@ -0,0 +1,9 @@
+#define HIGHP
+
+uniform sampler2D u_texture;
+
+varying vec2 v_texCoords;
+
+void main() {
+    gl_FragColor = texture2D(u_texture, v_texCoords.xy);
+}

src/progressed/content/blocks/PMBlocks.java

@@ -765,7 +765,7 @@ public void setStats(){
             reload = 520f;
             range = 256f;
             shootEffect = smokeEffect = Fx.none;
-            shoot.firstShotDelay = EnergyFx.kugelblitzCharge.lifetime - 1f;
+            shoot.firstShotDelay = EnergyFx.kugelblitzGrow.lifetime - 1f;
             rotateSpeed = 2f;
             recoil = 2f;
             recoilTime = 240f;

src/progressed/content/bullets/PMBullets.java

@@ -27,7 +27,7 @@ public class PMBullets{
 
     blackHole, absorbed,
 
-    harbingerLaser, excaliburLaser, sentinelLaser,
+    excaliburLaser, sentinelLaser,
 
     harmanuke,
 
@@ -110,7 +110,7 @@ public static void load(){
             backMove = false;
             lightRadius = 8f;
             lightOpacity = 0.7f;
-            chargeEffect = EnergyFx.kugelblitzCharge;
+            chargeEffect = EnergyFx.kugelblitzGrow;
         }};
 
         absorbed = new BulletType(0f, 0f){
@@ -135,43 +135,6 @@ public void update(Bullet b){
             }
         };
 
-        harbingerLaser = new LaserBulletType(Float.POSITIVE_INFINITY){
-            {
-                colors = new Color[]{Color.valueOf("F3E97966"), Color.valueOf("F3E979"), Color.white};
-                length = 900f;
-                width = 75f;
-                lifetime = 130;
-                lightColor = colors[1];
-                ammoMultiplier = 1;
-
-                lightningSpacing = 20f;
-                lightningLength = 15;
-                lightningLengthRand = 10;
-                lightningDelay = 0.5f;
-                lightningDamage = (float)Double.MAX_VALUE;
-                lightningAngleRand = 45f;
-                lightningColor = colors[1];
-
-                sideAngle = 25f;
-                sideWidth = width / 8f;
-                sideLength = length / 1.5f;
-
-                chargeEffect = EnergyFx.harbingerCharge;
-            }
-
-            @Override
-            public void hitTile(Bullet b, Building build, float x, float y, float initialHealth, boolean direct){
-                super.hitTile(b, build, x, y, initialHealth, direct);
-                if(build.team != b.team) build.kill();
-            }
-
-            @Override
-            public void hitEntity(Bullet b, Hitboxc other, float initialHealth){
-                super.hitEntity(b, other, initialHealth);
-                if(((Teamc)other).team() != b.team) ((Healthc)other).kill();
-            }
-        };
-
         excaliburLaser = new CrossLaserBulletType(1500f){{
             length = 800f;
             width = 26f;

src/progressed/content/effects/EnergyFx.java

@@ -10,11 +10,9 @@
 import progressed.graphics.renders.*;
 
 import static arc.graphics.g2d.Draw.*;
-import static arc.graphics.g2d.Lines.line;
 import static arc.graphics.g2d.Lines.*;
 import static arc.math.Angles.*;
 import static arc.util.Tmp.*;
-import static mindustry.graphics.Drawf.*;
 
 public class EnergyFx{
     public static Effect
@@ -58,34 +56,18 @@ public class EnergyFx{
         }
     }),
 
-    kugelblitzCharge = new Effect(80f, e -> {
-        float in = 6f,
-            out = 160f;
-        PMRenders.blackHole(e.x, e.y, in * e.fin(), (in + (out - in) * 0.33f) * e.fin(), e.color);
+    kugelblitzGrow = new Effect(80f, e -> {
+        float in = 6f;
+        float fin = e.fin(Interp.sineOut);
+        PMRenders.blackHole(e.x, e.y, in * fin, in * 6f * fin, e.color);
     }),
 
     blackHoleSwirl = makeSwirlEffect(90f, 8, 3f, 90f, 720f, true).layer(Layer.effect + 0.005f),
 
-    blackHoleDespawn = new Effect(24f, e -> {
-        color(Color.darkGray, Color.black, e.fin());
-
-        e.scaled(12f, s -> {
-            stroke(2f * e.fout());
-            Lines.circle(e.x, e.y, s.fin() * 10f);
-        });
-
-        stroke(2f * e.fout());
-        randLenVectors(e.id, 4, e.fin() * 15f, (x, y) -> {
-            float ang = angle(x, y);
-            lineAngle(e.x + x, e.y + y, ang, e.fout() * 3 + 1f);
-        });
-
-        color(e.color);
-        randLenVectors(e.id * 2L, 4, e.fin() * 15f, (x, y) -> {
-            float ang = angle(x, y);
-            lineAngle(e.x + x, e.y + y, ang, e.fout() * 3 + 1f);
-        });
-    }).layer(Layer.effect + 0.005f),
+    blackHoleDespawn = new Effect(40f, e -> {
+        Lines.stroke(2f * e.fout(), Color.black);
+        Lines.circle(e.x, e.y, 18f * e.fin(Interp.pow3Out));
+    }).layer(Layer.effect + 0.03f),
 
     blackHoleAbsorb = new Effect(20f, e -> {
         color(Color.black);
@@ -132,57 +114,7 @@ public class EnergyFx{
         }
 
         Drawf.light(e.x, e.y, circleRad * 1.6f, Pal.heal, e.fout());
-    }),
-
-    harbingerCharge = new Effect(150f, 1600f, e -> {
-        Color[] colors = {Color.valueOf("D99F6B55"), Color.valueOf("E8D174aa"), Color.valueOf("F3E979"), Color.valueOf("ffffff")};
-        float[] tscales = {1f, 0.7f, 0.5f, 0.2f};
-        float[] strokes = {2f, 1.5f, 1, 0.3f};
-        float[] lenscales = {1, 1.12f, 1.15f, 1.17f};
-
-        float lightOpacity = 0.4f + (e.finpow() * 0.4f);
-
-        Draw.color(colors[0], colors[2], 0.5f + e.finpow() * 0.5f);
-        Lines.stroke(Mathf.lerp(0f, 28f, e.finpow()));
-        Lines.circle(e.x, e.y, 384f * (1f - e.finpow()));
-
-        for(int i = 0; i < 36; i++){
-            v1.trns(i * 10f, 384f * (1 - e.finpow()));
-            v2.trns(i * 10f + 10f, 384f * (1f - e.finpow()));
-            light(e.x + v1.x, e.y + v1.y, e.x + v2.x, e.y + v2.y, 14f / 2f + 60f * e.finpow(), Draw.getColor(), lightOpacity + (0.2f * e.finpow()));
-        }
-
-        float fade = 1f - Mathf.curve(e.time, e.lifetime - 30f, e.lifetime);
-        float grow = Mathf.curve(e.time, 0f, e.lifetime - 30f);
-
-        for(int i = 0; i < 4; i++){
-            float baseLen = (900f + (Mathf.absin(Time.time / ((i + 1f) * 2f) + Mathf.randomSeed(e.id), 0.8f, 1.5f) * (900f / 1.5f))) * 0.75f * fade;
-            Draw.color(Tmp.c1.set(colors[i]).mul(1f + Mathf.absin(Time.time / 3f + Mathf.randomSeed(e.id), 1.0f, 0.3f) / 3f));
-            for(int j = 0; j < 2; j++){
-                int dir = Mathf.signs[j];
-                for(int k = 0; k < 10; k++){
-                    float side = k * (360f / 10f);
-                    for(int l = 0; l < 4; l++){
-                        Lines.stroke((16f * 0.75f + Mathf.absin(Time.time, 0.5f, 1f)) * grow * strokes[i] * tscales[l]);
-                        Lines.lineAngle(e.x, e.y, (e.rotation + 360f * e.finpow() + side) * dir, baseLen * lenscales[l], false);
-                    }
-
-                    v1.trns((e.rotation + 360f * e.finpow() + side) * dir, baseLen * 1.1f);
-
-                    light(e.x, e.y, e.x + v1.x, e.y + v1.y, ((16f * 0.75f + Mathf.absin(Time.time, 0.5f, 1f)) * grow * strokes[i] * tscales[j]) / 2f + 60f * e.finpow(), colors[2], lightOpacity);
-                }
-            }
-            Draw.reset();
-        }
-    }),
-
-    //[circle radius, distance]
-    everythingGunSwirl = new Effect(120f, 1600f, e -> {
-        float[] data = (float[])e.data;
-        v1.trns(Mathf.randomSeed(e.id, 360f) + e.rotation * e.fin(), (16f + data[1]) * e.fin());
-        color(e.color, Color.black, 0.25f + e.fin() * 0.75f);
-        Fill.circle(e.x + v1.x, e.y + v1.y, data[0] * e.fout());
-    }).layer(Layer.bullet - 0.00999f);
+    });
 
     public static Effect makeSwirlEffect(Color color, float eLifetime, int length, float maxWidth, float minRot, float maxRot, float minDst, float maxDst, boolean lerp){
         return new Effect(eLifetime, 400f, e -> {
@@ -191,7 +123,7 @@ public static Effect makeSwirlEffect(Color color, float eLifetime, int length, f
             float lifetime = e.lifetime - length;
             float dst;
             if(minDst < 0 || maxDst < 0){
-                dst = Math.abs(e.rotation);;
+                dst = Math.abs(e.rotation);
             }else{
                 dst = Mathf.randomSeed(e.id, minDst, maxDst);
             }

src/progressed/entities/bullet/energy/BlackHoleBulletType.java

@@ -30,7 +30,7 @@ public class BlackHoleBulletType extends BulletType{
 
     public Color color = Color.black;
     public Effect absorbEffect = EnergyFx.blackHoleAbsorb, swirlEffect = EnergyFx.blackHoleSwirl;
-    public float suctionRadius = 160f, size = 6f, damageRadius = 17f;
+    public float suctionRadius = 160f, size = 6f, lensEdge = -1f, damageRadius = 17f;
     public float force = 10f, scaledForce = 800f, bulletForce = 0.1f, bulletScaledForce = 2f;
     public float swirlInterval = 3f;
     public int swirlEffects = 4;
@@ -46,6 +46,14 @@ public BlackHoleBulletType(float speed, float damage){
         layer = Layer.effect + 0.03f;
     }
 
+    @Override
+    public void init(){
+        super.init();
+        if(lensEdge < 0f) lensEdge = size * 6f;
+
+        drawSize = Math.max(drawSize, lensEdge * 2f);
+    }
+
     @Override
     public float continuousDamage(){
         return damage / 2f * 60f; //Damage every 2 ticks
@@ -54,20 +62,22 @@ public float continuousDamage(){
     @Override
     public void update(Bullet b){
         if(b.timer(1, 2f)){
-            PMDamage.completeDamage(b.team, b.x, b.y, damageRadius, b.damage);
+            float fout = fout(b);
+            PMDamage.completeDamage(b.team, b.x, b.y, damageRadius * fout, b.damage);
 
-            Units.nearbyEnemies(b.team, b.x - suctionRadius, b.y - suctionRadius, suctionRadius * 2f, suctionRadius * 2f, unit -> {
-                if(unit.within(b.x, b.y, suctionRadius)){
-                    Vec2 impulse = Tmp.v1.trns(unit.angleTo(b), force + (1f - unit.dst(b) / suctionRadius) * scaledForce);
+            float sR = suctionRadius * fout;
+            Units.nearbyEnemies(b.team, b.x - sR, b.y - sR, sR * 2f, sR * 2f, unit -> {
+                if(unit.within(b.x, b.y, sR)){
+                    Vec2 impulse = Tmp.v1.trns(unit.angleTo(b), force + (1f - unit.dst(b) / sR) * scaledForce);
                     if(repel) impulse.rotate(180f);
                     unit.impulseNet(impulse);
                 }
             });
 
-            Groups.bullet.intersect(b.x - suctionRadius, b.y - suctionRadius, suctionRadius * 2f, suctionRadius * 2f, other -> {
-                //if(other != null && Mathf.within(b.x, b.y, other.x, other.y, suctionRadius) && b != other && b.team != other.team && other.type.speed > 0.01f && !checkType(other.type)){
-                if(other != null && Mathf.within(b.x, b.y, other.x, other.y, suctionRadius) && b != other && b.team != other.team && b.type.absorbable && other.type.speed > 0.01f){
-                    Vec2 impulse = Tmp.v1.trns(other.angleTo(b), bulletForce + (1f - other.dst(b) / suctionRadius) * bulletScaledForce);
+            Groups.bullet.intersect(b.x - sR, b.y - sR, sR * 2f, sR * 2f, other -> {
+                //if(other != null && Mathf.within(b.x, b.y, other.x, other.y, sR) && b != other && b.team != other.team && other.type.speed > 0.01f && !checkType(other.type)){
+                if(other != null && Mathf.within(b.x, b.y, other.x, other.y, sR) && b != other && b.team != other.team && b.type.absorbable && other.type.speed > 0.01f){
+                    Vec2 impulse = Tmp.v1.trns(other.angleTo(b), bulletForce + (1f - other.dst(b) / sR) * bulletScaledForce);
                     if(repel) impulse.rotate(180f);
                     other.vel().add(impulse);
 
@@ -102,14 +112,19 @@ public void updateTrailEffects(Bullet b){
 
     @Override
     public void draw(Bullet b){
-        PMRenders.blackHole(b.x, b.y, size, size + (suctionRadius - size) * 0.33f, b.team.color);
+        float fout = fout(b);
+        PMRenders.blackHole(b.x, b.y, size * fout, lensEdge * fout, b.team.color);
     }
 
     @Override
     public void drawLight(Bullet b){
         //none
     }
 
+    public float fout(Bullet b){
+        return Interp.sineOut.apply(1 - Mathf.curve(b.time, b.lifetime - swirlEffect.lifetime, b.lifetime));
+    }
+
     @Override
     public void despawned(Bullet b){
         despawnEffect.at(b.x, b.y, b.rotation(), b.team.color);

src/progressed/entities/effect/RepeatEffect.java

@@ -0,0 +1,36 @@
+package progressed.entities.effect;
+
+import arc.graphics.g2d.*;
+import mindustry.entities.*;
+
+public class RepeatEffect extends Effect{
+    public Effect effect;
+    public float interval;
+    public int times;
+
+    public RepeatEffect(Effect effect, float interval, int times){
+        this.effect = effect;
+        this.interval = interval;
+        this.times = times;
+    }
+
+    @Override
+    public void init(){
+        lifetime = interval * times + effect.lifetime;
+        clip = effect.clip;
+    }
+
+    @Override
+    public void render(EffectContainer e){
+        var cont = e.inner();
+        float life = e.time;
+        for(int i = 0; i < times; i++){
+            float del = i * interval;
+            if(life > del && life <= del + effect.lifetime){
+                cont.set(e.id + i, e.color, life - del, effect.lifetime, e.rotation, e.x, e.y, e.data);
+                Draw.z(effect.layer);
+                effect.render(cont);
+            }
+        }
+    }
+}