From fb3e2ff9ef850e81d024c249eacd56ef926231e8 Mon Sep 17 00:00:00 2001
From: Lucio Zambon <lucio.zambon@elettra.eu>
Date: Wed, 28 Aug 2024 01:15:11 +0000
Subject: [PATCH] Update panther.js
---
panther.js | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/panther.js b/panther.js
index 980f280..ee40ff4 100644
--- a/panther.js
+++ b/panther.js
@@ -104,7 +104,7 @@
gui.title('PAnTHer - controls');
gui.add(params, 'search'); // .onKeyup(function() {console.log('search');});
gui.addColor(params, 'backgroundColor').onChange(function() {toggleParam('backgroundColor');});
- params.far = 120;
+ params.far = typeof conf.default_far[machine]!='undefined'? conf.default_far[machine]: 120;
gui.add(params, 'far', 50, 400).onChange(function() {setFar(params.far);});
const debugcamera = document.location.search.indexOf('debugcamera')>-1;
if (debugcamera) $('body').append('<div class="debug" style="top: 0; position: fixed;"> x: <input size="5" id="x"/>, y: <input size="5" id="y"/>, z: <input size="5" id="z"/>, cx: <input size="5" id="cx"/>, cy: <input size="5" id="cy"/>, cz: <input size="5" id="cz"/>');
@@ -855,10 +855,12 @@
animate();
function moveCamera() {
- const cameraPos = (document.location.search.indexOf('camera=')>-1)? document.location.search.split('camera=')[1].split('&')[0].split(','): [-22000, 7200, 70000, -0.1, -0.3, -0.03];
+ const cameraInitPosition = typeof conf.default_camera_init[machine] == 'undefined'? conf.default_camera_init.default: conf.default_camera_init[machine];
+ // const cameraPos = (document.location.search.indexOf('camera=')>-1)? document.location.search.split('camera=')[1].split('&')[0].split(','): [-22000, 7200, 70000, -0.1, -0.3, -0.03];
+ const cameraPos = (document.location.search.indexOf('camera=')>-1)? document.location.search.split('camera=')[1].split('&')[0].split(','): cameraInitPosition;
if (debugcamera) {$('#x').val(camera.position.x); $('#y').val(camera.position.y); $('#z').val(camera.position.z); $('#cx').val(camera.rotation.x); $('#cy').val(camera.rotation.y); $('#cz').val(camera.rotation.z);}
if (cameraStarted) {if (debugcamera) setUrl('camera', camera.position.x+','+camera.position.y+','+camera.position.z+','+camera.rotation.x+','+camera.rotation.y+','+camera.rotation.z); return;}
- console.log('moveCamera()', camera.rotation);
+ console.log('moveCamera()', camera.rotation, machine, cameraInitPosition);
cameraStarted = true;
camera.position.set(cameraPos[0]*params.highlightScale, cameraPos[1]*params.highlightScale, cameraPos[2]*params.highlightScale);
camera.rotation.set(cameraPos[3],cameraPos[4],cameraPos[5]);
@@ -904,6 +906,7 @@ window.setFar = setFar;
window.addEventListener('resize', onWindowResize);
camera.updateMatrixWorld(true);
+ setFar(params.far);
const dirLight1 = new THREE.DirectionalLight(0xffffff, 3);
dirLight1.position.set(1, 1, 1);
--
GitLab