From 0339df9a8d76e57645ba6878e36fd495e5fe462a Mon Sep 17 00:00:00 2001 From: Dennis Postma Date: Sun, 16 Jun 2024 15:24:56 +0200 Subject: [PATCH] More work on wall positioning, started working on GM asset manager --- package-lock.json | 106 +++++++++++++----- public/assets/zone/wall1.png | Bin 0 -> 3802 bytes public/assets/zone/wall2.png | Bin 0 -> 3764 bytes .../utilities/AssetManager/AssetManager.vue | 18 +++ .../utilities/zoneEditor/Decorations.vue | 67 ++++++----- .../utilities/zoneEditor/Toolbar.vue | 2 - src/components/utilities/zoneEditor/Walls.vue | 105 ----------------- .../utilities/zoneEditor/ZoneEditor.vue | 50 ++++----- src/screens/Game.vue | 2 + src/stores/zoneEditor.ts | 11 +- 10 files changed, 165 insertions(+), 196 deletions(-) create mode 100644 public/assets/zone/wall1.png create mode 100644 public/assets/zone/wall2.png create mode 100644 src/components/utilities/AssetManager/AssetManager.vue delete mode 100644 src/components/utilities/zoneEditor/Walls.vue diff --git a/package-lock.json b/package-lock.json index d0f2f6a..7b6f545 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2302,14 +2302,14 @@ "license": "MIT" }, "node_modules/@vue/devtools-core": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/@vue/devtools-core/-/devtools-core-7.2.1.tgz", - "integrity": "sha512-OyWl455UnJIVgZ6lo5WQ79WbDMoXtSRwyNKp9WzCZ0HhuQywIk4qv59KtLRe75uVmtGBde4hXNaSyRm+x9bY6g==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@vue/devtools-core/-/devtools-core-7.3.0.tgz", + "integrity": "sha512-J5nmaYadJvDgH9zsQI9vSLlWjfZn/TdKWEKMcc9xjbF3OvdhQwRrojvFax1G+WPoQ/X67EZKeUVY/ovCCyLo7A==", "dev": true, "license": "MIT", "dependencies": { - "@vue/devtools-kit": "^7.2.1", - "@vue/devtools-shared": "^7.2.1", + "@vue/devtools-kit": "^7.3.0", + "@vue/devtools-shared": "^7.3.0", "mitt": "^3.0.1", "nanoid": "^3.3.4", "pathe": "^1.1.2", @@ -2317,26 +2317,28 @@ } }, "node_modules/@vue/devtools-kit": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.2.1.tgz", - "integrity": "sha512-Wak/fin1X0Q8LLIfCAHBrdaaB+R6IdpSXsDByPHbQ3BmkCP0/cIo/oEGp9i0U2+gEqD4L3V9RDjNf1S34DTzQQ==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.3.0.tgz", + "integrity": "sha512-J9C+ue3Ka8cumQY/hMsNTcbb1tczqVBBXFMw4isa5YvPjyIBgEtJBfDSUVIK3nE+YWk7UNliUuCcE1GHEKaGcw==", "dev": true, "license": "MIT", "dependencies": { - "@vue/devtools-shared": "^7.2.1", + "@vue/devtools-shared": "^7.3.0", + "birpc": "^0.2.17", "hookable": "^5.5.3", "mitt": "^3.0.1", "perfect-debounce": "^1.0.0", - "speakingurl": "^14.0.1" + "speakingurl": "^14.0.1", + "superjson": "^2.2.1" }, "peerDependencies": { "vue": "^3.0.0" } }, "node_modules/@vue/devtools-shared": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.2.1.tgz", - "integrity": "sha512-PCJF4UknJmOal68+X9XHyVeQ+idv0LFujkTOIW30+GaMJqwFVN9LkQKX4gLqn61KkGMdJTzQ1bt7EJag3TI6AA==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.3.0.tgz", + "integrity": "sha512-bYw4BtZclxzVrYBeYYHzNOcLlvVZbe9tutwtrixTtdgynHvuSJa5KI2MqWiumpGYm2feFI5sHlC8Vt61v4z18g==", "dev": true, "license": "MIT", "dependencies": { @@ -2835,6 +2837,16 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/birpc": { + "version": "0.2.17", + "resolved": "https://registry.npmjs.org/birpc/-/birpc-0.2.17.tgz", + "integrity": "sha512-+hkTxhot+dWsLpp3gia5AkVHIsKlZybNT5gIYiDlNzJrmYPcTM9k5/w2uaj3IPpd7LlEYpmCj4Jj1nC41VhDFg==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/antfu" + } + }, "node_modules/boolbase": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", @@ -3145,6 +3157,22 @@ "node": ">= 0.6" } }, + "node_modules/copy-anything": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-3.0.5.tgz", + "integrity": "sha512-yCEafptTtb4bk7GLEQoM8KVJpxAfdBJYaXyzQEgQQQgYrZiDp8SJmGKlYza6CYjEDNstAdNdKA3UuoULlEbS6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-what": "^4.1.8" + }, + "engines": { + "node": ">=12.13" + }, + "funding": { + "url": "https://github.com/sponsors/mesqueeb" + } + }, "node_modules/cross-fetch": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz", @@ -3415,9 +3443,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.802", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.802.tgz", - "integrity": "sha512-TnTMUATbgNdPXVSHsxvNVSG0uEd6cSZsANjm8c9HbvflZVVn1yTRcmVXYT1Ma95/ssB/Dcd30AHweH2TE+dNpA==", + "version": "1.4.803", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.803.tgz", + "integrity": "sha512-61H9mLzGOCLLVsnLiRzCbc63uldP0AniRYPV3hbGVtONA1pI7qSGILdbofR7A8TMbOypDocEAjH/e+9k1QIe3g==", "dev": true, "license": "ISC" }, @@ -3986,9 +4014,9 @@ } }, "node_modules/foreground-child": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.0.tgz", - "integrity": "sha512-CrWQNaEl1/6WeZoarcM9LHupTo3RpZO2Pdk1vktwzPiQTsJnAKJmm3TACKeG5UZbWDfaH2AbvYxzP96y0MT7fA==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz", + "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==", "dev": true, "license": "ISC", "dependencies": { @@ -4534,6 +4562,19 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/is-what": { + "version": "4.1.16", + "resolved": "https://registry.npmjs.org/is-what/-/is-what-4.1.16.tgz", + "integrity": "sha512-ZhMwEosbFJkA0YhFnNDgTM4ZxDRsS6HqTo7qsZM08fehyRYIYa0yHu5R6mgo1n/8MgaPBXiPimPD77baVFYg+A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12.13" + }, + "funding": { + "url": "https://github.com/sponsors/mesqueeb" + } + }, "node_modules/is-wsl": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz", @@ -6295,6 +6336,19 @@ "dev": true, "license": "MIT" }, + "node_modules/superjson": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/superjson/-/superjson-2.2.1.tgz", + "integrity": "sha512-8iGv75BYOa0xRJHK5vRLEjE2H/i4lulTjzpUXic3Eg8akftYjkmQDa8JARQ42rlczXyFR3IeRoeFCc7RxHsYZA==", + "dev": true, + "license": "MIT", + "dependencies": { + "copy-anything": "^3.0.2" + }, + "engines": { + "node": ">=16" + } + }, "node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -6722,19 +6776,19 @@ } }, "node_modules/vite-plugin-vue-devtools": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/vite-plugin-vue-devtools/-/vite-plugin-vue-devtools-7.2.1.tgz", - "integrity": "sha512-4k7QNZz0nSojoePQoxnE5fIzi8RU1QJHc0TEg4golv2phZxhBGfjScZD2B8X6bcrRbUQ9CaRKN0dzBs1xtzzNg==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/vite-plugin-vue-devtools/-/vite-plugin-vue-devtools-7.3.0.tgz", + "integrity": "sha512-XnxQzTloGkQUTpsRdWVsEBzyh9F6i8NBmuPo8lotx4lSUnWYJ+jUlXvfftzmOf14hFgsTOySLJCr9nhaqOzgOA==", "dev": true, "license": "MIT", "dependencies": { - "@vue/devtools-core": "^7.2.1", - "@vue/devtools-kit": "^7.2.1", - "@vue/devtools-shared": "^7.2.1", + "@vue/devtools-core": "^7.3.0", + "@vue/devtools-kit": "^7.3.0", + "@vue/devtools-shared": "^7.3.0", "execa": "^8.0.1", "sirv": "^2.0.4", "vite-plugin-inspect": "^0.8.4", - "vite-plugin-vue-inspector": "^5.1.0" + "vite-plugin-vue-inspector": "^5.1.2" }, "engines": { "node": ">=v14.21.3" diff --git a/public/assets/zone/wall1.png b/public/assets/zone/wall1.png new file mode 100644 index 0000000000000000000000000000000000000000..50b67a3a228f7142fe92587845042e1e98dc2c44 GIT binary patch literal 3802 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 QW&i*H07*qoM6N<$f+3kzFaQ7m literal 0 HcmV?d00001 diff --git a/public/assets/zone/wall2.png b/public/assets/zone/wall2.png new file mode 100644 index 0000000000000000000000000000000000000000..756f21680adf76aa0766e7954b86ce5d3fb8325f GIT binary patch literal 3764 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 e@zSw(2;_gkAqf#&I$`<%0000 + + + + + + + + + \ No newline at end of file diff --git a/src/components/utilities/zoneEditor/Decorations.vue b/src/components/utilities/zoneEditor/Decorations.vue index 00291fb..bd78a60 100644 --- a/src/components/utilities/zoneEditor/Decorations.vue +++ b/src/components/utilities/zoneEditor/Decorations.vue @@ -1,13 +1,19 @@