para/puzzle
1
1
Fork 0
Code Issues 8 Pull requests Releases Wiki Activity

rename vars

Browse source
This commit is contained in:
Zutatensuppe 2021-04-15 10:36:44 +02:00
parent 67ee800375
commit 20ac3d6342
1 changed files with 33 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

60
game/Camera.js
View file

@ -28,13 +28,13 @@ export default class Camera {
this.y += y / this.zoom this.y += y / this.zoom
} }
setZoom(newzoom, centerCoordViewport) { setZoom(newzoom, viewportCoordCenter) {
const zoom = Math.min(Math.max(newzoom, this.minZoom), this.maxZoom) const zoom = Math.min(Math.max(newzoom, this.minZoom), this.maxZoom)
if (zoom == this.zoom) { if (zoom == this.zoom) {
return false return false
} }
const zoomToCoord = centerCoordViewport || { const zoomToCoord = viewportCoordCenter || {
x: this.width / 2, x: this.width / 2,
y: this.height / 2 y: this.height / 2
} }
@ -48,21 +48,27 @@ export default class Camera {
return true return true
} }
zoomOut(centerCoordViewport) { zoomOut(viewportCoordCenter) {
return this.setZoom(this.zoom - this.zoomStep * this.zoom, centerCoordViewport) return this.setZoom(
this.zoom - this.zoomStep * this.zoom,
viewportCoordCenter
)
} }
zoomIn(centerCoordViewport) { zoomIn(viewportCoordCenter) {
return this.setZoom(this.zoom + this.zoomStep * this.zoom, centerCoordViewport) return this.setZoom(
this.zoom + this.zoomStep * this.zoom,
viewportCoordCenter
)
} }
/** /**
* Translate a coordinate in the viewport to a * Translate a coordinate in the viewport to a
* coordinate in the world, rounded * coordinate in the world, rounded
* @param {x, y} coord * @param {x, y} viewportCoord
*/ */
viewportToWorld(coord) { viewportToWorld(viewportCoord) {
const worldCoord = this.viewportToWorldRaw(coord) const worldCoord = this.viewportToWorldRaw(viewportCoord)
return { return {
x: Math.round(worldCoord.x), x: Math.round(worldCoord.x),
y: Math.round(worldCoord.y), y: Math.round(worldCoord.y),
@ -72,22 +78,22 @@ export default class Camera {
/** /**
* Translate a coordinate in the viewport to a * Translate a coordinate in the viewport to a
* coordinate in the world, not rounded * coordinate in the world, not rounded
* @param {x, y} coord * @param {x, y} viewportCoord
*/ */
viewportToWorldRaw(coord) { viewportToWorldRaw(viewportCoord) {
return { return {
x: (coord.x / this.zoom) - this.x, x: (viewportCoord.x / this.zoom) - this.x,
y: (coord.y / this.zoom) - this.y, y: (viewportCoord.y / this.zoom) - this.y,
} }
} }
/** /**
* Translate a coordinate in the world to a * Translate a coordinate in the world to a
* coordinate in the viewport, rounded * coordinate in the viewport, rounded
* @param {x, y} coord * @param {x, y} worldCoord
*/ */
worldToViewport(coord) { worldToViewport(worldCoord) {
const viewportCoord = this.worldToViewportRaw(coord) const viewportCoord = this.worldToViewportRaw(worldCoord)
return { return {
x: Math.round(viewportCoord.x), x: Math.round(viewportCoord.x),
y: Math.round(viewportCoord.y), y: Math.round(viewportCoord.y),
@ -97,22 +103,22 @@ export default class Camera {
/** /**
* Translate a coordinate in the world to a * Translate a coordinate in the world to a
* coordinate in the viewport, not rounded * coordinate in the viewport, not rounded
* @param {x, y} coord * @param {x, y} worldCoord
*/ */
worldToViewportRaw(coord) { worldToViewportRaw(worldCoord) {
return { return {
x: (coord.x + this.x) * this.zoom, x: (worldCoord.x + this.x) * this.zoom,
y: (coord.y + this.y) * this.zoom, y: (worldCoord.y + this.y) * this.zoom,
} }
} }
/** /**
* Translate a 2d dimension (width/height) in the world to * Translate a 2d dimension (width/height) in the world to
* one in the viewport, rounded * one in the viewport, rounded
* @param {x, y} coord * @param {w, h} worldDim
*/ */
worldDimToViewport(dim) { worldDimToViewport(worldDim) {
const viewportDim = this.worldDimToViewportRaw(dim) const viewportDim = this.worldDimToViewportRaw(worldDim)
return { return {
w: Math.round(viewportDim.w), w: Math.round(viewportDim.w),
h: Math.round(viewportDim.h), h: Math.round(viewportDim.h),
@ -123,12 +129,12 @@ export default class Camera {
/** /**
* Translate a 2d dimension (width/height) in the world to * Translate a 2d dimension (width/height) in the world to
* one in the viewport, not rounded * one in the viewport, not rounded
* @param {x, y} coord * @param {w, h} worldDim
*/ */
worldDimToViewportRaw(dim) { worldDimToViewportRaw(worldDim) {
return { return {
w: dim.w * this.zoom, w: worldDim.w * this.zoom,
h: dim.h * this.zoom, h: worldDim.h * this.zoom,
} }
} }
} }