Anuken/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-09-20 21:08:42 +03:00
Code Issues Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Anuken 2020-06-26 18:50:30 -04:00
parent 7401c16ded
commit 0847b20401
3 changed files with 61 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
core/assets/scripts/global.js
View File

@ -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

1
core/assets/shaders/shield.frag
View File

@ -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;

2
core/src/mindustry/graphics/Shaders.java
View File

@ -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);