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

Cleanup

Browse Source
This commit is contained in:
Anuken
2018-11-25 22:55:13 -05:00
parent 54ad9ba243
commit 70507258ae
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -25,7 +25,7 @@ allprojects {
appName = 'Mindustry' appName = 'Mindustry'
gdxVersion = '1.9.9' gdxVersion = '1.9.9'
roboVMVersion = '2.3.0' roboVMVersion = '2.3.0'
uCoreVersion = '7610a9e20ebb0db62256b70f97e1783f5416e71d' uCoreVersion = 'f73e538757ac66ff62d7f25d93011142b6abb8df'
getVersionString = { getVersionString = {
String buildVersion = getBuildVersion() String buildVersion = getBuildVersion()

2
core/src/io/anuke/mindustry/graphics/CacheLayer.java
View File

@@ -73,7 +73,7 @@ public enum CacheLayer{
public void endShader(Shader shader){ public void endShader(Shader shader){
renderer.blocks.endFloor(); renderer.blocks.endFloor();
renderer.effectSurface.getBuffer().end(); //renderer.effectSurface.getBuffer().end();
renderer.pixelSurface.getBuffer().begin(); renderer.pixelSurface.getBuffer().begin();

3
core/src/io/anuke/mindustry/graphics/Shaders.java
View File

@@ -157,17 +157,14 @@ public class Shaders{
@Override @Override
public void apply(){ public void apply(){
// shader.setUniformf("u_progress", progress);
shader.setUniformf("u_color", color); shader.setUniformf("u_color", color);
shader.setUniformf("u_uv", region.getU(), region.getV()); shader.setUniformf("u_uv", region.getU(), region.getV());
shader.setUniformf("u_uv2", region.getU2(), region.getV2()); shader.setUniformf("u_uv2", region.getU2(), region.getV2());
//shader.setUniformf("u_time", Timers.time());
shader.setUniformf("u_texsize", region.getTexture().getWidth(), region.getTexture().getHeight()); shader.setUniformf("u_texsize", region.getTexture().getWidth(), region.getTexture().getHeight());
} }
} }
public static class Shield extends Shader{ public static class Shield extends Shader{
//public Color color = new Color();
public Shield(){ public Shield(){
super("shield", "default"); super("shield", "default");