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

Updated FBO method names

Browse Source
This commit is contained in:
Anuken
2020-03-25 11:06:52 -04:00
parent a1b64900ab
commit 6cc2719ed7
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/mindustry/game/Schematics.java
View File

@@ -183,7 +183,7 @@ public class Schematics implements Loadable{
Tmp.m2.set(Draw.trans()); Tmp.m2.set(Draw.trans());
FrameBuffer buffer = new FrameBuffer((schematic.width + padding) * resolution, (schematic.height + padding) * resolution); FrameBuffer buffer = new FrameBuffer((schematic.width + padding) * resolution, (schematic.height + padding) * resolution);
shadowBuffer.beginDraw(Color.clear); shadowBuffer.begin(Color.clear);
Draw.trans().idt(); Draw.trans().idt();
Draw.proj().setOrtho(0, 0, shadowBuffer.getWidth(), shadowBuffer.getHeight()); Draw.proj().setOrtho(0, 0, shadowBuffer.getWidth(), shadowBuffer.getHeight());
@@ -202,9 +202,9 @@ public class Schematics implements Loadable{
} }
}); });
shadowBuffer.endDraw(); shadowBuffer.end();
buffer.beginDraw(Color.clear); buffer.begin(Color.clear);
Draw.proj().setOrtho(0, buffer.getHeight(), buffer.getWidth(), -buffer.getHeight()); Draw.proj().setOrtho(0, buffer.getHeight(), buffer.getWidth(), -buffer.getHeight());
@@ -231,7 +231,7 @@ public class Schematics implements Loadable{
Draw.flush(); Draw.flush();
Draw.trans().idt(); Draw.trans().idt();
buffer.endDraw(); buffer.end();
Draw.proj(Tmp.m1); Draw.proj(Tmp.m1);
Draw.trans(Tmp.m2); Draw.trans(Tmp.m2);

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

@@ -183,14 +183,14 @@ public class LightRenderer{
} }
Draw.color(); Draw.color();
buffer.beginDraw(Color.clear); buffer.begin(Color.clear);
Gl.blendEquationSeparate(Gl.funcAdd, Gl.max); Gl.blendEquationSeparate(Gl.funcAdd, Gl.max);
for(Runnable run : lights){ for(Runnable run : lights){
run.run(); run.run();
} }
Draw.reset(); Draw.reset();
buffer.endDraw(); buffer.end();
Gl.blendEquationSeparate(Gl.funcAdd, Gl.funcAdd); Gl.blendEquationSeparate(Gl.funcAdd, Gl.funcAdd);
Draw.color(); Draw.color();

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

@@ -169,7 +169,7 @@ public class MenuRenderer implements Disposable{
//draw shadows //draw shadows
Draw.proj().setOrtho(0, 0, shadows.getWidth(), shadows.getHeight()); Draw.proj().setOrtho(0, 0, shadows.getWidth(), shadows.getHeight());
shadows.beginDraw(Color.clear); shadows.begin(Color.clear);
Draw.color(Color.black); Draw.color(Color.black);
for(int x = 0; x < width; x++){ for(int x = 0; x < width; x++){
for(int y = 0; y < height; y++){ for(int y = 0; y < height; y++){
@@ -179,7 +179,7 @@ public class MenuRenderer implements Disposable{
} }
} }
Draw.color(); Draw.color();
shadows.endDraw(); shadows.end();
SpriteBatch prev = Core.batch; SpriteBatch prev = Core.batch;

2
gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=0cae533620f20846febba83e19f531c337204d44 archash=dd0f2c60c53919ce97c987e502acf94af3a9a2b4