diff options
author | Jérémy Zurcher <jeremy@asynk.ch> | 2016-02-08 17:14:52 +0100 |
---|---|---|
committer | Jérémy Zurcher <jeremy@asynk.ch> | 2016-02-08 17:14:52 +0100 |
commit | ccad62a5592d0493bc659a00f8268d3a6dee2e88 (patch) | |
tree | 8e01441d324b5b81a57b74e0563162c359c2056c | |
parent | d67c6f267073265fba09c91a6e10e55138de91e8 (diff) | |
download | RustAndDust-ccad62a5592d0493bc659a00f8268d3a6dee2e88.zip RustAndDust-ccad62a5592d0493bc659a00f8268d3a6dee2e88.tar.gz |
use HdpiUtils as advertised in 1.8 release note
-rw-r--r-- | core/src/ch/asynk/rustanddust/game/hud/UnitDock.java | 4 | ||||
-rw-r--r-- | core/src/ch/asynk/rustanddust/screens/GameCamera.java | 5 | ||||
-rw-r--r-- | core/src/ch/asynk/rustanddust/screens/MenuCamera.java | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/hud/UnitDock.java b/core/src/ch/asynk/rustanddust/game/hud/UnitDock.java index c5d7df2..458821e 100644 --- a/core/src/ch/asynk/rustanddust/game/hud/UnitDock.java +++ b/core/src/ch/asynk/rustanddust/game/hud/UnitDock.java @@ -2,6 +2,7 @@ package ch.asynk.rustanddust.game.hud; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.GL20; +import com.badlogic.gdx.graphics.glutils.HdpiUtils; import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.glutils.ShapeRenderer; import com.badlogic.gdx.math.Vector3; @@ -234,9 +235,8 @@ public class UnitDock extends Bg implements Animation batch.setTransformMatrix(transform); // batch.flush(); - // FIXME please use HdpiUtils instead release 1.8 https://libgdx.badlogicgames.com/news.html Gdx.gl.glEnable(GL20.GL_SCISSOR_TEST); - Gdx.gl.glScissor((int)scissors.x, (int)scissors.y, (int)scissors.width, (int)scissors.height); + HdpiUtils.glScissor((int)scissors.x, (int)scissors.y, (int)scissors.width, (int)scissors.height); super.draw(batch); if (selectedUnit != null) selected.draw(batch); diff --git a/core/src/ch/asynk/rustanddust/screens/GameCamera.java b/core/src/ch/asynk/rustanddust/screens/GameCamera.java index 8ca06d5..19c1b37 100644 --- a/core/src/ch/asynk/rustanddust/screens/GameCamera.java +++ b/core/src/ch/asynk/rustanddust/screens/GameCamera.java @@ -2,6 +2,7 @@ package ch.asynk.rustanddust.screens; import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.graphics.glutils.HdpiUtils; import com.badlogic.gdx.graphics.OrthographicCamera; import com.badlogic.gdx.math.Rectangle; @@ -96,13 +97,13 @@ public class GameCamera extends OrthographicCamera public void applyMapViewport() { - Gdx.gl.glViewport((int)window.x, (int)window.y, (int)window.width, (int)window.height); + HdpiUtils.glViewport((int)window.x, (int)window.y, (int)window.width, (int)window.height); } public void applyHudViewport() { if (fixedHud) - Gdx.gl.glViewport(0, 0, screenWidth, screenHeight); + HdpiUtils.glViewport(0, 0, screenWidth, screenHeight); } public Matrix4 getHudMatrix() diff --git a/core/src/ch/asynk/rustanddust/screens/MenuCamera.java b/core/src/ch/asynk/rustanddust/screens/MenuCamera.java index be8341a..2f4217c 100644 --- a/core/src/ch/asynk/rustanddust/screens/MenuCamera.java +++ b/core/src/ch/asynk/rustanddust/screens/MenuCamera.java @@ -1,6 +1,7 @@ package ch.asynk.rustanddust.screens; import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.graphics.glutils.HdpiUtils; import com.badlogic.gdx.graphics.OrthographicCamera; import com.badlogic.gdx.math.Vector3; import com.badlogic.gdx.math.Matrix4; @@ -55,7 +56,7 @@ public class MenuCamera extends OrthographicCamera hudLeft = hudCorrection; hudBottom = (int) (hudLeft / aspect); - Gdx.gl.glViewport((int)window.x, (int)window.y, (int)window.width, (int)window.height); + HdpiUtils.glViewport((int)window.x, (int)window.y, (int)window.width, (int)window.height); update(true); |