13:00 to 15:00, fix bugs

placeAtlas · Jul 20, 2023 · 563dd18 · 563dd18
1 parent 61ac3c8
commit 563dd18
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 11 deletions.
diff --git a/web/_img/canvas/main-ex/start.png b/web/_img/canvas/main-ex/start.png
diff --git a/web/_img/canvas/main/1689859449.png b/web/_img/canvas/main/1689859449.png
diff --git a/web/_img/canvas/main/1689861680.png b/web/_img/canvas/main/1689861680.png
diff --git a/web/_img/canvas/main/1689863453.png b/web/_img/canvas/main/1689863453.png
diff --git a/web/_img/canvas/main/1689865041.png b/web/_img/canvas/main/1689865041.png
diff --git a/web/_img/canvas/main/1689865307.png b/web/_img/canvas/main/1689865307.png
diff --git a/web/_js/config.js b/web/_js/config.js
@@ -19,13 +19,13 @@ window.pageTitle = pageTitle
 
 const canvasSize = {
  x: 1000,
- y: 1000
+ y: 2000
 }
 window.canvasSize = canvasSize
 
 const canvasOffset = {
  x: -500,
- y: -500
+ y: -1000
 }
 window.canvasOffset = canvasOffset
 
@@ -39,14 +39,18 @@ const variationsConfig = {
  default: {
  name: "r/place",
  code: "",
- default: 0,
- drawablePeriods: [0, 0],
+ default: 4,
+ drawablePeriods: [1, 4],
  drawableRegions: [
- [[0, 0], [-500, -500, 499, 499]],
+ [[0, 4], [-500, -500, 499, 499]],
  ],
  // expansions: [],
  versions: [
- { "timestamp": 1689832800, "url": ["./_img/canvas/main-ex/start.png"] },
+ { "timestamp": 1689858000, "url": ["./_img/canvas/main-ex/start.png"] },
+ { "timestamp": 1689859449, "url": ["./_img/canvas/main/1689859449.png"] },
+ { "timestamp": 1689861680, "url": ["./_img/canvas/main/1689861680.png"] },
+ { "timestamp": 1689863453, "url": ["./_img/canvas/main/1689863453.png"] },
+ { "timestamp": 1689865307, "url": ["./_img/canvas/main/1689865307.png"] },
  ],
  icon: '<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor" viewBox="0 0 192 192" aria-hidden="true"><polygon points="154 0 154 38 39 38 39 192 0 192 0 0"/><polygon points="192 38 192 192 77 192 77 153 154 153 154 38"/><rect x="77" y="77" width="38" height="38"/></svg>'
  },

diff --git a/web/_js/main/main.js b/web/_js/main/main.js
@@ -44,8 +44,8 @@ function applyView() {
 
  zoomOrigin = [scaleZoomOrigin[0] * zoom, scaleZoomOrigin[1] * zoom]
 
- innerContainer.style.height = (~~(zoom * canvasSize.x)) + "px"
- innerContainer.style.width = (~~(zoom * canvasSize.y)) + "px"
+ innerContainer.style.width = (~~(zoom * canvasSize.x)) + "px"
+ innerContainer.style.height = (~~(zoom * canvasSize.y)) + "px"
 
  innerContainer.style.left = ~~(container.clientWidth / 2 - innerContainer.clientWidth / 2 + zoomOrigin[0] + container.offsetLeft) + "px"
  innerContainer.style.top = ~~(container.clientHeight / 2 - innerContainer.clientHeight / 2 + zoomOrigin[1] + container.offsetTop) + "px"

diff --git a/web/_js/main/view.js b/web/_js/main/view.js
@@ -498,7 +498,7 @@ async function render() {
 
  if (path[0]) {
  //context.moveTo(path[0][0]*zoom, path[0][1]*zoom)
- highlightContext.moveTo(path[0][0] - canvasOffset.x, path[0][1]- canvasOffset.y)
+ highlightContext.moveTo(path[0][0] - canvasOffset.x, path[0][1] - canvasOffset.y)
  }
 
  for (let p = 1; p < path.length; p++) {
@@ -547,12 +547,12 @@ async function render() {
 
  if (path[0]) {
  //context.moveTo(path[0][0]*zoom, path[0][1]*zoom)
- highlightContext.moveTo(path[0][0], path[0][1])
+ highlightContext.moveTo(path[0][0] - canvasOffset.x, path[0][1] - canvasOffset.y)
  }
 
  for (let p = 1; p < path.length; p++) {
  //context.lineTo(path[p][0]*zoom, path[p][1]*zoom)
- highlightContext.lineTo(path[p][0], path[p][1])
+ highlightContext.lineTo(path[p][0] - canvasOffset.x, path[p][1] - canvasOffset.y)
  }
 
  highlightContext.closePath()