Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Inlined Time.time

Browse Source
This commit is contained in:
Anuken
2020-11-30 10:15:22 -05:00
parent c41dfa46aa
commit 371a14af87
42 changed files with 97 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,7 +129,7 @@ public class BlockRenderer implements Disposable{
if(!camera.bounds(Tmp.r1).grow(tilesize * 2f).overlaps(Tmp.r2.setSize(b.size * tilesize).setCenter(block.x * tilesize + b.offset, block.y * tilesize + b.offset))) continue;
Draw.alpha(0.33f * brokenFade);
Draw.mixcol(Color.white, 0.2f + Mathf.absin(Time.globalTime(), 6f, 0.2f));
Draw.mixcol(Color.white, 0.2f + Mathf.absin(Time.globalTime, 6f, 0.2f));
Draw.rect(b.icon(Cicon.full), block.x * tilesize + b.offset, block.y * tilesize + b.offset, b.rotate ? block.rotation * 90 : 0f);
}
Draw.reset();

4
core/src/mindustry/graphics/MenuRenderer.java
View File

@@ -257,11 +257,11 @@ public class MenuRenderer implements Disposable{
Draw.color(Pal.engine);
Fill.circle(x + Angles.trnsx(rotation + 180, engineOffset), y + Angles.trnsy(rotation + 180, engineOffset),
engineSize + Mathf.absin(Time.time(), 2f, engineSize / 4f));
engineSize + Mathf.absin(Time.time, 2f, engineSize / 4f));
Draw.color(Color.white);
Fill.circle(x + Angles.trnsx(rotation + 180, engineOffset - 1f), y + Angles.trnsy(rotation + 180, engineOffset - 1f),
(engineSize + Mathf.absin(Time.time(), 2f, engineSize / 4f)) / 2f);
(engineSize + Mathf.absin(Time.time, 2f, engineSize / 4f)) / 2f);
Draw.color();
Draw.rect(icon, x, y, flyerRot - 90);

12
core/src/mindustry/graphics/OverlayRenderer.java
View File

