From 9452952374f58cb9c76cba9bee6130236b466e9f Mon Sep 17 00:00:00 2001
From: root <root@xanax.lol>
Date: Tue, 30 Apr 2024 21:58:37 +0200
Subject: [PATCH] tried getting camera and world rendering to work
---
package-lock.json | 244 +++++++++++++++----------------
src/components/Game.vue | 13 +-
src/components/World.vue | 59 +++++++-
src/components/player/Player.vue | 16 +-
src/engine/map.js | 0
5 files changed, 180 insertions(+), 152 deletions(-)
create mode 100644 src/engine/map.js
diff --git a/package-lock.json b/package-lock.json
index bb35c2d..3b2a613 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1374,9 +1374,9 @@
}
},
"node_modules/@rollup/rollup-android-arm-eabi": {
- "version": "4.17.1",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.17.1.tgz",
- "integrity": "sha512-P6Wg856Ou/DLpR+O0ZLneNmrv7QpqBg+hK4wE05ijbC/t349BRfMfx+UFj5Ha3fCFopIa6iSZlpdaB4agkWp2Q==",
+ "version": "4.17.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.17.2.tgz",
+ "integrity": "sha512-NM0jFxY8bB8QLkoKxIQeObCaDlJKewVlIEkuyYKm5An1tdVZ966w2+MPQ2l8LBZLjR+SgyV+nRkTIunzOYBMLQ==",
"cpu": [
"arm"
],
@@ -1387,9 +1387,9 @@
]
},
"node_modules/@rollup/rollup-android-arm64": {
- "version": "4.17.1",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.17.1.tgz",
- "integrity": "sha512-piwZDjuW2WiHr05djVdUkrG5JbjnGbtx8BXQchYCMfib/nhjzWoiScelZ+s5IJI7lecrwSxHCzW026MWBL+oJQ==",
+ "version": "4.17.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.17.2.tgz",
+ "integrity": "sha512-yeX/Usk7daNIVwkq2uGoq2BYJKZY1JfyLTaHO/jaiSwi/lsf8fTFoQW/n6IdAsx5tx+iotu2zCJwz8MxI6D/Bw==",
"cpu": [
"arm64"
],
@@ -1400,9 +1400,9 @@
]
},
"node_modules/@rollup/rollup-darwin-arm64": {
- "version": "4.17.1",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.17.1.tgz",
- "integrity": "sha512-LsZXXIsN5Q460cKDT4Y+bzoPDhBmO5DTr7wP80d+2EnYlxSgkwdPfE3hbE+Fk8dtya+8092N9srjBTJ0di8RIA==",
+ "version": "4.17.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.17.2.tgz",
+ "integrity": "sha512-kcMLpE6uCwls023+kknm71ug7MZOrtXo+y5p/tsg6jltpDtgQY1Eq5sGfHcQfb+lfuKwhBmEURDga9N0ol4YPw==",
"cpu": [
"arm64"
],
@@ -1413,9 +1413,9 @@
]
},
"node_modules/@rollup/rollup-darwin-x64": {
- "version": "4.17.1",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.17.1.tgz",
- "integrity": "sha512-S7TYNQpWXB9APkxu/SLmYHezWwCoZRA9QLgrDeml+SR2A1LLPD2DBUdUlvmCF7FUpRMKvbeeWky+iizQj65Etw==",
+ "version": "4.17.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.17.2.tgz",
+ "integrity": "sha512-AtKwD0VEx0zWkL0ZjixEkp5tbNLzX+FCqGG1SvOu993HnSz4qDI6S4kGzubrEJAljpVkhRSlg5bzpV//E6ysTQ==",
"cpu": [
"x64"
],
@@ -1426,9 +1426,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm-gnueabihf": {
- "version": "4.17.1",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.17.1.tgz",
- "integrity": "sha512-Lq2JR5a5jsA5um2ZoLiXXEaOagnVyCpCW7xvlcqHC7y46tLwTEgUSTM3a2TfmmTMmdqv+jknUioWXlmxYxE9Yw==",
+ "version": "4.17.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.17.2.tgz",
+ "integrity": "sha512-3reX2fUHqN7sffBNqmEyMQVj/CKhIHZd4y631duy0hZqI8Qoqf6lTtmAKvJFYa6bhU95B1D0WgzHkmTg33In0A==",
"cpu": [
"arm"
],
@@ -1439,9 +1439,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm-musleabihf": {
- "version": "4.17.1",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.17.1.tgz",
- "integrity": "sha512-9BfzwyPNV0IizQoR+5HTNBGkh1KXE8BqU0DBkqMngmyFW7BfuIZyMjQ0s6igJEiPSBvT3ZcnIFohZ19OqjhDPg==",
+ "version": "4.17.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.17.2.tgz",
+ "integrity": "sha512-uSqpsp91mheRgw96xtyAGP9FW5ChctTFEoXP0r5FAzj/3ZRv3Uxjtc7taRQSaQM/q85KEKjKsZuiZM3GyUivRg==",
"cpu": [
"arm"
],
@@ -1452,9 +1452,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm64-gnu": {
- "version": "4.17.1",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.17.1.tgz",
- "integrity": "sha512-e2uWaoxo/rtzA52OifrTSXTvJhAXb0XeRkz4CdHBK2KtxrFmuU/uNd544Ogkpu938BzEfvmWs8NZ8Axhw33FDw==",
+ "version": "4.17.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.17.2.tgz",
+ "integrity": "sha512-EMMPHkiCRtE8Wdk3Qhtciq6BndLtstqZIroHiiGzB3C5LDJmIZcSzVtLRbwuXuUft1Cnv+9fxuDtDxz3k3EW2A==",
"cpu": [
"arm64"
],
@@ -1465,9 +1465,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm64-musl": {
- "version": "4.17.1",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.17.1.tgz",
- "integrity": "sha512-ekggix/Bc/d/60H1Mi4YeYb/7dbal1kEDZ6sIFVAE8pUSx7PiWeEh+NWbL7bGu0X68BBIkgF3ibRJe1oFTksQQ==",
+ "version": "4.17.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.17.2.tgz",
+ "integrity": "sha512-NMPylUUZ1i0z/xJUIx6VUhISZDRT+uTWpBcjdv0/zkp7b/bQDF+NfnfdzuTiB1G6HTodgoFa93hp0O1xl+/UbA==",
"cpu": [
"arm64"
],
@@ -1478,9 +1478,9 @@
]
},
"node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
- "version": "4.17.1",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.17.1.tgz",
- "integrity": "sha512-UGV0dUo/xCv4pkr/C8KY7XLFwBNnvladt8q+VmdKrw/3RUd3rD0TptwjisvE2TTnnlENtuY4/PZuoOYRiGp8Gw==",
+ "version": "4.17.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.17.2.tgz",
+ "integrity": "sha512-T19My13y8uYXPw/L/k0JYaX1fJKFT/PWdXiHr8mTbXWxjVF1t+8Xl31DgBBvEKclw+1b00Chg0hxE2O7bTG7GQ==",
"cpu": [
"ppc64"
],
@@ -1491,9 +1491,9 @@
]
},
"node_modules/@rollup/rollup-linux-riscv64-gnu": {
- "version": "4.17.1",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.17.1.tgz",
- "integrity": "sha512-gEYmYYHaehdvX46mwXrU49vD6Euf1Bxhq9pPb82cbUU9UT2NV+RSckQ5tKWOnNXZixKsy8/cPGtiUWqzPuAcXQ==",
+ "version": "4.17.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.17.2.tgz",
+ "integrity": "sha512-BOaNfthf3X3fOWAB+IJ9kxTgPmMqPPH5f5k2DcCsRrBIbWnaJCgX2ll77dV1TdSy9SaXTR5iDXRL8n7AnoP5cg==",
"cpu": [
"riscv64"
],
@@ -1504,9 +1504,9 @@
]
},
"node_modules/@rollup/rollup-linux-s390x-gnu": {
- "version": "4.17.1",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.17.1.tgz",
- "integrity": "sha512-xeae5pMAxHFp6yX5vajInG2toST5lsCTrckSRUFwNgzYqnUjNBcQyqk1bXUxX5yhjWFl2Mnz3F8vQjl+2FRIcw==",
+ "version": "4.17.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.17.2.tgz",
+ "integrity": "sha512-W0UP/x7bnn3xN2eYMql2T/+wpASLE5SjObXILTMPUBDB/Fg/FxC+gX4nvCfPBCbNhz51C+HcqQp2qQ4u25ok6g==",
"cpu": [
"s390x"
],
@@ -1517,9 +1517,9 @@
]
},
"node_modules/@rollup/rollup-linux-x64-gnu": {
- "version": "4.17.1",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.17.1.tgz",
- "integrity": "sha512-AsdnINQoDWfKpBzCPqQWxSPdAWzSgnYbrJYtn6W0H2E9It5bZss99PiLA8CgmDRfvKygt20UpZ3xkhFlIfX9zQ==",
+ "version": "4.17.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.17.2.tgz",
+ "integrity": "sha512-Hy7pLwByUOuyaFC6mAr7m+oMC+V7qyifzs/nW2OJfC8H4hbCzOX07Ov0VFk/zP3kBsELWNFi7rJtgbKYsav9QQ==",
"cpu": [
"x64"
],
@@ -1530,9 +1530,9 @@
]
},
"node_modules/@rollup/rollup-linux-x64-musl": {
- "version": "4.17.1",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.17.1.tgz",
- "integrity": "sha512-KoB4fyKXTR+wYENkIG3fFF+5G6N4GFvzYx8Jax8BR4vmddtuqSb5oQmYu2Uu067vT/Fod7gxeQYKupm8gAcMSQ==",
+ "version": "4.17.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.17.2.tgz",
+ "integrity": "sha512-h1+yTWeYbRdAyJ/jMiVw0l6fOOm/0D1vNLui9iPuqgRGnXA0u21gAqOyB5iHjlM9MMfNOm9RHCQ7zLIzT0x11Q==",
"cpu": [
"x64"
],
@@ -1543,9 +1543,9 @@
]
},
"node_modules/@rollup/rollup-win32-arm64-msvc": {
- "version": "4.17.1",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.17.1.tgz",
- "integrity": "sha512-J0d3NVNf7wBL9t4blCNat+d0PYqAx8wOoY+/9Q5cujnafbX7BmtYk3XvzkqLmFECaWvXGLuHmKj/wrILUinmQg==",
+ "version": "4.17.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.17.2.tgz",
+ "integrity": "sha512-tmdtXMfKAjy5+IQsVtDiCfqbynAQE/TQRpWdVataHmhMb9DCoJxp9vLcCBjEQWMiUYxO1QprH/HbY9ragCEFLA==",
"cpu": [
"arm64"
],
@@ -1556,9 +1556,9 @@
]
},
"node_modules/@rollup/rollup-win32-ia32-msvc": {
- "version": "4.17.1",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.17.1.tgz",
- "integrity": "sha512-xjgkWUwlq7IbgJSIxvl516FJ2iuC/7ttjsAxSPpC9kkI5iQQFHKyEN5BjbhvJ/IXIZ3yIBcW5QDlWAyrA+TFag==",
+ "version": "4.17.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.17.2.tgz",
+ "integrity": "sha512-7II/QCSTAHuE5vdZaQEwJq2ZACkBpQDOmQsE6D6XUbnBHW8IAhm4eTufL6msLJorzrHDFv3CF8oCA/hSIRuZeQ==",
"cpu": [
"ia32"
],
@@ -1569,9 +1569,9 @@
]
},
"node_modules/@rollup/rollup-win32-x64-msvc": {
- "version": "4.17.1",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.17.1.tgz",
- "integrity": "sha512-0QbCkfk6cnnVKWqqlC0cUrrUMDMfu5ffvYMTUHf+qMN2uAb3MKP31LPcwiMXBNsvoFGs/kYdFOsuLmvppCopXA==",
+ "version": "4.17.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.17.2.tgz",
+ "integrity": "sha512-TGGO7v7qOq4CYmSBVEYpI1Y5xDuCEnbVC5Vth8mOsW0gDSzxNrVERPc790IGHsrT2dQSimgMr9Ub3Y1Jci5/8w==",
"cpu": [
"x64"
],
@@ -1853,13 +1853,13 @@
}
},
"node_modules/@vitest/expect": {
- "version": "1.5.2",
- "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.5.2.tgz",
- "integrity": "sha512-rf7MTD1WCoDlN3FfYJ9Llfp0PbdtOMZ3FIF0AVkDnKbp3oiMW1c8AmvRZBcqbAhDUAvF52e9zx4WQM1r3oraVA==",
+ "version": "1.5.3",
+ "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.5.3.tgz",
+ "integrity": "sha512-y+waPz31pOFr3rD7vWTbwiLe5+MgsMm40jTZbQE8p8/qXyBX3CQsIXRx9XK12IbY7q/t5a5aM/ckt33b4PxK2g==",
"dev": true,
"dependencies": {
- "@vitest/spy": "1.5.2",
- "@vitest/utils": "1.5.2",
+ "@vitest/spy": "1.5.3",
+ "@vitest/utils": "1.5.3",
"chai": "^4.3.10"
},
"funding": {
@@ -1867,12 +1867,12 @@
}
},
"node_modules/@vitest/runner": {
- "version": "1.5.2",
- "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.5.2.tgz",
- "integrity": "sha512-7IJ7sJhMZrqx7HIEpv3WrMYcq8ZNz9L6alo81Y6f8hV5mIE6yVZsFoivLZmr0D777klm1ReqonE9LyChdcmw6g==",
+ "version": "1.5.3",
+ "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.5.3.tgz",
+ "integrity": "sha512-7PlfuReN8692IKQIdCxwir1AOaP5THfNkp0Uc4BKr2na+9lALNit7ub9l3/R7MP8aV61+mHKRGiqEKRIwu6iiQ==",
"dev": true,
"dependencies": {
- "@vitest/utils": "1.5.2",
+ "@vitest/utils": "1.5.3",
"p-limit": "^5.0.0",
"pathe": "^1.1.1"
},
@@ -1908,9 +1908,9 @@
}
},
"node_modules/@vitest/snapshot": {
- "version": "1.5.2",
- "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.5.2.tgz",
- "integrity": "sha512-CTEp/lTYos8fuCc9+Z55Ga5NVPKUgExritjF5VY7heRFUfheoAqBneUlvXSUJHUZPjnPmyZA96yLRJDP1QATFQ==",
+ "version": "1.5.3",
+ "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.5.3.tgz",
+ "integrity": "sha512-K3mvIsjyKYBhNIDujMD2gfQEzddLe51nNOAf45yKRt/QFJcUIeTQd2trRvv6M6oCBHNVnZwFWbQ4yj96ibiDsA==",
"dev": true,
"dependencies": {
"magic-string": "^0.30.5",
@@ -1922,9 +1922,9 @@
}
},
"node_modules/@vitest/spy": {
- "version": "1.5.2",
- "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.5.2.tgz",
- "integrity": "sha512-xCcPvI8JpCtgikT9nLpHPL1/81AYqZy1GCy4+MCHBE7xi8jgsYkULpW5hrx5PGLgOQjUpb6fd15lqcriJ40tfQ==",
+ "version": "1.5.3",
+ "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.5.3.tgz",
+ "integrity": "sha512-Llj7Jgs6lbnL55WoshJUUacdJfjU2honvGcAJBxhra5TPEzTJH8ZuhI3p/JwqqfnTr4PmP7nDmOXP53MS7GJlg==",
"dev": true,
"dependencies": {
"tinyspy": "^2.2.0"
@@ -1934,9 +1934,9 @@
}
},
"node_modules/@vitest/utils": {
- "version": "1.5.2",
- "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.5.2.tgz",
- "integrity": "sha512-sWOmyofuXLJ85VvXNsroZur7mOJGiQeM0JN3/0D1uU8U9bGFM69X1iqHaRXl6R8BwaLY6yPCogP257zxTzkUdA==",
+ "version": "1.5.3",
+ "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.5.3.tgz",
+ "integrity": "sha512-rE9DTN1BRhzkzqNQO+kw8ZgfeEBCLXiHJwetk668shmNBpSagQxneT5eSqEBLP+cqSiAeecvQmbpFfdMyLcIQA==",
"dev": true,
"dependencies": {
"diff-sequences": "^29.6.3",
@@ -1958,30 +1958,30 @@
}
},
"node_modules/@volar/language-core": {
- "version": "2.2.0-alpha.10",
- "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.2.0-alpha.10.tgz",
- "integrity": "sha512-njVJLtpu0zMvDaEk7K5q4BRpOgbyEUljU++un9TfJoJNhxG0z/hWwpwgTRImO42EKvwIxF3XUzeMk+qatAFy7Q==",
+ "version": "2.2.0-alpha.12",
+ "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.2.0-alpha.12.tgz",
+ "integrity": "sha512-zgWof8q02kADyb4lalVzoqnvTs/wJRDul5qHl0VC2ZVXwes6j2ZYumjXqAW+8W1CQp8lfJkEn9Z6a5jvU6S7Jw==",
"dev": true,
"dependencies": {
- "@volar/source-map": "2.2.0-alpha.10"
+ "@volar/source-map": "2.2.0-alpha.12"
}
},
"node_modules/@volar/source-map": {
- "version": "2.2.0-alpha.10",
- "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.2.0-alpha.10.tgz",
- "integrity": "sha512-nrdWApVkP5cksAnDEyy1JD9rKdwOJsEq1B+seWO4vNXmZNcxQQCx4DULLBvKt7AzRUAQiAuw5aQkb9RBaSqdVA==",
+ "version": "2.2.0-alpha.12",
+ "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.2.0-alpha.12.tgz",
+ "integrity": "sha512-d7vDWBE3Ijenff+f1GbWWvdXK4i0wsWsDnfry7G0Jwhbs2/q+NoQya27ZEc3Is0E5m7sOmgUOvRnLGLKEmWFBg==",
"dev": true,
"dependencies": {
"muggle-string": "^0.4.0"
}
},
"node_modules/@volar/typescript": {
- "version": "2.2.0-alpha.10",
- "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.2.0-alpha.10.tgz",
- "integrity": "sha512-GCa0vTVVdA9ULUsu2Rx7jwsIuyZQPvPVT9o3NrANTbYv+523Ao1gv3glC5vzNSDPM6bUl37r94HbCj7KINQr+g==",
+ "version": "2.2.0-alpha.12",
+ "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.2.0-alpha.12.tgz",
+ "integrity": "sha512-Ie4/Pj7NcIZWss+kteREZUYRU0jjiAmWCNoUJ7ViYQsYCrtiLMgPthha09V9zAyhk1rUGErF7/TLtAAX1VuflA==",
"dev": true,
"dependencies": {
- "@volar/language-core": "2.2.0-alpha.10",
+ "@volar/language-core": "2.2.0-alpha.12",
"path-browserify": "^1.0.1"
}
},
@@ -2187,12 +2187,12 @@
}
},
"node_modules/@vue/language-core": {
- "version": "2.0.14",
- "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.0.14.tgz",
- "integrity": "sha512-3q8mHSNcGTR7sfp2X6jZdcb4yt8AjBXAfKk0qkZIh7GAJxOnoZ10h5HToZglw4ToFvAnq+xu/Z2FFbglh9Icag==",
+ "version": "2.0.15",
+ "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.0.15.tgz",
+ "integrity": "sha512-a2n5Oc+PkWPX5zhnTkddH/hzPCrQmwUz1EwmFje3mqd+c8Ux+yCVEnAE2XtGQZoELgSWvY7EmJfidRbs+nR19Q==",
"dev": true,
"dependencies": {
- "@volar/language-core": "2.2.0-alpha.10",
+ "@volar/language-core": "2.2.0-alpha.12",
"@vue/compiler-dom": "^3.4.0",
"@vue/shared": "^3.4.0",
"computeds": "^0.0.1",
@@ -5027,9 +5027,9 @@
}
},
"node_modules/rollup": {
- "version": "4.17.1",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.17.1.tgz",
- "integrity": "sha512-0gG94inrUtg25sB2V/pApwiv1lUb0bQ25FPNuzO89Baa+B+c0ccaaBKM5zkZV/12pUUdH+lWCSm9wmHqyocuVQ==",
+ "version": "4.17.2",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.17.2.tgz",
+ "integrity": "sha512-/9ClTJPByC0U4zNLowV1tMBe8yMEAxewtR3cUNX5BoEpGH3dQEWpJLr6CLp0fPdYRF/fzVOgvDb1zXuakwF5kQ==",
"dev": true,
"dependencies": {
"@types/estree": "1.0.5"
@@ -5042,22 +5042,22 @@
"npm": ">=8.0.0"
},
"optionalDependencies": {
- "@rollup/rollup-android-arm-eabi": "4.17.1",
- "@rollup/rollup-android-arm64": "4.17.1",
- "@rollup/rollup-darwin-arm64": "4.17.1",
- "@rollup/rollup-darwin-x64": "4.17.1",
- "@rollup/rollup-linux-arm-gnueabihf": "4.17.1",
- "@rollup/rollup-linux-arm-musleabihf": "4.17.1",
- "@rollup/rollup-linux-arm64-gnu": "4.17.1",
- "@rollup/rollup-linux-arm64-musl": "4.17.1",
- "@rollup/rollup-linux-powerpc64le-gnu": "4.17.1",
- "@rollup/rollup-linux-riscv64-gnu": "4.17.1",
- "@rollup/rollup-linux-s390x-gnu": "4.17.1",
- "@rollup/rollup-linux-x64-gnu": "4.17.1",
- "@rollup/rollup-linux-x64-musl": "4.17.1",
- "@rollup/rollup-win32-arm64-msvc": "4.17.1",
- "@rollup/rollup-win32-ia32-msvc": "4.17.1",
- "@rollup/rollup-win32-x64-msvc": "4.17.1",
+ "@rollup/rollup-android-arm-eabi": "4.17.2",
+ "@rollup/rollup-android-arm64": "4.17.2",
+ "@rollup/rollup-darwin-arm64": "4.17.2",
+ "@rollup/rollup-darwin-x64": "4.17.2",
+ "@rollup/rollup-linux-arm-gnueabihf": "4.17.2",
+ "@rollup/rollup-linux-arm-musleabihf": "4.17.2",
+ "@rollup/rollup-linux-arm64-gnu": "4.17.2",
+ "@rollup/rollup-linux-arm64-musl": "4.17.2",
+ "@rollup/rollup-linux-powerpc64le-gnu": "4.17.2",
+ "@rollup/rollup-linux-riscv64-gnu": "4.17.2",
+ "@rollup/rollup-linux-s390x-gnu": "4.17.2",
+ "@rollup/rollup-linux-x64-gnu": "4.17.2",
+ "@rollup/rollup-linux-x64-musl": "4.17.2",
+ "@rollup/rollup-win32-arm64-msvc": "4.17.2",
+ "@rollup/rollup-win32-ia32-msvc": "4.17.2",
+ "@rollup/rollup-win32-x64-msvc": "4.17.2",
"fsevents": "~2.3.2"
}
},
@@ -5720,9 +5720,9 @@
}
},
"node_modules/vite-node": {
- "version": "1.5.2",
- "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.5.2.tgz",
- "integrity": "sha512-Y8p91kz9zU+bWtF7HGt6DVw2JbhyuB2RlZix3FPYAYmUyZ3n7iTp8eSyLyY6sxtPegvxQtmlTMhfPhUfCUF93A==",
+ "version": "1.5.3",
+ "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.5.3.tgz",
+ "integrity": "sha512-axFo00qiCpU/JLd8N1gu9iEYL3xTbMbMrbe5nDp9GL0nb6gurIdZLkkFogZXWnE8Oyy5kfSLwNVIcVsnhE7lgQ==",
"dev": true,
"dependencies": {
"cac": "^6.7.14",
@@ -5814,16 +5814,16 @@
}
},
"node_modules/vitest": {
- "version": "1.5.2",
- "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.5.2.tgz",
- "integrity": "sha512-l9gwIkq16ug3xY7BxHwcBQovLZG75zZL0PlsiYQbf76Rz6QGs54416UWMtC0jXeihvHvcHrf2ROEjkQRVpoZYw==",
+ "version": "1.5.3",
+ "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.5.3.tgz",
+ "integrity": "sha512-2oM7nLXylw3mQlW6GXnRriw+7YvZFk/YNV8AxIC3Z3MfFbuziLGWP9GPxxu/7nRlXhqyxBikpamr+lEEj1sUEw==",
"dev": true,
"dependencies": {
- "@vitest/expect": "1.5.2",
- "@vitest/runner": "1.5.2",
- "@vitest/snapshot": "1.5.2",
- "@vitest/spy": "1.5.2",
- "@vitest/utils": "1.5.2",
+ "@vitest/expect": "1.5.3",
+ "@vitest/runner": "1.5.3",
+ "@vitest/snapshot": "1.5.3",
+ "@vitest/spy": "1.5.3",
+ "@vitest/utils": "1.5.3",
"acorn-walk": "^8.3.2",
"chai": "^4.3.10",
"debug": "^4.3.4",
@@ -5837,7 +5837,7 @@
"tinybench": "^2.5.1",
"tinypool": "^0.8.3",
"vite": "^5.0.0",
- "vite-node": "1.5.2",
+ "vite-node": "1.5.3",
"why-is-node-running": "^2.2.2"
},
"bin": {
@@ -5852,8 +5852,8 @@
"peerDependencies": {
"@edge-runtime/vm": "*",
"@types/node": "^18.0.0 || >=20.0.0",
- "@vitest/browser": "1.5.2",
- "@vitest/ui": "1.5.2",
+ "@vitest/browser": "1.5.3",
+ "@vitest/ui": "1.5.3",
"happy-dom": "*",
"jsdom": "*"
},
@@ -5899,9 +5899,9 @@
}
},
"node_modules/vue-component-type-helpers": {
- "version": "2.0.14",
- "resolved": "https://registry.npmjs.org/vue-component-type-helpers/-/vue-component-type-helpers-2.0.14.tgz",
- "integrity": "sha512-DInfgOyXlMyliyqAAD9frK28tTfch0+tMi4qoWJcZlRxUf+NFAtraJBnAsKLep+FOyLMiajkhfyEb3xLK08i7w==",
+ "version": "2.0.15",
+ "resolved": "https://registry.npmjs.org/vue-component-type-helpers/-/vue-component-type-helpers-2.0.15.tgz",
+ "integrity": "sha512-jR/Hw52gzNQxMovJBsOQ/F9E1UQ8K1Np0CVG3RnueLkaCKqWuyL9XHl/5tUBAGJx+bk5xZ+co7vK23+Pzt75Lg==",
"dev": true
},
"node_modules/vue-eslint-parser": {
@@ -5939,13 +5939,13 @@
}
},
"node_modules/vue-tsc": {
- "version": "2.0.14",
- "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-2.0.14.tgz",
- "integrity": "sha512-DgAO3U1cnCHOUO7yB35LENbkapeRsBZ7Ugq5hGz/QOHny0+1VQN8eSwSBjYbjLVPfvfw6EY7sNPjbuHHUhckcg==",
+ "version": "2.0.15",
+ "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-2.0.15.tgz",
+ "integrity": "sha512-R7qcN33tJcNvo59g7ZuoZN1bbIe3rkDz4YjaK5kH/WxeyOZV4ynqa2IsQO4sCHXdx9hFTVDEXWuUgbGPuCz49A==",
"dev": true,
"dependencies": {
- "@volar/typescript": "2.2.0-alpha.10",
- "@vue/language-core": "2.0.14",
+ "@volar/typescript": "2.2.0-alpha.12",
+ "@vue/language-core": "2.0.15",
"semver": "^7.5.4"
},
"bin": {
diff --git a/src/components/Game.vue b/src/components/Game.vue
index d7023bd..b161171 100644
--- a/src/components/Game.vue
+++ b/src/components/Game.vue
@@ -15,14 +15,9 @@ import World from '@/components/World.vue'
const gameConfig = {
name: 'New Quest',
- scale: {
- mode: Phaser.Scale.NONE,
- width: window.innerWidth / 1.5,
- height: window.innerHeight / 1.5,
- zoom: 1.5
- },
- type: Phaser.CANVAS,
- physics: { default: 'arcade' },
+ width: window.innerWidth,
+ height: window.innerHeight,
+ type: Phaser.AUTO,
pixelArt: true,
}
@@ -41,7 +36,7 @@ const create = (scene) => {
});
// set camera to center
- cam.centerOn(0, 0);
+ // cam.centerOn(0, 0);
}
</script>
diff --git a/src/components/World.vue b/src/components/World.vue
index 61202e8..bebe7b1 100644
--- a/src/components/World.vue
+++ b/src/components/World.vue
@@ -1,11 +1,12 @@
<template>
<TilemapLayer :tilemap="map" :layerIndex="0" :tileset="data" />
- <Player />
+<!-- <Sprite ref="player" texture="player" :x="playerX" :y="playerY" />-->
</template>
<script setup>
-import { TilemapLayer, useScene } from 'phavuer'
+import { Sprite, TilemapLayer, useScene } from 'phavuer'
import Player from '@/components/player/Player.vue'
+import { ref } from 'vue'
const scene = useScene()
const mapData = new Phaser.Tilemaps.MapData({
@@ -17,9 +18,14 @@ const mapData = new Phaser.Tilemaps.MapData({
tileHeight: 32,
});
+const { tileWidth, tileHeight, width: tileSizeWidth } = mapData;
+const { width, height } = scene.cameras.main;
const map = new Phaser.Tilemaps.Tilemap(scene, mapData);
const tileset = map.addTilesetImage('default', 'tiles');
-const layer = map.createBlankLayer('layer', tileset);
+const layer = map.createBlankLayer('layer', tileset, -tileHeight + width / 2, height / 2 - (tileWidth * tileSizeWidth * 0.25));
+
+layer.cullPaddingX = 10;
+layer.cullPaddingY = 10;
const data = [
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ],
@@ -34,12 +40,51 @@ const data = [
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ],
];
-let y = 0;
-
-data.forEach(row => {
+data.forEach((row, y) => {
row.forEach((tile, x) => {
layer.putTileAt(tile, x, y);
});
- y++;
});
+
+
+const player = ref();
+let playerX = ref(0)
+let playerY = ref(0)
+
+// W,S,A,D
+scene.input.keyboard.on('keydown', function (event) {
+ if (event.key === 'a') { playerX.value -= 10; playerX.value -= 10; }
+ if (event.key === 'd') { playerX.value += 10; playerX.value += 10; }
+ if (event.key === 'w') { playerY.value -= 10; playerY.value -= 10; }
+ if (event.key === 's') { playerY.value += 10; playerY.value += 10; }
+});
+
+/**
+ * 1 tile is 64x32
+ * the map is 10x10
+ * so the map is 640x320
+ */
+
+function getDepth(tile) {
+ return 0;
+}
+
+function getTile(x, y, layers) {
+ if (layers.length === 0) return undefined;
+
+ const layer = layers.pop();
+ const tile = layer.getTileAtWorldXY(x, y);
+ if (tile) return tile;
+ else return this.getTile(x, y, layers);
+}
+
+function getTileAt(iX, iY, layers) {
+ if (layers.length === 0) return undefined;
+
+ const layer = layers.pop();
+ const tile = layer.getTileAt(iX, iY);
+ if (tile) return tile;
+ else return this.getTileAt(iX, iY, layers);
+}
+
</script>
\ No newline at end of file
diff --git a/src/components/player/Player.vue b/src/components/player/Player.vue
index db06716..035bfea 100644
--- a/src/components/player/Player.vue
+++ b/src/components/player/Player.vue
@@ -1,24 +1,12 @@
<template>
- <Image ref="player" texture="player" :x="x" :y="y">
- <Body :width="32" :height="32" />
- </Image>
+
</template>
<script setup>
-import { Image, useScene, Body } from 'phavuer'
+import { Sprite, useScene, Body } from 'phavuer'
import { ref } from 'vue'
const scene = useScene()
-const player = ref();
-let x = ref(0)
-let y = ref(0)
-// W,S,A,D
-scene.input.keyboard.on('keydown', function (event) {
- if (event.key === 'a') x.value -= 10
- if (event.key === 'd') x.value += 10
- if (event.key === 'w') y.value -= 10
- if (event.key === 's') y.value += 10
-});
</script>
\ No newline at end of file
diff --git a/src/engine/map.js b/src/engine/map.js
new file mode 100644
index 0000000..e69de29