diff --git a/jsconfig.json b/jsconfig.json index dad0634..17ad1ee 100644 --- a/jsconfig.json +++ b/jsconfig.json @@ -1,13 +1,12 @@ { "compilerOptions": { "allowJs": true, - "target": "es5", + "target": "es6", "module": "esnext", - "baseUrl": "./", "moduleResolution": "bundler", "paths": { "@/*": [ - "src/*" + "./src/*" ] }, "lib": [ diff --git a/package-lock.json b/package-lock.json index 0f8aaf5..61adc21 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pronature-platform", - "version": "0.8.0", + "version": "0.9.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pronature-platform", - "version": "0.8.0", + "version": "0.9.0", "dependencies": { "@mdi/font": "7.4.47", "@vitejs/plugin-basic-ssl": "^1.1.0", @@ -32,7 +32,6 @@ "roboto-fontface": "*", "sharp": "^0.33.5", "svg-captcha": "^1.4.0", - "three-viewport-gizmo": "^2.2.0", "uuid": "^11.1.0", "vue": "^3.5.13", "vuetify": "^3.10.5" @@ -51,6 +50,7 @@ "pinia": "^2.1.7", "sass": "1.77.6", "three": "^0.183.2", + "three-viewport-gizmo": "git://github.com/goynov/three-viewport-gizmo.git", "troika-three-text": "^0.52.4", "unplugin-auto-import": "^0.17.6", "unplugin-fonts": "^1.1.1", @@ -7581,15 +7581,16 @@ "version": "0.183.2", "resolved": "https://registry.npmjs.org/three/-/three-0.183.2.tgz", "integrity": "sha512-di3BsL2FEQ1PA7Hcvn4fyJOlxRRgFYBpMTcyOgkwJIaDOdJMebEFPA+t98EvjuljDx4hNulAGwF6KIjtwI5jgQ==", + "dev": true, "license": "MIT" }, "node_modules/three-viewport-gizmo": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/three-viewport-gizmo/-/three-viewport-gizmo-2.2.0.tgz", - "integrity": "sha512-Jo9Liur1rUmdKk75FZumLU/+hbF+RtJHi1qsKZpntjKlCYScK6tjbYoqvJ9M+IJphrlQJF5oReFW7Sambh0N4Q==", + "resolved": "git+ssh://git@github.com/goynov/three-viewport-gizmo.git#2e6d7a709228c94991329005e85525aee5e07593", + "dev": true, "license": "MIT", "peerDependencies": { - "three": ">=0.162.0 <1.0.0" + "three": ">=0.179.0 <1.0.0" } }, "node_modules/through": { diff --git a/package.json b/package.json index 8169a79..b493b94 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,6 @@ "roboto-fontface": "*", "sharp": "^0.33.5", "svg-captcha": "^1.4.0", - "three-viewport-gizmo": "^2.2.0", "uuid": "^11.1.0", "vue": "^3.5.13", "vuetify": "^3.10.5" @@ -53,6 +52,7 @@ "pinia": "^2.1.7", "sass": "1.77.6", "three": "^0.183.2", + "three-viewport-gizmo": "git://github.com/goynov/three-viewport-gizmo.git", "troika-three-text": "^0.52.4", "unplugin-auto-import": "^0.17.6", "unplugin-fonts": "^1.1.1", diff --git a/src/components/GamePreview/GamePreview.vue b/src/components/GamePreview/GamePreview.vue index f4c4bad..3b0d145 100644 --- a/src/components/GamePreview/GamePreview.vue +++ b/src/components/GamePreview/GamePreview.vue @@ -6,7 +6,7 @@ @mouseup="targetPointer($event, 'end')" > - + diff --git a/src/components/InteractiveObjects/Particles/Particles.js b/src/components/InteractiveObjects/Particles/Particles.js index afc6144..e688077 100644 --- a/src/components/InteractiveObjects/Particles/Particles.js +++ b/src/components/InteractiveObjects/Particles/Particles.js @@ -1,10 +1,4 @@ -import { - Matrix4, - Mesh, - PlaneGeometry, - MeshBasicMaterial, - Vector3, -} from 'three'; +import { Matrix4, Mesh, PlaneGeometry, MeshBasicMaterial, Vector3 } from 'three'; import * as BufferGeometryUtils from 'three/addons/utils/BufferGeometryUtils.js'; diff --git a/src/lib/GameEngine.js b/src/lib/GameEngine.js index 0349e91..5bc4886 100644 --- a/src/lib/GameEngine.js +++ b/src/lib/GameEngine.js @@ -1,12 +1,11 @@ import * as THREE from 'three'; -import { GLTFLoader, DRACOLoader, OrbitControls } from 'three/examples/jsm/Addons.js'; -//import { Controller as OrbitControls } from './3rd-party/phy/3TH/Controller.js'; +import { OrbitControls } from 'three/addons/controls/OrbitControls.js'; +import { GLTFLoader } from 'three/addons/loaders/GLTFLoader.js'; +import { DRACOLoader } from 'three/addons/loaders/DRACOLoader.js'; import { ViewportGizmo } from "three-viewport-gizmo"; -import Stats from 'three/examples/jsm/libs/stats.module'; +import Stats from 'three/addons/libs/stats.module.js'; import { AnaglyphEffect } from 'three/addons/effects/AnaglyphEffect.js'; import { StereoEffect } from 'three/addons/effects/StereoEffect.js'; -// import { MapControls } from 'three/addons/controls/MapControls.js'; -// import { FirstPersonControls } from 'three/addons/controls/FirstPersonControls.js'; import { TransformControls } from 'three/addons/controls/TransformControls.js'; import { PointerControls } from './PointerControls'; import { ARButton } from 'three/addons/webxr/ARButton.js'; @@ -169,6 +168,7 @@ class GameEngine extends EventManager{ //powerPreference: "high-performance", //precision: 'mediump' }); + //await renderer.init(); renderer.setPixelRatio(window.devicePixelRatio); renderer.toneMapping = THREE.CineonToneMapping; renderer.toneMappingExposure = 1.0; @@ -258,7 +258,7 @@ class GameEngine extends EventManager{ domNode.appendChild(renderer.domElement); this._wheelEvent = ((event) => { - event.preventDefault(); + //event.preventDefault(); if (this.hero){ if (!this.pointerControls.isLocked){ this.hero.cameraZ += event.deltaY * 0.005; @@ -272,7 +272,7 @@ class GameEngine extends EventManager{ } }).bind(this) - renderer.domElement.addEventListener('wheel', this._wheelEvent) + renderer.domElement.addEventListener('wheel', this._wheelEvent, { passive: true }) GameEngine.ktxLoader.detectSupport(renderer); }