gavin/Tessellate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pointy top squares

Browse Source
This commit is contained in:
Gavin McDonald
2018-06-24 21:58:28 -04:00
parent 3830419b72
commit bf30d0d303
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/cartographerXY.js
View File

@@ -55,10 +55,10 @@ export default class CartographerXY extends Cartographer {
const minWidth = (a) => this.minWidth() * a; const minWidth = (a) => this.minWidth() * a;
const maxWidth = (a) => this.maxWidth() * a; const maxWidth = (a, b) => (this.maxWidth() * a) + ((b % 2) * (this.maxWidth() / 2));
let pixelX = this.pointyTop ? maxWidth(square.getX()) : minWidth(square.getX()); let pixelX = this.pointyTop ? maxWidth(square.getX(), square.getY()) : minWidth(square.getX());
let pixelY = this.pointyTop ? maxWidth(square.getY()) : minWidth(square.getY()); let pixelY = this.pointyTop ? (this.maxWidth() / 2) * square.getY() : minWidth(square.getY());
pixelX += this.originX; pixelX += this.originX;
pixelY += this.originY; pixelY += this.originY;
@@ -69,7 +69,7 @@ export default class CartographerXY extends Cartographer {
pixelToTile(point) { pixelToTile(point) {
let scale = this.scale; let scale = this.scale;
const radiusLong = a => a / this.maxWidth(); const radiusLong = a => (a / (this.maxWidth() / 2));
const radiusShort = a => a / this.minWidth(); const radiusShort = a => a / this.minWidth();
let pixelX = point.getX() - this.originX; let pixelX = point.getX() - this.originX;
@@ -96,7 +96,7 @@ export default class CartographerXY extends Cartographer {
for (let row = 0; row <= height; row++) { for (let row = 0; row <= height; row++) {
tiles[row] = []; tiles[row] = [];
let y = upperLeftTile.getY() + row; let y = upperLeftTile.getY() + row;
let xOffset = upperLeftTile.getX(); let xOffset = upperLeftTile.getX() - (row % 2);
for (let x = xOffset; x <= xOffset + width; x++) { for (let x = xOffset; x <= xOffset + width; x++) {
tiles[row].push(new Square(x, y)); tiles[row].push(new Square(x, y));

12
src/cartographerXYZ.js
View File

@@ -114,7 +114,7 @@ export default class CartographerXYZ extends Cartographer {
} }
boundingBox(upperLeftPoint, lowerRightPoint) { boundingBox(upperLeftPoint, lowerRightPoint) {
let hexagons = []; let tiles = [];
let upperRightPoint = new Point(lowerRightPoint.getX(), upperLeftPoint.getY()); let upperRightPoint = new Point(lowerRightPoint.getX(), upperLeftPoint.getY());
// push out by a 1 axially to account for interlocking hexagons // push out by a 1 axially to account for interlocking hexagons
@@ -128,28 +128,28 @@ export default class CartographerXYZ extends Cartographer {
if (this.pointyTop) { if (this.pointyTop) {
for (let row = 0; row <= height; row++) { for (let row = 0; row <= height; row++) {
hexagons[row] = []; tiles[row] = [];
let r = upperLeftTile.getR() + row; let r = upperLeftTile.getR() + row;
let qOffset = upperLeftTile.getQ() - Math.floor(row / 2); let qOffset = upperLeftTile.getQ() - Math.floor(row / 2);
for (let q = qOffset; q <= qOffset + width; q++) { for (let q = qOffset; q <= qOffset + width; q++) {
hexagons[row].push(new Hex(q, r)); tiles[row].push(new Hex(q, r));
} }
} }
} }
else { else {
for (let col = 0; col <= width; col++) { for (let col = 0; col <= width; col++) {
hexagons[col] = []; tiles[col] = [];
let q = upperLeftTile.getQ() + col; let q = upperLeftTile.getQ() + col;
let rOffset = upperLeftTile.getR() - Math.floor(col / 2); let rOffset = upperLeftTile.getR() - Math.floor(col / 2);
for (let r = rOffset; r <= rOffset + height; r++) { for (let r = rOffset; r <= rOffset + height; r++) {
hexagons[col].push(new Hex(q, r)); tiles[col].push(new Hex(q, r));
} }
} }
} }
return hexagons; return tiles;
} }
} }

4
src/main.js
View File

@@ -13,8 +13,8 @@ class Demo {
let tessellate = new Tessellate({ let tessellate = new Tessellate({
element: '#container', element: '#container',
board: Tessellate.BOARD_STYLES.HEX, board: Tessellate.BOARD_STYLES.SQUARE,
tile: Tessellate.TILE_STYLES.CIRCLE, tile: Tessellate.TILE_STYLES.SQUARE,
tap: this.onTap, tap: this.onTap,
draw: this.draw, draw: this.draw,
pointyTop: false, //utils.random(1) ? true : false, pointyTop: false, //utils.random(1) ? true : false,

2
src/tessellate.js
View File

@@ -118,7 +118,7 @@ export default class Tessellate {
green: utils.random(255), green: utils.random(255),
blue: utils.random(255), blue: utils.random(255),
alpha: utils.random(25, 75) / 100, alpha: utils.random(25, 75) / 100,
scale: utils.random(5,9)/10 scale: utils.random(6,9)/10
}); });
} }