Removed team light drawing

This commit is contained in:
Anuken
2022-04-06 17:17:47 -04:00
parent 047c284e48
commit 7268ac98f8
32 changed files with 53 additions and 63 deletions
@@ -133,7 +133,7 @@ public class MendProjector extends Block{
@Override
public void drawLight(){
Drawf.light(team, x, y, lightRadius * smoothEfficiency, baseColor, 0.7f * smoothEfficiency);
Drawf.light(x, y, lightRadius * smoothEfficiency, baseColor, 0.7f * smoothEfficiency);
}
@Override
@@ -92,7 +92,7 @@ public class OverdriveProjector extends Block{
@Override
public void drawLight(){
Drawf.light(team, x, y, lightRadius * smoothEfficiency, baseColor, 0.7f * smoothEfficiency);
Drawf.light(x, y, lightRadius * smoothEfficiency, baseColor, 0.7f * smoothEfficiency);
}
@Override
@@ -150,7 +150,7 @@ public class TractorBeamTurret extends BaseTurret{
Draw.mixcol(laserColor, Mathf.absin(4f, 0.6f));
Drawf.laser(team, laser, laserStart, laserEnd,
Drawf.laser(laser, laserStart, laserEnd,
x + Angles.trnsx(ang, shootLength), y + Angles.trnsy(ang, shootLength),
lastX, lastY, strength * efficiency * laserWidth);
@@ -122,7 +122,7 @@ public class BeamNode extends PowerBlock{
if(dst > 1 + size/2){
var point = Geometry.d4[i];
float poff = tilesize/2f;
Drawf.laser(team, laser, laserEnd, x + poff*size*point.x, y + poff*size*point.y, dests[i].worldx() - poff*point.x, dests[i].worldy() - poff*point.y, w);
Drawf.laser(laser, laserEnd, x + poff*size*point.x, y + poff*size*point.y, dests[i].worldx() - poff*point.x, dests[i].worldy() - poff*point.y, w);
}
}
}
@@ -133,7 +133,7 @@ public class ConsumeGenerator extends PowerGenerator{
//???
drawer.drawLight(this);
//TODO hard coded
Drawf.light(team, x, y, (60f + Mathf.absin(10f, 5f)) * size, Color.orange, 0.5f * warmup);
Drawf.light(x, y, (60f + Mathf.absin(10f, 5f)) * size, Color.orange, 0.5f * warmup);
}
}
}
@@ -133,7 +133,7 @@ public class ImpactReactor extends PowerGenerator{
@Override
public void drawLight(){
Drawf.light(team, x, y, (110f + Mathf.absin(5, 5f)) * warmup, Tmp.c1.set(plasma2).lerp(plasma1, Mathf.absin(7f, 0.2f)), 0.8f * warmup);
Drawf.light(x, y, (110f + Mathf.absin(5, 5f)) * warmup, Tmp.c1.set(plasma2).lerp(plasma1, Mathf.absin(7f, 0.2f)), 0.8f * warmup);
}
@Override
@@ -94,7 +94,7 @@ public class LightBlock extends Block{
@Override
public void drawLight(){
Drawf.light(team, x, y, lightRadius * Math.min(smoothTime, 2f), Tmp.c1.set(color), brightness * efficiency);
Drawf.light(x, y, lightRadius * Math.min(smoothTime, 2f), Tmp.c1.set(color), brightness * efficiency);
}
@Override
@@ -143,7 +143,7 @@ public class NuclearReactor extends PowerGenerator{
@Override
public void drawLight(){
float fract = productionEfficiency;
Drawf.light(team, x, y, (90f + Mathf.absin(5, 5f)) * fract, Tmp.c1.set(lightColor).lerp(Color.scarlet, heat), 0.6f * fract);
Drawf.light(x, y, (90f + Mathf.absin(5, 5f)) * fract, Tmp.c1.set(lightColor).lerp(Color.scarlet, heat), 0.6f * fract);
}
@Override
@@ -182,7 +182,7 @@ public class PowerNode extends PowerBlock{
vx = Mathf.cosDeg(angle1), vy = Mathf.sinDeg(angle1),
len1 = size1 * tilesize / 2f - 1.5f, len2 = size2 * tilesize / 2f - 1.5f;
Drawf.laser(team, laser, laserEnd, x1 + vx*len1, y1 + vy*len1, x2 - vx*len2, y2 - vy*len2, laserScale);
Drawf.laser(laser, laserEnd, x1 + vx*len1, y1 + vy*len1, x2 - vx*len2, y2 - vy*len2, laserScale);
}
protected boolean overlaps(float srcx, float srcy, Tile other, Block otherBlock, float range){
@@ -109,7 +109,7 @@ public class ThermalGenerator extends PowerGenerator{
@Override
public void drawLight(){
Drawf.light(team, x, y, (40f + Mathf.absin(10f, 5f)) * Math.min(productionEfficiency, 2f) * size, Color.scarlet, 0.4f);
Drawf.light(x, y, (40f + Mathf.absin(10f, 5f)) * Math.min(productionEfficiency, 2f) * size, Color.scarlet, 0.4f);
}
@Override
@@ -313,12 +313,12 @@ public class BeamDrill extends Block{
if(boostWarmup < 0.99f){
Draw.alpha(1f - boostWarmup);
Drawf.laser(team, laser, laserEnd, lsx, lsy, lx, ly, width);
Drawf.laser(laser, laserEnd, lsx, lsy, lx, ly, width);
}
if(boostWarmup > 0.001f){
Draw.alpha(boostWarmup);
Drawf.laser(team, laserBoost, laserEndBoost, lsx, lsy, lx, ly, width);
Drawf.laser(laserBoost, laserEndBoost, lsx, lsy, lx, ly, width);
}
}
Draw.color();
@@ -340,7 +340,7 @@ public class CoreBlock extends StorageBlock{
@Override
public void drawLight(){
Drawf.light(team, x, y, lightRadius, Pal.accent, 0.65f + Mathf.absin(20f, 0.1f));
Drawf.light(x, y, lightRadius, Pal.accent, 0.65f + Mathf.absin(20f, 0.1f));
}
@Override
@@ -137,10 +137,10 @@ public class RepairPoint extends Block{
Lines.circle(lastEnd.x, lastEnd.y, 1f + f * pulseRadius);
Draw.color(laserColor);
Drawf.laser(team, laser, laserEnd, originX, originY, lastEnd.x, lastEnd.y, strength * beamWidth);
Drawf.laser(laser, laserEnd, originX, originY, lastEnd.x, lastEnd.y, strength * beamWidth);
Draw.z(Layer.flyingUnit + 1.1f);
Draw.color(laserTopColor);
Drawf.laser(team, laserTop, laserTopEnd, originX, originY, lastEnd.x, lastEnd.y, strength * beamWidth);
Drawf.laser(laserTop, laserTopEnd, originX, originY, lastEnd.x, lastEnd.y, strength * beamWidth);
Draw.color();
}
}
+1 -1
View File
@@ -54,6 +54,6 @@ public class DrawFlame extends DrawBlock{
@Override
public void drawLight(Building build){
Drawf.light(build.team, build.x, build.y, (lightRadius + Mathf.absin(lightSinScl, lightSinMag)) * build.warmup() * build.block.size, flameColor, lightAlpha);
Drawf.light(build.x, build.y, (lightRadius + Mathf.absin(lightSinScl, lightSinMag)) * build.warmup() * build.block.size, flameColor, lightAlpha);
}
}