From 0847b204010b076533bc8bfccab65a59d5e26b92 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 26 Jun 2020 18:50:30 -0400 Subject: [PATCH] Cleanup --- core/assets/scripts/global.js | 122 +++++++++++------------ core/assets/shaders/shield.frag | 1 - core/src/mindustry/graphics/Shaders.java | 2 - 3 files changed, 61 insertions(+), 64 deletions(-) diff --git a/core/assets/scripts/global.js b/core/assets/scripts/global.js index e42dd8605c..e254f4c2e7 100755 --- a/core/assets/scripts/global.js +++ b/core/assets/scripts/global.js @@ -24,72 +24,73 @@ const extend = function(classType, params){ const newEffect = (lifetime, renderer) => new Effects.Effect(lifetime, new Effects.EffectRenderer({render: renderer})) Call = Packages.mindustry.gen.Call -importPackage(Packages.arc.scene.ui) -importPackage(Packages.mindustry.editor) -importPackage(Packages.mindustry.entities.comp) -importPackage(Packages.mindustry.graphics.g3d) -importPackage(Packages.mindustry.world.blocks.sandbox) -importPackage(Packages.mindustry.game) -importPackage(Packages.mindustry.ui.dialogs) -importPackage(Packages.mindustry.ui.fragments) -importPackage(Packages.mindustry.world.blocks.environment) -importPackage(Packages.arc.math) importPackage(Packages.mindustry.world.blocks.power) -importPackage(Packages.mindustry.core) +importPackage(Packages.mindustry.game) +importPackage(Packages.arc.scene) +importPackage(Packages.mindustry.maps.filters) +importPackage(Packages.mindustry.gen) importPackage(Packages.arc.struct) -importPackage(Packages.mindustry.maps) +importPackage(Packages.mindustry.world.meta) +importPackage(Packages.arc.func) +importPackage(Packages.arc.math) +importPackage(Packages.mindustry.type) +importPackage(Packages.mindustry.world.blocks.environment) importPackage(Packages.arc.scene.actions) -importPackage(Packages.mindustry.ctype) +importPackage(Packages.arc.math.geom) +importPackage(Packages.mindustry.world.consumers) +importPackage(Packages.mindustry.graphics) +importPackage(Packages.arc.graphics) +importPackage(Packages.mindustry.world.blocks.units) +importPackage(Packages.mindustry.world.blocks.distribution) +importPackage(Packages.mindustry.world.blocks) +importPackage(Packages.mindustry.ui) +importPackage(Packages.mindustry.core) +importPackage(Packages.arc.scene.ui) +importPackage(Packages.arc.scene.ui.layout) +importPackage(Packages.mindustry.entities.comp) +importPackage(Packages.mindustry.ui.fragments) +importPackage(Packages.mindustry.entities) importPackage(Packages.mindustry.ai.formations) importPackage(Packages.arc.scene.utils) -importPackage(Packages.mindustry.world.blocks.defense) -importPackage(Packages.mindustry.ai.types) -importPackage(Packages.mindustry.gen) -importPackage(Packages.mindustry.world.blocks.distribution) -importPackage(Packages.mindustry.world.meta) -importPackage(Packages.mindustry.maps.filters) -importPackage(Packages.mindustry.logic) -importPackage(Packages.arc.math.geom) -importPackage(Packages.mindustry.graphics) -importPackage(Packages.mindustry.entities.bullet) -importPackage(Packages.mindustry.world.meta.values) -importPackage(Packages.mindustry.input) -importPackage(Packages.mindustry.entities) -importPackage(Packages.arc.func) -importPackage(Packages.mindustry.world.blocks.experimental) -importPackage(Packages.mindustry.world.consumers) -importPackage(Packages.mindustry.ai) -importPackage(Packages.mindustry.world.blocks.legacy) -importPackage(Packages.mindustry.world.modules) -importPackage(Packages.mindustry.async) -importPackage(Packages.mindustry.content) -importPackage(Packages.arc.graphics.g2d) -importPackage(Packages.mindustry.ui) -importPackage(Packages.mindustry.ui.layout) -importPackage(Packages.mindustry.entities.units) -importPackage(Packages.mindustry.type) -importPackage(Packages.arc.scene) -importPackage(Packages.mindustry.world.blocks.production) -importPackage(Packages.mindustry) -importPackage(Packages.mindustry.world.blocks.storage) -importPackage(Packages.mindustry.world) -importPackage(Packages.mindustry.world.blocks.units) -importPackage(Packages.arc.scene.event) -importPackage(Packages.arc.scene.ui.layout) -importPackage(Packages.mindustry.world.blocks.defense.turrets) -importPackage(Packages.arc.scene.style) -importPackage(Packages.arc.graphics) -importPackage(Packages.mindustry.world.blocks.liquid) -importPackage(Packages.mindustry.world.blocks) -importPackage(Packages.mindustry.audio) -importPackage(Packages.mindustry.ai.formations.patterns) -importPackage(Packages.mindustry.world.blocks.payloads) -importPackage(Packages.mindustry.maps.planet) -importPackage(Packages.arc.util) -importPackage(Packages.mindustry.world.producers) -importPackage(Packages.arc) -importPackage(Packages.mindustry.maps.generators) importPackage(Packages.mindustry.world.blocks.campaign) +importPackage(Packages.mindustry.content) +importPackage(Packages.mindustry.world.blocks.storage) +importPackage(Packages.mindustry.world.meta.values) +importPackage(Packages.mindustry.world) +importPackage(Packages.mindustry.world.blocks.experimental) +importPackage(Packages.arc.scene.event) +importPackage(Packages.mindustry.graphics.g3d) +importPackage(Packages.mindustry.ui.dialogs) +importPackage(Packages.mindustry.world.blocks.defense) +importPackage(Packages.mindustry.maps) +importPackage(Packages.mindustry.world.blocks.legacy) +importPackage(Packages.mindustry.ctype) +importPackage(Packages.mindustry.world.blocks.defense.turrets) +importPackage(Packages.mindustry.world.draw) +importPackage(Packages.mindustry.editor) +importPackage(Packages.mindustry.entities.bullet) +importPackage(Packages.mindustry.logic) +importPackage(Packages.arc.scene.style) +importPackage(Packages.mindustry.audio) +importPackage(Packages.mindustry.entities.units) +importPackage(Packages.mindustry.world.blocks.production) +importPackage(Packages.mindustry.ai.formations.patterns) +importPackage(Packages.mindustry.input) +importPackage(Packages.arc.util) +importPackage(Packages.mindustry.world.blocks.sandbox) +importPackage(Packages.mindustry.ai) +importPackage(Packages.mindustry.async) +importPackage(Packages.mindustry.world.blocks.liquid) +importPackage(Packages.arc) +importPackage(Packages.mindustry.ai.types) +importPackage(Packages.mindustry.world.modules) +importPackage(Packages.arc.graphics.g2d) +importPackage(Packages.mindustry.ui.layout) +importPackage(Packages.mindustry.maps.generators) +importPackage(Packages.mindustry.world.blocks.payloads) +importPackage(Packages.mindustry.world.producers) +importPackage(Packages.mindustry) +importPackage(Packages.mindustry.maps.planet) const PlayerIpUnbanEvent = Packages.mindustry.game.EventType.PlayerIpUnbanEvent const PlayerIpBanEvent = Packages.mindustry.game.EventType.PlayerIpBanEvent const PlayerUnbanEvent = Packages.mindustry.game.EventType.PlayerUnbanEvent @@ -129,7 +130,6 @@ const WaveEvent = Packages.mindustry.game.EventType.WaveEvent const ResetEvent = Packages.mindustry.game.EventType.ResetEvent const PlayEvent = Packages.mindustry.game.EventType.PlayEvent const DisposeEvent = Packages.mindustry.game.EventType.DisposeEvent -const ContentReloadEvent = Packages.mindustry.game.EventType.ContentReloadEvent const ServerLoadEvent = Packages.mindustry.game.EventType.ServerLoadEvent const ClientCreateEvent = Packages.mindustry.game.EventType.ClientCreateEvent const SaveLoadEvent = Packages.mindustry.game.EventType.SaveLoadEvent diff --git a/core/assets/shaders/shield.frag b/core/assets/shaders/shield.frag index ec25333e75..54c890b0d4 100644 --- a/core/assets/shaders/shield.frag +++ b/core/assets/shaders/shield.frag @@ -12,7 +12,6 @@ uniform vec2 u_invsize; uniform float u_time; uniform float u_dp; uniform vec2 u_offset; -uniform vec4 u_shieldcolor; varying vec2 v_texCoords; diff --git a/core/src/mindustry/graphics/Shaders.java b/core/src/mindustry/graphics/Shaders.java index 5db33a4839..fd418c9673 100644 --- a/core/src/mindustry/graphics/Shaders.java +++ b/core/src/mindustry/graphics/Shaders.java @@ -178,7 +178,6 @@ public class Shaders{ } public static class ShieldShader extends LoadShader{ - public Color color = Pal.accent.cpy(); public ShieldShader(){ super("shield", "screenspace"); @@ -188,7 +187,6 @@ public class Shaders{ public void apply(){ setUniformf("u_dp", Scl.scl(1f)); setUniformf("u_time", Time.time() / Scl.scl(1f)); - setUniformf("u_shieldcolor", color); setUniformf("u_offset", Core.camera.position.x - Core.camera.width / 2, Core.camera.position.y - Core.camera.height / 2);