Code improvements

[cavedroid.git] / core / src / ru / deadsoftware / cavecraft / misc / Renderer.java

diff --git a/core/src/ru/deadsoftware/cavecraft/misc/Renderer.java b/core/src/ru/deadsoftware/cavecraft/misc/Renderer.java
index f083a326e9e00d08cf5bd77c6b2875d6b910a1ca..0d63d5a21b32945fe2191dc0ef6576941f4e6ba9 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/misc/Renderer.java
+++ b/core/src/ru/deadsoftware/cavecraft/misc/Renderer.java
@@ -4,13 +4,13 @@ import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
 import ru.deadsoftware.cavecraft.GameScreen;
-import ru.deadsoftware.cavecraft.misc.Assets;
 
 public abstract class Renderer {
 
-    public OrthographicCamera camera;
-    public ShapeRenderer shapeRenderer;
-    public SpriteBatch spriteBatch;
+    private OrthographicCamera camera;
+
+    protected ShapeRenderer shaper;
+    protected SpriteBatch spriter;
 
     public Renderer() {
         this(GameScreen.getWidth(), GameScreen.getHeight());
@@ -19,34 +19,48 @@ public abstract class Renderer {
     public Renderer(float width, float height) {
         camera = new OrthographicCamera();
         camera.setToOrtho(true, width, height);
-        shapeRenderer = new ShapeRenderer();
-        shapeRenderer.setProjectionMatrix(camera.combined);
-        spriteBatch = new SpriteBatch();
-        spriteBatch.setProjectionMatrix(camera.combined);
+        shaper = new ShapeRenderer();
+        shaper.setProjectionMatrix(camera.combined);
+        spriter = new SpriteBatch();
+        spriter.setProjectionMatrix(camera.combined);
     }
 
     public float getWidth() {
         return camera.viewportWidth;
     }
 
-    public float getHeight() {return camera.viewportHeight;}
+    public float getHeight() {
+        return camera.viewportHeight;
+    }
+
+    public float getCamX() {
+        return camera.position.x;
+    }
+
+    public float getCamY() {
+        return camera.position.y;
+    }
+
+    public void setCamPos(float x, float y) {
+        camera.position.set(x, y, 0);
+    }
 
     public void setFontScale(float scale) {
-        Assets.minecraftFont.getData().setScale(scale);
+        Assets.mcFont.getData().setScale(scale);
     }
 
-    public void setFontColor(int r, int g, int b) {
-        Assets.minecraftFont.setColor(r/255f, g/255f, b/255f, 1f);
+    protected void setFontColor(int r, int g, int b) {
+        Assets.mcFont.setColor(r / 255f, g / 255f, b / 255f, 1f);
     }
 
-    public void drawString(String str, float x, float y) {
-        Assets.minecraftFont.draw(spriteBatch, str, x, y);
+    protected void drawString(String str, float x, float y) {
+        Assets.mcFont.draw(spriter, str, x, y);
     }
 
-    public void drawString(String str) {
-        Assets.minecraftFont.draw(spriteBatch, str,
-                getWidth()/2 - Assets.getStringWidth(str)/2,
-                getHeight()/2 - Assets.getStringHeight(str)/2);
+    protected void drawString(String str) {
+        Assets.mcFont.draw(spriter, str,
+                getWidth() / 2 - (float) Assets.getStringWidth(str) / 2,
+                getHeight() / 2 - (float) Assets.getStringHeight(str) / 2);
     }
 
     public abstract void render();