diff --git a/packages/spelunker-web/package-lock.json b/packages/spelunker-web/package-lock.json index cb362ae..8a14a77 100644 --- a/packages/spelunker-web/package-lock.json +++ b/packages/spelunker-web/package-lock.json @@ -10,8 +10,8 @@ "license": "MIT", "dependencies": { "@apollo/client": "^3.8.8", - "@wowserhq/format": "^0.12.0", - "@wowserhq/scene": "^0.16.1", + "@wowserhq/format": "^0.13.1", + "@wowserhq/scene": "^0.17.0", "classnames": "^2.3.1", "crypto-hash": "^2.0.0", "graphql": "^16.8.1", @@ -2672,9 +2672,9 @@ } }, "node_modules/@wowserhq/format": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/@wowserhq/format/-/format-0.12.0.tgz", - "integrity": "sha512-ddEXUOQJNfufCe58S21GjxtJhmQY/bkgHiCUNjvHeb/LwIQYnJEJyoTLVBTL1vQ9Br7pP36RohfHN56HZ418ZQ==", + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/@wowserhq/format/-/format-0.13.1.tgz", + "integrity": "sha512-FGEDHZK5tZENcpud1P4JvunxpvLfhLY69k5S0ijmRaTmcwaFR06xCS5TA0ORscCFsLmtezpFWOpwUxrNUDmiCg==", "dependencies": { "@wowserhq/io": "^2.0.2", "gl-matrix": "^3.4.3" @@ -2686,11 +2686,11 @@ "integrity": "sha512-YGjfUbo+wNuJiy6pOhsGeWAjq7bTvMDoGn5y+2LW2LJujOvRWNUx95MaRaJgtp8O+ig/+loJRVg5mTQoY9eoIg==" }, "node_modules/@wowserhq/scene": { - "version": "0.16.1", - "resolved": "https://registry.npmjs.org/@wowserhq/scene/-/scene-0.16.1.tgz", - "integrity": "sha512-iOHXWgBUupYKGG/Qdo10s8YmtgV9PLsTSz04v3euefZ+31N/xSTrUzAnBWa4xLV2Ms0IxEMgQZtpThnUB1AySg==", + "version": "0.17.0", + "resolved": "https://registry.npmjs.org/@wowserhq/scene/-/scene-0.17.0.tgz", + "integrity": "sha512-6DPC0wC3+RYg0oE7NhCSq+HlG/PPmjYfGVfhgSaTJ0QcMA+ZqrcSz3Wm4vfn9Z/PEB5SjL6lIEQ7lZEdZRS2GA==", "dependencies": { - "@wowserhq/format": "^0.12.0" + "@wowserhq/format": "^0.13.1" }, "peerDependencies": { "three": "^0.160.0" @@ -12644,9 +12644,9 @@ "requires": {} }, "@wowserhq/format": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/@wowserhq/format/-/format-0.12.0.tgz", - "integrity": "sha512-ddEXUOQJNfufCe58S21GjxtJhmQY/bkgHiCUNjvHeb/LwIQYnJEJyoTLVBTL1vQ9Br7pP36RohfHN56HZ418ZQ==", + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/@wowserhq/format/-/format-0.13.1.tgz", + "integrity": "sha512-FGEDHZK5tZENcpud1P4JvunxpvLfhLY69k5S0ijmRaTmcwaFR06xCS5TA0ORscCFsLmtezpFWOpwUxrNUDmiCg==", "requires": { "@wowserhq/io": "^2.0.2", "gl-matrix": "^3.4.3" @@ -12658,11 +12658,11 @@ "integrity": "sha512-YGjfUbo+wNuJiy6pOhsGeWAjq7bTvMDoGn5y+2LW2LJujOvRWNUx95MaRaJgtp8O+ig/+loJRVg5mTQoY9eoIg==" }, "@wowserhq/scene": { - "version": "0.16.1", - "resolved": "https://registry.npmjs.org/@wowserhq/scene/-/scene-0.16.1.tgz", - "integrity": "sha512-iOHXWgBUupYKGG/Qdo10s8YmtgV9PLsTSz04v3euefZ+31N/xSTrUzAnBWa4xLV2Ms0IxEMgQZtpThnUB1AySg==", + "version": "0.17.0", + "resolved": "https://registry.npmjs.org/@wowserhq/scene/-/scene-0.17.0.tgz", + "integrity": "sha512-6DPC0wC3+RYg0oE7NhCSq+HlG/PPmjYfGVfhgSaTJ0QcMA+ZqrcSz3Wm4vfn9Z/PEB5SjL6lIEQ7lZEdZRS2GA==", "requires": { - "@wowserhq/format": "^0.12.0" + "@wowserhq/format": "^0.13.1" } }, "@wry/caches": { diff --git a/packages/spelunker-web/package.json b/packages/spelunker-web/package.json index 5c84b50..0a0f1af 100644 --- a/packages/spelunker-web/package.json +++ b/packages/spelunker-web/package.json @@ -19,8 +19,8 @@ ], "dependencies": { "@apollo/client": "^3.8.8", - "@wowserhq/format": "^0.12.0", - "@wowserhq/scene": "^0.16.1", + "@wowserhq/format": "^0.13.1", + "@wowserhq/scene": "^0.17.0", "classnames": "^2.3.1", "crypto-hash": "^2.0.0", "graphql": "^16.8.1", diff --git a/packages/spelunker-web/src/components/core/MapViewer/index.jsx b/packages/spelunker-web/src/components/core/MapViewer/index.jsx index 2290470..e303313 100644 --- a/packages/spelunker-web/src/components/core/MapViewer/index.jsx +++ b/packages/spelunker-web/src/components/core/MapViewer/index.jsx @@ -79,7 +79,7 @@ const MapViewer = ({ map: { id, filename } }) => { controls.setView(view); const mapManager = new MapManager({ host: assetHost, textureManager }); - mapManager.load(filename); + mapManager.load(filename, id); mapManagerRef.current = mapManager; scene.add(mapManager.root); @@ -95,6 +95,7 @@ const MapViewer = ({ map: { id, filename } }) => { controls.update(delta); mapManager.update(delta, camera); + renderer.setClearColor(mapManager.clearColor); renderer.render(scene, camera); rafId = requestAnimationFrame(animate);