mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-02-11 19:37:47 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed 'near' field and changed 'pos' to Tile50

Browse Source
This commit is contained in:
Collin Smith 2019-09-30 03:46:43 -07:00
parent 08ed42663a
commit 88ae4c496b
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tools/src/com/riiablo/camera/CameraTool.java
View File

@ -121,7 +121,7 @@ public class CameraTool extends ApplicationAdapter {
final Vector2 vec2 = new Vector2(); final Vector2 vec2 = new Vector2();
final Vector2 loc = new Vector2(); final Vector2 loc = new Vector2();
final Vector2 pos = new Vector2(); final Vector2 pos = new Vector2();
final Vector2 near = new Vector2(); //final Vector2 near = new Vector2();
final Vector2 tmp = new Vector2(); final Vector2 tmp = new Vector2();
final StringBuilder builder = new StringBuilder(); final StringBuilder builder = new StringBuilder();
@ -146,8 +146,8 @@ public class CameraTool extends ApplicationAdapter {
shapes.line(-Gdx.graphics.getWidth() / 2, 0, Gdx.graphics.getWidth() / 2, 0); shapes.line(-Gdx.graphics.getWidth() / 2, 0, Gdx.graphics.getWidth() / 2, 0);
shapes.line(0, -Gdx.graphics.getHeight() / 2, 0, Gdx.graphics.getHeight() / 2); shapes.line(0, -Gdx.graphics.getHeight() / 2, 0, Gdx.graphics.getHeight() / 2);
// shapes.setColor(Color.BLUE); // shapes.setColor(Color.BLUE);
// shapes.rect(-80, -40, 160, 80); // shapes.rect(-80, -40, 160, 80);
} shapes.end(); } shapes.end();
shapes.identity(); shapes.identity();
@ -174,23 +174,24 @@ public class CameraTool extends ApplicationAdapter {
vec2.set(Gdx.input.getX(), Gdx.input.getY()); vec2.set(Gdx.input.getX(), Gdx.input.getY());
iso.unproject(vec2); iso.unproject(vec2);
iso.toWorld(vec2); iso.toWorld(vec2);
near.set(vec2); // near.set(vec2);
iso.toTile(vec2); iso.toTile(vec2);
loc.set(vec2); loc.set(vec2);
iso.toScreen(vec2); iso.toScreen(vec2);
iso.toTile50(near); // iso.toTile50(near);
tmp.set(near); // tmp.set(near);
iso.toScreen(tmp); // iso.toScreen(tmp);
shapes.set(ShapeRenderer.ShapeType.Filled); shapes.set(ShapeRenderer.ShapeType.Filled);
shapes.setColor(Color.SALMON); shapes.setColor(Color.SALMON);
DebugUtils.drawDiamond(shapes, vec2.x, vec2.y - Tile.SUBTILE_HEIGHT50, Tile.SUBTILE_WIDTH, Tile.SUBTILE_HEIGHT); DebugUtils.drawDiamond(shapes, vec2.x, vec2.y - Tile.SUBTILE_HEIGHT50, Tile.SUBTILE_WIDTH, Tile.SUBTILE_HEIGHT);
shapes.set(ShapeRenderer.ShapeType.Line); // shapes.set(ShapeRenderer.ShapeType.Line);
if (!tmp.epsilonEquals(vec2)) { // if (!tmp.epsilonEquals(vec2)) {
shapes.setColor(Color.SKY); // shapes.setColor(Color.SKY);
DebugUtils.drawDiamond(shapes, tmp.x, tmp.y - Tile.SUBTILE_HEIGHT50, Tile.SUBTILE_WIDTH, Tile.SUBTILE_HEIGHT); // DebugUtils.drawDiamond(shapes, tmp.x, tmp.y - Tile.SUBTILE_HEIGHT50, Tile.SUBTILE_WIDTH, Tile.SUBTILE_HEIGHT);
} // }
shapes.set(ShapeRenderer.ShapeType.Filled); shapes.set(ShapeRenderer.ShapeType.Filled);
shapes.setColor(Color.GREEN); shapes.setColor(Color.GREEN);
@ -198,7 +199,16 @@ public class CameraTool extends ApplicationAdapter {
} shapes.end(); } shapes.end();
pos.set(iso.position); pos.set(iso.position);
iso.toTile(pos); iso.toTile50(pos);
shapes.begin(ShapeRenderer.ShapeType.Filled); {
vec2.set(pos);
iso.toScreen(vec2);
shapes.setColor(Color.WHITE);
DebugUtils.drawDiamond(shapes, vec2.x, vec2.y - Tile.SUBTILE_HEIGHT50, Tile.SUBTILE_WIDTH, Tile.SUBTILE_HEIGHT);
} shapes.end();
float width; float width;
batch.begin(); batch.begin();
@ -208,7 +218,8 @@ public class CameraTool extends ApplicationAdapter {
.append("pos:").append('\n') .append("pos:").append('\n')
.append("cursor:").append('\n') .append("cursor:").append('\n')
.append("px:").append('\n') .append("px:").append('\n')
.append("near:").append('\n'); // .append("near:").append('\n')
;
GlyphLayout layout = font.draw(batch, builder.toString(), 0, Gdx.graphics.getHeight()); GlyphLayout layout = font.draw(batch, builder.toString(), 0, Gdx.graphics.getHeight());
width = layout.width; width = layout.width;
builder.setLength(0); builder.setLength(0);
@ -217,7 +228,8 @@ public class CameraTool extends ApplicationAdapter {
.append(pos).append('\n') .append(pos).append('\n')
.append(loc).append('\n') .append(loc).append('\n')
.append(vec2).append('\n') .append(vec2).append('\n')
.append(near).append('\n'); // .append(near).append('\n')
;
font.draw(batch, builder.toString(), width, Gdx.graphics.getHeight()); font.draw(batch, builder.toString(), width, Gdx.graphics.getHeight());
batch.end(); batch.end();
} }