diff --git a/core/src/ru/deadsoftware/cavedroid/misc/Renderer.java b/core/src/ru/deadsoftware/cavedroid/misc/Renderer.java
index a6154eed85952aa8889028b8b942e96987d403e6..c2577d36e4940a996468b3dbb382369b19eb000d 100644 (file)
package ru.deadsoftware.cavedroid.misc;
package ru.deadsoftware.cavedroid.misc;
+import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.InputProcessor;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
import com.badlogic.gdx.InputProcessor;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
-import ru.deadsoftware.cavedroid.GameScreen;
+import com.badlogic.gdx.math.Rectangle;
public abstract class Renderer implements InputProcessor {
protected final ShapeRenderer shaper;
protected final SpriteBatch spriter;
private final OrthographicCamera camera;
public abstract class Renderer implements InputProcessor {
protected final ShapeRenderer shaper;
protected final SpriteBatch spriter;
private final OrthographicCamera camera;
+ private final Rectangle mCameraViewport;
protected Renderer() {
protected Renderer() {
- this(GameScreen.getWidth(), GameScreen.getHeight());
+ this(Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
}
protected Renderer(float width, float height) {
}
protected Renderer(float width, float height) {
shaper.setProjectionMatrix(camera.combined);
spriter = new SpriteBatch();
spriter.setProjectionMatrix(camera.combined);
shaper.setProjectionMatrix(camera.combined);
spriter = new SpriteBatch();
spriter.setProjectionMatrix(camera.combined);
+
+ mCameraViewport =
+ new Rectangle(camera.position.x, camera.position.y, camera.viewportWidth, camera.viewportHeight);
}
public float getWidth() {
}
public float getWidth() {
public void setCamPos(float x, float y) {
camera.position.set(x, y, 0);
public void setCamPos(float x, float y) {
camera.position.set(x, y, 0);
+ mCameraViewport.x = x;
+ mCameraViewport.y = y;
+ }
+
+ public Rectangle getCameraViewport() {
+ return mCameraViewport;
}
public void setFontScale(float scale) {
}
public void setFontScale(float scale) {
getHeight() / 2 - (float) Assets.getStringHeight(str) / 2);
}
getHeight() / 2 - (float) Assets.getStringHeight(str) / 2);
}
- public abstract void render();
+ public abstract void render(float delta);
@Override
public boolean keyDown(int keycode) {
@Override
public boolean keyDown(int keycode) {
}
@Override
}
@Override
- public boolean scrolled(int amount) {
+ public boolean scrolled(float amountX, float amountY) {
return false;
}
return false;
}
+ @Override
+ public boolean touchCancelled(int i, int i1, int i2, int i3) {
+ return false;
+ }
}
}