From 366822e4d19a5f449aca523f1dc47515388fc2bf Mon Sep 17 00:00:00 2001 From: TranquillyUnpleasant <62061444+TranquillyUnpleasant@users.noreply.github.com> Date: Tue, 28 Sep 2021 07:25:22 +0500 Subject: [PATCH 1/2] Remove unused variable (#6063) This got leftover from some other shader testing I did. --- core/assets/shaders/cryofluid.frag | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/assets/shaders/cryofluid.frag b/core/assets/shaders/cryofluid.frag index 4299a0b8b1..6bfac12520 100644 --- a/core/assets/shaders/cryofluid.frag +++ b/core/assets/shaders/cryofluid.frag @@ -14,8 +14,6 @@ uniform float u_time; varying vec2 v_texCoords; -const float shakeScl = 20.0; - void main(){ vec2 c = v_texCoords.xy; vec2 coords = vec2(c.x * u_resolution.x + u_campos.x, c.y * u_resolution.y + u_campos.y); From 182dfc5f384033c6f66563d880d334f64316ddf0 Mon Sep 17 00:00:00 2001 From: Matthew Peng <54301439+MEEPofFaith@users.noreply.github.com> Date: Tue, 28 Sep 2021 05:41:40 -0700 Subject: [PATCH 2/2] delta in reload for a LaserTurret isn't properly calculated (#6068) --- .../src/mindustry/world/blocks/defense/turrets/LaserTurret.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java index 0d0a912a5e..8106aa836a 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java @@ -67,7 +67,7 @@ public class LaserTurret extends PowerTurret{ Liquid liquid = liquids.current(); float maxUsed = consumes.get(ConsumeType.liquid).amount; - float used = (cheating() ? maxUsed * Time.delta : Math.min(liquids.get(liquid), maxUsed * Time.delta)); + float used = (cheating() ? maxUsed : Math.min(liquids.get(liquid), maxUsed)) * Time.delta; reload -= used * liquid.heatCapacity * coolantMultiplier; liquids.remove(liquid, used);