Removed some unnecessary uniform setting

This commit is contained in:
Anuken
2022-05-30 12:05:10 -04:00
parent 55a219fc03
commit 29e086f23b
5 changed files with 7 additions and 5 deletions
@@ -437,8 +437,10 @@ public class BlockRenderer{
} }
if(build.team != pteam){ if(build.team != pteam){
build.drawTeam(); if(build.block.drawTeamOverlay){
Draw.z(Layer.block); build.drawTeam();
Draw.z(Layer.block);
}
}else if(renderer.drawStatus && block.hasConsumers){ }else if(renderer.drawStatus && block.hasConsumers){
build.drawStatus(); build.drawStatus();
} }
@@ -164,7 +164,6 @@ public class FloorRenderer{
public void beginc(){ public void beginc(){
shader.bind(); shader.bind();
shader.setUniformMatrix4("u_projectionViewMatrix", Core.camera.mat); shader.setUniformMatrix4("u_projectionViewMatrix", Core.camera.mat);
shader.setUniformi("u_texture", 0);
//only ever use the base environment texture //only ever use the base environment texture
texture.bind(0); texture.bind(0);
@@ -56,7 +56,6 @@ public class IndexedRenderer implements Disposable{
texture.bind(); texture.bind();
program.setUniformMatrix4("u_projTrans", combined); program.setUniformMatrix4("u_projTrans", combined);
program.setUniformi("u_texture", 0);
mesh.render(program, Gl.triangles, 0, vertices.length / vsize); mesh.render(program, Gl.triangles, 0, vertices.length / vsize);
} }
+2
View File
@@ -112,6 +112,8 @@ public class Block extends UnlockableContent implements Senseable{
public int variants = 0; public int variants = 0;
/** whether to draw a rotation arrow - this does not apply to lines of blocks */ /** whether to draw a rotation arrow - this does not apply to lines of blocks */
public boolean drawArrow = true; 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. */ /** for static blocks only: if true, tile data() is saved in world data. */
public boolean saveData; public boolean saveData;
/** whether you can break this with rightclick */ /** whether you can break this with rightclick */
+1 -1
View File
@@ -25,4 +25,4 @@ org.gradle.caching=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000 org.gradle.internal.http.connectionTimeout=100000
archash=e7c161da88 archash=a02840762b