From 3b90ccaec7a68aa6bdaae7870af122455fc2131c Mon Sep 17 00:00:00 2001 From: JannisX11 Date: Wed, 12 Mar 2025 23:36:52 +0100 Subject: [PATCH] Add three.js types Fix shader issue --- js/shaders/marker.frag.glsl | 2 +- lib/{libs.js => libs.ts} | 1 - package-lock.json | 51 +++++++++++++++++++++++++++++++++++++ package.json | 1 + 4 files changed, 53 insertions(+), 2 deletions(-) rename lib/{libs.js => libs.ts} (95%) diff --git a/js/shaders/marker.frag.glsl b/js/shaders/marker.frag.glsl index 77c55dc6..83807f38 100644 --- a/js/shaders/marker.frag.glsl +++ b/js/shaders/marker.frag.glsl @@ -23,4 +23,4 @@ void main(void) gl_FragColor.g = gl_FragColor.g * 0.7; } -}` \ No newline at end of file +} \ No newline at end of file diff --git a/lib/libs.js b/lib/libs.ts similarity index 95% rename from lib/libs.js rename to lib/libs.ts index ad976526..ea201c6e 100644 --- a/lib/libs.js +++ b/lib/libs.ts @@ -8,7 +8,6 @@ import Prism from 'prismjs' import GIF from 'gif.js' const THREE = Object.assign({}, threejs); -//Vue.use(Sortable); export { GIFEnc, diff --git a/package-lock.json b/package-lock.json index 56347c75..ef007df3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "license": "GPL-3.0-or-later", "dependencies": { "@electron/remote": "^2.1.2", + "@types/three": "^0.174.0", "blockbench-types": "^4.12.1", "electron-color-picker": "^0.2.0", "electron-updater": "^6.3.4", @@ -2790,6 +2791,12 @@ "node": ">= 10" } }, + "node_modules/@tweenjs/tween.js": { + "version": "23.1.3", + "resolved": "https://registry.npmjs.org/@tweenjs/tween.js/-/tween.js-23.1.3.tgz", + "integrity": "sha512-vJmvvwFxYuGnF2axRtPYocag6Clbb5YS7kLL+SO/TeVFzHqDIWrNKYtcsPMibjDx9O+bu+psAy9NKfWklassUA==", + "license": "MIT" + }, "node_modules/@types/cacheable-request": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz", @@ -2909,6 +2916,26 @@ "integrity": "sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==", "license": "MIT" }, + "node_modules/@types/stats.js": { + "version": "0.17.3", + "resolved": "https://registry.npmjs.org/@types/stats.js/-/stats.js-0.17.3.tgz", + "integrity": "sha512-pXNfAD3KHOdif9EQXZ9deK82HVNaXP5ZIF5RP2QG6OQFNTaY2YIetfrE9t528vEreGQvEPRDDc8muaoYeK0SxQ==", + "license": "MIT" + }, + "node_modules/@types/three": { + "version": "0.174.0", + "resolved": "https://registry.npmjs.org/@types/three/-/three-0.174.0.tgz", + "integrity": "sha512-De/+vZnfg2aVWNiuy1Ldu+n2ydgw1osinmiZTAn0necE++eOfsygL8JpZgFjR2uHmAPo89MkxBj3JJ+2BMe+Uw==", + "license": "MIT", + "dependencies": { + "@tweenjs/tween.js": "~23.1.3", + "@types/stats.js": "*", + "@types/webxr": "*", + "@webgpu/types": "*", + "fflate": "~0.8.2", + "meshoptimizer": "~0.18.1" + } + }, "node_modules/@types/tinycolor2": { "version": "1.4.6", "resolved": "https://registry.npmjs.org/@types/tinycolor2/-/tinycolor2-1.4.6.tgz", @@ -2929,6 +2956,12 @@ "license": "MIT", "optional": true }, + "node_modules/@types/webxr": { + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/@types/webxr/-/webxr-0.5.21.tgz", + "integrity": "sha512-geZIAtLzjGmgY2JUi6VxXdCrTb99A7yP49lxLr2Nm/uIK0PkkxcEi4OGhoGDO4pxCf3JwGz2GiJL2Ej4K2bKaA==", + "license": "MIT" + }, "node_modules/@types/yauzl": { "version": "2.10.3", "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz", @@ -2951,6 +2984,12 @@ "prettier": "^1.18.2 || ^2.0.0" } }, + "node_modules/@webgpu/types": { + "version": "0.1.55", + "resolved": "https://registry.npmjs.org/@webgpu/types/-/types-0.1.55.tgz", + "integrity": "sha512-p97I8XEC1h04esklFqyIH+UhFrUcj8/1/vBWgc6lAK4jMJc+KbhUy8D4dquHYztFj6pHLqGcp/P1xvBBF4r3DA==", + "license": "BSD-3-Clause" + }, "node_modules/@xmldom/xmldom": { "version": "0.8.10", "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz", @@ -4970,6 +5009,12 @@ "pend": "~1.2.0" } }, + "node_modules/fflate": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.2.tgz", + "integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==", + "license": "MIT" + }, "node_modules/file-saver": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz", @@ -6201,6 +6246,12 @@ "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", "dev": true }, + "node_modules/meshoptimizer": { + "version": "0.18.1", + "resolved": "https://registry.npmjs.org/meshoptimizer/-/meshoptimizer-0.18.1.tgz", + "integrity": "sha512-ZhoIoL7TNV4s5B6+rx5mC//fw8/POGyNxS/DZyCJeiZ12ScLfVwRE/GfsxwiTkMYYD5DmK2/JXnEVXqL4rF+Sw==", + "license": "MIT" + }, "node_modules/mime": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", diff --git a/package.json b/package.json index 048f1d46..a1d17369 100644 --- a/package.json +++ b/package.json @@ -148,6 +148,7 @@ }, "dependencies": { "@electron/remote": "^2.1.2", + "@types/three": "^0.174.0", "blockbench-types": "^4.12.1", "electron-color-picker": "^0.2.0", "electron-updater": "^6.3.4",