This commit is contained in:
+6
-18
@@ -188,6 +188,7 @@ class GameEngine extends EventManager{
|
|||||||
scene.background = new THREE.Color(1, 1, 1);
|
scene.background = new THREE.Color(1, 1, 1);
|
||||||
//console.log('GameEngine started')
|
//console.log('GameEngine started')
|
||||||
renderer.domElement.addEventListener('wheel', (event) => {
|
renderer.domElement.addEventListener('wheel', (event) => {
|
||||||
|
event.preventDefault();
|
||||||
if (gameEngine.hero){
|
if (gameEngine.hero){
|
||||||
if (!gameEngine.hero.pointerControls.controls.isLocked){
|
if (!gameEngine.hero.pointerControls.controls.isLocked){
|
||||||
gameEngine.hero.cameraZ += event.deltaY / 100;
|
gameEngine.hero.cameraZ += event.deltaY / 100;
|
||||||
@@ -197,9 +198,10 @@ class GameEngine extends EventManager{
|
|||||||
gameEngine.camera.updateProjectionMatrix();
|
gameEngine.camera.updateProjectionMatrix();
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
gameEngine.camera.zoom -= event.deltaY / 1000;
|
gameEngine.camera.zoom -= event.deltaY / (1000 / gameEngine.camera.zoom);
|
||||||
gameEngine.camera.zoom = Math.max(gameEngine.camera.zoom, .4);
|
gameEngine.camera.zoom = Math.max(gameEngine.camera.zoom, .01);
|
||||||
controls.rotateSpeed = 1 / gameEngine.camera.zoom;
|
//controls.rotateSpeed = 1 / Math.sqrt(gameEngine.camera.zoom);
|
||||||
|
controls.panSpeed = 1 / gameEngine.camera.zoom;
|
||||||
gameEngine.camera.updateProjectionMatrix();
|
gameEngine.camera.updateProjectionMatrix();
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@@ -342,22 +344,7 @@ class GameEngine extends EventManager{
|
|||||||
}else{
|
}else{
|
||||||
gameEngine.transformControls.setMode('rotate');
|
gameEngine.transformControls.setMode('rotate');
|
||||||
}
|
}
|
||||||
// let nextMode = {
|
|
||||||
// 'translate': 'scale',
|
|
||||||
// 'scale': 'rotate',
|
|
||||||
// 'rotate': 'translate'
|
|
||||||
// }
|
|
||||||
// if(gameEngine.opts.designMode){;
|
|
||||||
// gameEngine.transformControls.setMode(nextMode[gameEngine.transformControls.getMode()]);
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
// if (gp.buttons[5]?.pressed) {
|
|
||||||
// // gameEngine.setCameraOrthographic();
|
|
||||||
// // gameEngine.renderer.xr.updateCamera(gameEngine.orthographicCamera);
|
|
||||||
// let session = gameEngine.renderer.xr.getFrame().session;
|
|
||||||
// console.log(session);
|
|
||||||
// session.resumeDepthSensing();
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -620,6 +607,7 @@ class GameEngine extends EventManager{
|
|||||||
this.arBtn?.remove();
|
this.arBtn?.remove();
|
||||||
this.xrBtn?.remove();
|
this.xrBtn?.remove();
|
||||||
this.stats?.dom?.remove();
|
this.stats?.dom?.remove();
|
||||||
|
this.renderer.domElement.remove();
|
||||||
}
|
}
|
||||||
|
|
||||||
static textureLoader = new THREE.TextureLoader();
|
static textureLoader = new THREE.TextureLoader();
|
||||||
|
|||||||
+1
-1
@@ -13,7 +13,7 @@ class Hero{
|
|||||||
}
|
}
|
||||||
|
|
||||||
set cameraZ(v){
|
set cameraZ(v){
|
||||||
this.#cameraZ = Math.min(Math.max(v, 1), 10);
|
this.#cameraZ = Math.min(Math.max(v, 1), 12);
|
||||||
if (this.#cameraZ == 1){
|
if (this.#cameraZ == 1){
|
||||||
this.lockControls().then(()=>{
|
this.lockControls().then(()=>{
|
||||||
this.#cameraZ = 0;
|
this.#cameraZ = 0;
|
||||||
|
|||||||
+1
-1
@@ -76,7 +76,7 @@ export default defineConfig({
|
|||||||
},
|
},
|
||||||
hmr:true,
|
hmr:true,
|
||||||
strictPort: true,
|
strictPort: true,
|
||||||
host:'127.0.0.1',//'192.168.31.137', //'192.168.83.59',//
|
host:'192.168.31.137', //'192.168.83.59',//'127.0.0.1',//
|
||||||
proxy:{
|
proxy:{
|
||||||
'/api': {
|
'/api': {
|
||||||
target: 'https://localhost:3000',
|
target: 'https://localhost:3000',
|
||||||
|
|||||||
Reference in New Issue
Block a user