Skip to content

Commit 5302a0e

Browse files
committed
Update to libGDX 1.9.14 and guacamole 0.3.0.
1 parent 6572602 commit 5302a0e

2 files changed

Lines changed: 6 additions & 13 deletions

File tree

build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,9 @@ install {
5454

5555
// DEPENDENCIES
5656
ext {
57-
gdxVersion = "1.9.13"
58-
guacamoleVersion = "82dccd6cf0" //= 0.2.5
57+
gdxVersion = "1.9.14"
58+
guacamoleVersion = "0.3.0"
59+
5960
// Test dependencies
6061
junitVersion = "5.6.0"
6162
mockitoVersion = "3.4.4"

src/main/java/de/eskalon/commons/screen/ScreenManager.java

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,16 @@
2424

2525
import javax.annotation.Nullable;
2626

27-
import com.badlogic.gdx.Gdx;
2827
import com.badlogic.gdx.InputProcessor;
2928
import com.badlogic.gdx.Screen;
30-
import com.badlogic.gdx.graphics.GL20;
3129
import com.badlogic.gdx.graphics.Pixmap.Format;
3230
import com.badlogic.gdx.graphics.Texture;
3331
import com.badlogic.gdx.graphics.g2d.TextureRegion;
3432
import com.badlogic.gdx.graphics.glutils.FrameBuffer;
3533
import com.badlogic.gdx.graphics.glutils.HdpiUtils;
3634
import com.badlogic.gdx.utils.Array;
3735
import com.badlogic.gdx.utils.Disposable;
36+
import com.badlogic.gdx.utils.ScreenUtils;
3837

3938
import de.damios.guacamole.Preconditions;
4039
import de.damios.guacamole.gdx.graphics.NestableFrameBuffer;
@@ -336,12 +335,7 @@ public void render(float delta) {
336335
/*
337336
* RENDER THE CURRENT SCREEN; no transition is going on
338337
*/
339-
Gdx.gl.glClearColor(currScreen.getClearColor().r,
340-
currScreen.getClearColor().g,
341-
currScreen.getClearColor().b,
342-
currScreen.getClearColor().a);
343-
Gdx.gl.glClear(
344-
GL20.GL_COLOR_BUFFER_BIT | GL20.GL_DEPTH_BUFFER_BIT);
338+
ScreenUtils.clear(currScreen.getClearColor(), true);
345339
this.currScreen.render(delta);
346340
}
347341
} else {
@@ -499,9 +493,7 @@ public boolean inTransition() {
499493
TextureRegion screenToTexture(ManagedScreen screen, FrameBuffer fbo,
500494
float delta) {
501495
fbo.begin();
502-
Gdx.gl.glClearColor(screen.getClearColor().r, screen.getClearColor().g,
503-
screen.getClearColor().b, screen.getClearColor().a);
504-
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT | GL20.GL_DEPTH_BUFFER_BIT);
496+
ScreenUtils.clear(screen.getClearColor(), true);
505497
screen.render(delta);
506498
fbo.end();
507499

0 commit comments

Comments
 (0)