mirror of
https://github.com/Anuken/Mindustry.git
synced 2025-02-25 22:17:59 +07:00
Removed some unnecessary uniform setting
This commit is contained in:
parent
55a219fc03
commit
29e086f23b
@ -437,8 +437,10 @@ public class BlockRenderer{
|
||||
}
|
||||
|
||||
if(build.team != pteam){
|
||||
build.drawTeam();
|
||||
Draw.z(Layer.block);
|
||||
if(build.block.drawTeamOverlay){
|
||||
build.drawTeam();
|
||||
Draw.z(Layer.block);
|
||||
}
|
||||
}else if(renderer.drawStatus && block.hasConsumers){
|
||||
build.drawStatus();
|
||||
}
|
||||
|
@ -164,7 +164,6 @@ public class FloorRenderer{
|
||||
public void beginc(){
|
||||
shader.bind();
|
||||
shader.setUniformMatrix4("u_projectionViewMatrix", Core.camera.mat);
|
||||
shader.setUniformi("u_texture", 0);
|
||||
|
||||
//only ever use the base environment texture
|
||||
texture.bind(0);
|
||||
|
@ -56,7 +56,6 @@ public class IndexedRenderer implements Disposable{
|
||||
texture.bind();
|
||||
|
||||
program.setUniformMatrix4("u_projTrans", combined);
|
||||
program.setUniformi("u_texture", 0);
|
||||
|
||||
mesh.render(program, Gl.triangles, 0, vertices.length / vsize);
|
||||
}
|
||||
|
@ -112,6 +112,8 @@ public class Block extends UnlockableContent implements Senseable{
|
||||
public int variants = 0;
|
||||
/** whether to draw a rotation arrow - this does not apply to lines of blocks */
|
||||
public boolean drawArrow = true;
|
||||
/** whether to draw the team corner by default */
|
||||
public boolean drawTeamOverlay = true;
|
||||
/** for static blocks only: if true, tile data() is saved in world data. */
|
||||
public boolean saveData;
|
||||
/** whether you can break this with rightclick */
|
||||
|
@ -25,4 +25,4 @@ org.gradle.caching=true
|
||||
#used for slow jitpack builds; TODO see if this actually works
|
||||
org.gradle.internal.http.socketTimeout=100000
|
||||
org.gradle.internal.http.connectionTimeout=100000
|
||||
archash=e7c161da88
|
||||
archash=a02840762b
|
||||
|
Loading…
Reference in New Issue
Block a user