OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-02-23 15:38:29 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Center smaller maps on main view.

Browse Source
This commit is contained in:
Oskar Wiksten
2012-10-14 12:25:23 +02:00
parent 4926a69e49
commit 584a34f7c4
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java
View File

@@ -57,6 +57,7 @@ public final class MainView extends SurfaceView implements SurfaceHolder.Callbac
private LayeredTileMap currentTileMap;
private TileCollection tiles;
private final Coord playerPosition = new Coord();
private Size surfaceSize;
public MainView(Context context, AttributeSet attr) {
super(context, attr);
@@ -101,17 +102,13 @@ public final class MainView extends SurfaceView implements SurfaceHolder.Callbac
this.scale = world.tileManager.scale;
this.scaledTileSize = world.tileManager.viewTileSize;
this.surfaceSize = new Size(w, h);
screenSizeTileCount = new Size(
(int) Math.floor(w / scaledTileSize)
,(int) Math.floor(h / scaledTileSize)
);
screenOffset.set(
(w - (scaledTileSize * screenSizeTileCount.width)) / 2
,(h - (scaledTileSize * screenSizeTileCount.height)) / 2
);
if (model.currentMap != null) {
notifyMapChanged(model);
}
@@ -340,14 +337,18 @@ public final class MainView extends SurfaceView implements SurfaceHolder.Callbac
synchronized (holder) {
currentMap = model.currentMap;
currentTileMap = model.currentTileMap;
Size mapViewSize = new Size(
Math.min(screenSizeTileCount.width, currentMap.size.width)
,Math.min(screenSizeTileCount.height, currentMap.size.height)
);
mapViewArea = new CoordRect(mapTopLeft, mapViewSize);
tiles = world.tileManager.currentMapTiles;
Size visibleNumberOfTiles = new Size(
Math.min(screenSizeTileCount.width, currentMap.size.width)
,Math.min(screenSizeTileCount.height, currentMap.size.height)
);
mapViewArea = new CoordRect(mapTopLeft, visibleNumberOfTiles);
screenOffset.set(
(surfaceSize.width - scaledTileSize * visibleNumberOfTiles.width) / 2
,(surfaceSize.height - scaledTileSize * visibleNumberOfTiles.height) / 2
);
}
clearCanvas();