@@ -89,7 +89,7 @@ public class OverlayRenderer{
}
Lines.stroke(unitFade);
Lines.square(select.x, select.y, select.hitSize() * 1.5f, Time.time() * 2f);
Lines.square(select.x, select.y, select.hitSize() * 1.5f, Time.time * 2f);
Draw.reset();
}
@@ -112,14 +112,14 @@ public class OverlayRenderer{
if(dst < state.rules.enemyCoreBuildRadius * 2.2f){
Draw.color(Color.darkGray);
Lines.circle(core.x, core.y - 2, state.rules.enemyCoreBuildRadius);
Draw.color(Pal.accent, core.team.color, 0.5f + Mathf.absin(Time.time(), 10f, 0.5f));
Draw.color(Pal.accent, core.team.color, 0.5f + Mathf.absin(Time.time, 10f, 0.5f));
Lines.circle(core.x, core.y, state.rules.enemyCoreBuildRadius);
}
});
}
Lines.stroke(2f);
Draw.color(Color.gray, Color.lightGray, Mathf.absin(Time.time(), 8f, 1f));
Draw.color(Color.gray, Color.lightGray, Mathf.absin(Time.time, 8f, 1f));
if(state.hasSpawns()){
for(Tile tile : spawner.getSpawns()){
@@ -167,15 +167,15 @@ public class OverlayRenderer{
float size = 8;
Draw.rect(player.unit().item().icon(Cicon.medium), v.x, v.y, size, size);
Draw.color(Pal.accent);
Lines.circle(v.x, v.y, 6 + Mathf.absin(Time.time(), 5f, 1f));
Lines.circle(v.x, v.y, 6 + Mathf.absin(Time.time, 5f, 1f));
Draw.reset();
Building tile = world.buildWorld(v.x, v.y);
if(input.canDropItem() && tile != null && tile.interactable(player.team()) && tile.acceptStack(player.unit().item(), player.unit().stack.amount, player.unit()) > 0 && player.within(tile, itemTransferRange)){
Lines.stroke(3f, Pal.gray);
Lines.square(tile.x, tile.y, tile.block.size * tilesize / 2f + 3 + Mathf.absin(Time.time(), 5f, 1f));
Lines.square(tile.x, tile.y, tile.block.size * tilesize / 2f + 3 + Mathf.absin(Time.time, 5f, 1f));
Lines.stroke(1f, Pal.place);
Lines.square(tile.x, tile.y, tile.block.size * tilesize / 2f + 2 + Mathf.absin(Time.time(), 5f, 1f));
Lines.square(tile.x, tile.y, tile.block.size * tilesize / 2f + 2 + Mathf.absin(Time.time, 5f, 1f));
Draw.reset();
}

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

@@ -66,7 +66,7 @@ public class Shaders{
public void apply(){
setUniformf("u_resolution", Core.graphics.getWidth(), Core.graphics.getHeight());
setUniformf("u_time", Time.globalTime() / 10f);
setUniformf("u_time", Time.globalTime / 10f);
setUniformf("u_campos", camera.position);
setUniformf("u_rcampos", Tmp.v31.set(camera.position).sub(planet.position));
setUniformf("u_light", planet.getLightNormal());
@@ -174,7 +174,7 @@ public class Shaders{
setUniformf("u_color", color);
setUniformf("u_uv", region.u, region.v);
setUniformf("u_uv2", region.u2, region.v2);
setUniformf("u_time", Time.time());
setUniformf("u_time", Time.time);
setUniformf("u_texsize", region.texture.width, region.texture.height);
}
}
@@ -188,7 +188,7 @@ public class Shaders{
@Override
public void apply(){
setUniformf("u_dp", Scl.scl(1f));
setUniformf("u_time", Time.time() / Scl.scl(1f));
setUniformf("u_time", Time.time / Scl.scl(1f));
setUniformf("u_offset",
Core.camera.position.x - Core.camera.width / 2,
Core.camera.position.y - Core.camera.height / 2);
@@ -216,7 +216,7 @@ public class Shaders{
setUniformf("u_campos", Core.camera.position.x, Core.camera.position.y);
setUniformf("u_ccampos", Core.camera.position);
setUniformf("u_resolution", Core.graphics.getWidth(), Core.graphics.getHeight());
setUniformf("u_time", Time.time());
setUniformf("u_time", Time.time);
texture.bind(1);
renderer.effectBuffer.getTexture().bind(0);
@@ -240,7 +240,7 @@ public class Shaders{
public void apply(){
setUniformf("u_campos", Core.camera.position.x - Core.camera.width / 2, Core.camera.position.y - Core.camera.height / 2);
setUniformf("u_resolution", Core.camera.width, Core.camera.height);
setUniformf("u_time", Time.time());
setUniformf("u_time", Time.time);
if(hasUniform("u_noise")){
Core.assets.get("sprites/noise.png", Texture.class).bind(1);

4
core/src/mindustry/graphics/g3d/PlanetRenderer.java
View File

@@ -209,7 +209,7 @@ public class PlanetRenderer implements Disposable{
for(int i = 0; i < pointCount + 1; i++){
float f = i / (float)pointCount;
Tmp.c1.set(from).lerp(to, (f+Time.globalTime()/timeScale)%1f);
Tmp.c1.set(from).lerp(to, (f+ Time.globalTime /timeScale)%1f);
batch.color(Tmp.c1);
batch.vertex(Tmp.bz3.valueAt(Tmp.v32, f));
@@ -218,7 +218,7 @@ public class PlanetRenderer implements Disposable{
}
public void drawBorders(Sector sector, Color base){
Color color = Tmp.c1.set(base).a(base.a + 0.3f + Mathf.absin(Time.globalTime(), 5f, 0.3f));
Color color = Tmp.c1.set(base).a(base.a + 0.3f + Mathf.absin(Time.globalTime, 5f, 0.3f));
float r1 = 1f;
float r2 = outlineRad + 0.001f;