From 183c922b6bf3db33af6173dd38e7f3c25a689718 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 15 Jun 2021 11:32:49 -0400 Subject: [PATCH] Do not save MirrorFilter temporary vectors --- core/src/mindustry/entities/effect/ParticleEffect.java | 4 ++-- core/src/mindustry/maps/filters/MirrorFilter.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/entities/effect/ParticleEffect.java b/core/src/mindustry/entities/effect/ParticleEffect.java index a6e5df24a8..2b8fd4e52d 100644 --- a/core/src/mindustry/entities/effect/ParticleEffect.java +++ b/core/src/mindustry/entities/effect/ParticleEffect.java @@ -59,12 +59,12 @@ public class ParticleEffect extends Effect{ Angles.randLenVectors(e.id, particles, length * fin + baseLength, e.rotation, cone, (x, y) -> { Lines.lineAngle(ox + x, oy + y, Mathf.angle(x, y), len); - Drawf.light(ox + x, oy + y, len * lightScl, lightColor, lightOpacity); + Drawf.light(ox + x, oy + y, len * lightScl, lightColor, lightOpacity* Draw.getColor().a); }); }else{ Angles.randLenVectors(e.id, particles, length * fin + baseLength, e.rotation, cone, (x, y) -> { Draw.rect(tex, ox + x, oy + y, rad, rad, e.rotation + offset + e.time * spin); - Drawf.light(ox + x, oy + y, rad * lightScl, lightColor, lightOpacity); + Drawf.light(ox + x, oy + y, rad * lightScl, lightColor, lightOpacity * Draw.getColor().a); }); } } diff --git a/core/src/mindustry/maps/filters/MirrorFilter.java b/core/src/mindustry/maps/filters/MirrorFilter.java index cdb324b0ef..9e91fb4847 100644 --- a/core/src/mindustry/maps/filters/MirrorFilter.java +++ b/core/src/mindustry/maps/filters/MirrorFilter.java @@ -12,7 +12,7 @@ import mindustry.maps.filters.FilterOption.*; import mindustry.world.*; public class MirrorFilter extends GenerateFilter{ - private final Vec2 v1 = new Vec2(), v2 = new Vec2(), v3 = new Vec2(); + private static final Vec2 v1 = new Vec2(), v2 = new Vec2(), v3 = new Vec2(); int angle = 45; boolean rotate = false;