diff --git a/_includes/head.html b/_includes/head.html index 8874d9c..8aba161 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -11,8 +11,24 @@ margin: 10px; } .container-fluid { width: 100%; } - .row { display: flex; flex-wrap: wrap; gap: 1rem; } - .row > .col, .row > .col-sm { flex: 1 1 0; min-width: 0; } + .row { + display: flex; + flex-wrap: wrap; + gap: 1rem; + } + .row > .col, + .row > .col-sm { + flex: 1 1 0; + min-width: 0; + } + .row > .col-1 { + flex: 1 1 0; + min-width: 0; + } + .row > .col-2 { + flex: 2 1 0; + min-width: 0; + } .font-weight-bold { font-weight: 700; } .display-5 { font-size: 2.5rem; font-weight: 300; line-height: 1.2; } .carousel-slide { position: relative; } @@ -47,7 +63,12 @@ .grid .tick { stroke: lightgrey; opacity: .2; } .grid path { stroke-width: 0; } @media (max-width: 700px) { - .row > .col, .row > .col-sm { flex-basis: 100%; } + .row > .col, + .row > .col-sm, + .row > .col-1, + .row > .col-2 { + flex-basis: 100%; + } } diff --git a/_layouts/collada.html b/_layouts/collada.html new file mode 100644 index 0000000..0d5eca7 --- /dev/null +++ b/_layouts/collada.html @@ -0,0 +1,24 @@ + + + {% include three-imports.html %} + {% include head.html %} + + + + +
+
+
+

+ Organisez votre système énergétique +

+
+
+ {{ content }} +
+
+
+ + + + diff --git a/collada/pompes.dae b/collada/pompe.dae similarity index 100% rename from collada/pompes.dae rename to collada/pompe.dae diff --git a/collada/V3V.dae b/collada/v3v.dae similarity index 100% rename from collada/V3V.dae rename to collada/v3v.dae diff --git a/gallery.md b/gallery.md new file mode 100644 index 0000000..b06636e --- /dev/null +++ b/gallery.md @@ -0,0 +1,21 @@ +--- +layout: collada +permalink: gallery.html +--- + + + + + + diff --git a/lib/controls/OrbitControls.js b/lib/controls/OrbitControls.js deleted file mode 100644 index 151359d..0000000 --- a/lib/controls/OrbitControls.js +++ /dev/null @@ -1,1227 +0,0 @@ -import { - EventDispatcher, - MOUSE, - Quaternion, - Spherical, - TOUCH, - Vector2, - Vector3 -} from '../three.module.js'; - -// This set of controls performs orbiting, dollying (zooming), and panning. -// Unlike TrackballControls, it maintains the "up" direction object.up (+Y by default). -// -// Orbit - left mouse / touch: one-finger move -// Zoom - middle mouse, or mousewheel / touch: two-finger spread or squish -// Pan - right mouse, or left mouse + ctrl/meta/shiftKey, or arrow keys / touch: two-finger move - -var OrbitControls = function ( object, domElement ) { - - if ( domElement === undefined ) console.warn( 'THREE.OrbitControls: The second parameter "domElement" is now mandatory.' ); - if ( domElement === document ) console.error( 'THREE.OrbitControls: "document" should not be used as the target "domElement". Please use "renderer.domElement" instead.' ); - - this.object = object; - this.domElement = domElement; - - // Set to false to disable this control - this.enabled = true; - - // "target" sets the location of focus, where the object orbits around - this.target = new Vector3(); - - // How far you can dolly in and out ( PerspectiveCamera only ) - this.minDistance = 0; - this.maxDistance = Infinity; - - // How far you can zoom in and out ( OrthographicCamera only ) - this.minZoom = 0; - this.maxZoom = Infinity; - - // How far you can orbit vertically, upper and lower limits. - // Range is 0 to Math.PI radians. - this.minPolarAngle = 0; // radians - this.maxPolarAngle = Math.PI; // radians - - // How far you can orbit horizontally, upper and lower limits. - // If set, the interval [ min, max ] must be a sub-interval of [ - 2 PI, 2 PI ], with ( max - min < 2 PI ) - this.minAzimuthAngle = - Infinity; // radians - this.maxAzimuthAngle = Infinity; // radians - - // Set to true to enable damping (inertia) - // If damping is enabled, you must call controls.update() in your animation loop - this.enableDamping = false; - this.dampingFactor = 0.05; - - // This option actually enables dollying in and out; left as "zoom" for backwards compatibility. - // Set to false to disable zooming - this.enableZoom = true; - this.zoomSpeed = 1.0; - - // Set to false to disable rotating - this.enableRotate = true; - this.rotateSpeed = 1.0; - - // Set to false to disable panning - this.enablePan = true; - this.panSpeed = 1.0; - this.screenSpacePanning = true; // if false, pan orthogonal to world-space direction camera.up - this.keyPanSpeed = 7.0; // pixels moved per arrow key push - - // Set to true to automatically rotate around the target - // If auto-rotate is enabled, you must call controls.update() in your animation loop - this.autoRotate = false; - this.autoRotateSpeed = 2.0; // 30 seconds per orbit when fps is 60 - - // The four arrow keys - this.keys = { LEFT: 37, UP: 38, RIGHT: 39, BOTTOM: 40 }; - - // Mouse buttons - this.mouseButtons = { LEFT: MOUSE.ROTATE, MIDDLE: MOUSE.DOLLY, RIGHT: MOUSE.PAN }; - - // Touch fingers - this.touches = { ONE: TOUCH.ROTATE, TWO: TOUCH.DOLLY_PAN }; - - // for reset - this.target0 = this.target.clone(); - this.position0 = this.object.position.clone(); - this.zoom0 = this.object.zoom; - - // the target DOM element for key events - this._domElementKeyEvents = null; - - // - // public methods - // - - this.getPolarAngle = function () { - - return spherical.phi; - - }; - - this.getAzimuthalAngle = function () { - - return spherical.theta; - - }; - - this.listenToKeyEvents = function ( domElement ) { - - domElement.addEventListener( 'keydown', onKeyDown ); - this._domElementKeyEvents = domElement; - - }; - - this.saveState = function () { - - scope.target0.copy( scope.target ); - scope.position0.copy( scope.object.position ); - scope.zoom0 = scope.object.zoom; - - }; - - this.reset = function () { - - scope.target.copy( scope.target0 ); - scope.object.position.copy( scope.position0 ); - scope.object.zoom = scope.zoom0; - - scope.object.updateProjectionMatrix(); - scope.dispatchEvent( changeEvent ); - - scope.update(); - - state = STATE.NONE; - - }; - - // this method is exposed, but perhaps it would be better if we can make it private... - this.update = function () { - - var offset = new Vector3(); - - // so camera.up is the orbit axis - var quat = new Quaternion().setFromUnitVectors( object.up, new Vector3( 0, 1, 0 ) ); - var quatInverse = quat.clone().invert(); - - var lastPosition = new Vector3(); - var lastQuaternion = new Quaternion(); - - var twoPI = 2 * Math.PI; - - return function update() { - - var position = scope.object.position; - - offset.copy( position ).sub( scope.target ); - - // rotate offset to "y-axis-is-up" space - offset.applyQuaternion( quat ); - - // angle from z-axis around y-axis - spherical.setFromVector3( offset ); - - if ( scope.autoRotate && state === STATE.NONE ) { - - rotateLeft( getAutoRotationAngle() ); - - } - - if ( scope.enableDamping ) { - - spherical.theta += sphericalDelta.theta * scope.dampingFactor; - spherical.phi += sphericalDelta.phi * scope.dampingFactor; - - } else { - - spherical.theta += sphericalDelta.theta; - spherical.phi += sphericalDelta.phi; - - } - - // restrict theta to be between desired limits - - var min = scope.minAzimuthAngle; - var max = scope.maxAzimuthAngle; - - if ( isFinite( min ) && isFinite( max ) ) { - - if ( min < - Math.PI ) min += twoPI; else if ( min > Math.PI ) min -= twoPI; - - if ( max < - Math.PI ) max += twoPI; else if ( max > Math.PI ) max -= twoPI; - - if ( min <= max ) { - - spherical.theta = Math.max( min, Math.min( max, spherical.theta ) ); - - } else { - - spherical.theta = ( spherical.theta > ( min + max ) / 2 ) ? - Math.max( min, spherical.theta ) : - Math.min( max, spherical.theta ); - - } - - } - - // restrict phi to be between desired limits - spherical.phi = Math.max( scope.minPolarAngle, Math.min( scope.maxPolarAngle, spherical.phi ) ); - - spherical.makeSafe(); - - - spherical.radius *= scale; - - // restrict radius to be between desired limits - spherical.radius = Math.max( scope.minDistance, Math.min( scope.maxDistance, spherical.radius ) ); - - // move target to panned location - - if ( scope.enableDamping === true ) { - - scope.target.addScaledVector( panOffset, scope.dampingFactor ); - - } else { - - scope.target.add( panOffset ); - - } - - offset.setFromSpherical( spherical ); - - // rotate offset back to "camera-up-vector-is-up" space - offset.applyQuaternion( quatInverse ); - - position.copy( scope.target ).add( offset ); - - scope.object.lookAt( scope.target ); - - if ( scope.enableDamping === true ) { - - sphericalDelta.theta *= ( 1 - scope.dampingFactor ); - sphericalDelta.phi *= ( 1 - scope.dampingFactor ); - - panOffset.multiplyScalar( 1 - scope.dampingFactor ); - - } else { - - sphericalDelta.set( 0, 0, 0 ); - - panOffset.set( 0, 0, 0 ); - - } - - scale = 1; - - // update condition is: - // min(camera displacement, camera rotation in radians)^2 > EPS - // using small-angle approximation cos(x/2) = 1 - x^2 / 8 - - if ( zoomChanged || - lastPosition.distanceToSquared( scope.object.position ) > EPS || - 8 * ( 1 - lastQuaternion.dot( scope.object.quaternion ) ) > EPS ) { - - scope.dispatchEvent( changeEvent ); - - lastPosition.copy( scope.object.position ); - lastQuaternion.copy( scope.object.quaternion ); - zoomChanged = false; - - return true; - - } - - return false; - - }; - - }(); - - this.dispose = function () { - - scope.domElement.removeEventListener( 'contextmenu', onContextMenu ); - - scope.domElement.removeEventListener( 'pointerdown', onPointerDown ); - scope.domElement.removeEventListener( 'wheel', onMouseWheel ); - - scope.domElement.removeEventListener( 'touchstart', onTouchStart ); - scope.domElement.removeEventListener( 'touchend', onTouchEnd ); - scope.domElement.removeEventListener( 'touchmove', onTouchMove ); - - scope.domElement.ownerDocument.removeEventListener( 'pointermove', onPointerMove ); - scope.domElement.ownerDocument.removeEventListener( 'pointerup', onPointerUp ); - - - if ( scope._domElementKeyEvents !== null ) { - - scope._domElementKeyEvents.removeEventListener( 'keydown', onKeyDown ); - - } - - //scope.dispatchEvent( { type: 'dispose' } ); // should this be added here? - - }; - - // - // internals - // - - var scope = this; - - var changeEvent = { type: 'change' }; - var startEvent = { type: 'start' }; - var endEvent = { type: 'end' }; - - var STATE = { - NONE: - 1, - ROTATE: 0, - DOLLY: 1, - PAN: 2, - TOUCH_ROTATE: 3, - TOUCH_PAN: 4, - TOUCH_DOLLY_PAN: 5, - TOUCH_DOLLY_ROTATE: 6 - }; - - var state = STATE.NONE; - - var EPS = 0.000001; - - // current position in spherical coordinates - var spherical = new Spherical(); - var sphericalDelta = new Spherical(); - - var scale = 1; - var panOffset = new Vector3(); - var zoomChanged = false; - - var rotateStart = new Vector2(); - var rotateEnd = new Vector2(); - var rotateDelta = new Vector2(); - - var panStart = new Vector2(); - var panEnd = new Vector2(); - var panDelta = new Vector2(); - - var dollyStart = new Vector2(); - var dollyEnd = new Vector2(); - var dollyDelta = new Vector2(); - - function getAutoRotationAngle() { - - return 2 * Math.PI / 60 / 60 * scope.autoRotateSpeed; - - } - - function getZoomScale() { - - return Math.pow( 0.95, scope.zoomSpeed ); - - } - - function rotateLeft( angle ) { - - sphericalDelta.theta -= angle; - - } - - function rotateUp( angle ) { - - sphericalDelta.phi -= angle; - - } - - var panLeft = function () { - - var v = new Vector3(); - - return function panLeft( distance, objectMatrix ) { - - v.setFromMatrixColumn( objectMatrix, 0 ); // get X column of objectMatrix - v.multiplyScalar( - distance ); - - panOffset.add( v ); - - }; - - }(); - - var panUp = function () { - - var v = new Vector3(); - - return function panUp( distance, objectMatrix ) { - - if ( scope.screenSpacePanning === true ) { - - v.setFromMatrixColumn( objectMatrix, 1 ); - - } else { - - v.setFromMatrixColumn( objectMatrix, 0 ); - v.crossVectors( scope.object.up, v ); - - } - - v.multiplyScalar( distance ); - - panOffset.add( v ); - - }; - - }(); - - // deltaX and deltaY are in pixels; right and down are positive - var pan = function () { - - var offset = new Vector3(); - - return function pan( deltaX, deltaY ) { - - var element = scope.domElement; - - if ( scope.object.isPerspectiveCamera ) { - - // perspective - var position = scope.object.position; - offset.copy( position ).sub( scope.target ); - var targetDistance = offset.length(); - - // half of the fov is center to top of screen - targetDistance *= Math.tan( ( scope.object.fov / 2 ) * Math.PI / 180.0 ); - - // we use only clientHeight here so aspect ratio does not distort speed - panLeft( 2 * deltaX * targetDistance / element.clientHeight, scope.object.matrix ); - panUp( 2 * deltaY * targetDistance / element.clientHeight, scope.object.matrix ); - - } else if ( scope.object.isOrthographicCamera ) { - - // orthographic - panLeft( deltaX * ( scope.object.right - scope.object.left ) / scope.object.zoom / element.clientWidth, scope.object.matrix ); - panUp( deltaY * ( scope.object.top - scope.object.bottom ) / scope.object.zoom / element.clientHeight, scope.object.matrix ); - - } else { - - // camera neither orthographic nor perspective - console.warn( 'WARNING: OrbitControls.js encountered an unknown camera type - pan disabled.' ); - scope.enablePan = false; - - } - - }; - - }(); - - function dollyOut( dollyScale ) { - - if ( scope.object.isPerspectiveCamera ) { - - scale /= dollyScale; - - } else if ( scope.object.isOrthographicCamera ) { - - scope.object.zoom = Math.max( scope.minZoom, Math.min( scope.maxZoom, scope.object.zoom * dollyScale ) ); - scope.object.updateProjectionMatrix(); - zoomChanged = true; - - } else { - - console.warn( 'WARNING: OrbitControls.js encountered an unknown camera type - dolly/zoom disabled.' ); - scope.enableZoom = false; - - } - - } - - function dollyIn( dollyScale ) { - - if ( scope.object.isPerspectiveCamera ) { - - scale *= dollyScale; - - } else if ( scope.object.isOrthographicCamera ) { - - scope.object.zoom = Math.max( scope.minZoom, Math.min( scope.maxZoom, scope.object.zoom / dollyScale ) ); - scope.object.updateProjectionMatrix(); - zoomChanged = true; - - } else { - - console.warn( 'WARNING: OrbitControls.js encountered an unknown camera type - dolly/zoom disabled.' ); - scope.enableZoom = false; - - } - - } - - // - // event callbacks - update the object state - // - - function handleMouseDownRotate( event ) { - - rotateStart.set( event.clientX, event.clientY ); - - } - - function handleMouseDownDolly( event ) { - - dollyStart.set( event.clientX, event.clientY ); - - } - - function handleMouseDownPan( event ) { - - panStart.set( event.clientX, event.clientY ); - - } - - function handleMouseMoveRotate( event ) { - - rotateEnd.set( event.clientX, event.clientY ); - - rotateDelta.subVectors( rotateEnd, rotateStart ).multiplyScalar( scope.rotateSpeed ); - - var element = scope.domElement; - - rotateLeft( 2 * Math.PI * rotateDelta.x / element.clientHeight ); // yes, height - - rotateUp( 2 * Math.PI * rotateDelta.y / element.clientHeight ); - - rotateStart.copy( rotateEnd ); - - scope.update(); - - } - - function handleMouseMoveDolly( event ) { - - dollyEnd.set( event.clientX, event.clientY ); - - dollyDelta.subVectors( dollyEnd, dollyStart ); - - if ( dollyDelta.y > 0 ) { - - dollyOut( getZoomScale() ); - - } else if ( dollyDelta.y < 0 ) { - - dollyIn( getZoomScale() ); - - } - - dollyStart.copy( dollyEnd ); - - scope.update(); - - } - - function handleMouseMovePan( event ) { - - panEnd.set( event.clientX, event.clientY ); - - panDelta.subVectors( panEnd, panStart ).multiplyScalar( scope.panSpeed ); - - pan( panDelta.x, panDelta.y ); - - panStart.copy( panEnd ); - - scope.update(); - - } - - function handleMouseUp( /*event*/ ) { - - // no-op - - } - - function handleMouseWheel( event ) { - - if ( event.deltaY < 0 ) { - - dollyIn( getZoomScale() ); - - } else if ( event.deltaY > 0 ) { - - dollyOut( getZoomScale() ); - - } - - scope.update(); - - } - - function handleKeyDown( event ) { - - var needsUpdate = false; - - switch ( event.keyCode ) { - - case scope.keys.UP: - pan( 0, scope.keyPanSpeed ); - needsUpdate = true; - break; - - case scope.keys.BOTTOM: - pan( 0, - scope.keyPanSpeed ); - needsUpdate = true; - break; - - case scope.keys.LEFT: - pan( scope.keyPanSpeed, 0 ); - needsUpdate = true; - break; - - case scope.keys.RIGHT: - pan( - scope.keyPanSpeed, 0 ); - needsUpdate = true; - break; - - } - - if ( needsUpdate ) { - - // prevent the browser from scrolling on cursor keys - event.preventDefault(); - - scope.update(); - - } - - - } - - function handleTouchStartRotate( event ) { - - if ( event.touches.length == 1 ) { - - rotateStart.set( event.touches[ 0 ].pageX, event.touches[ 0 ].pageY ); - - } else { - - var x = 0.5 * ( event.touches[ 0 ].pageX + event.touches[ 1 ].pageX ); - var y = 0.5 * ( event.touches[ 0 ].pageY + event.touches[ 1 ].pageY ); - - rotateStart.set( x, y ); - - } - - } - - function handleTouchStartPan( event ) { - - if ( event.touches.length == 1 ) { - - panStart.set( event.touches[ 0 ].pageX, event.touches[ 0 ].pageY ); - - } else { - - var x = 0.5 * ( event.touches[ 0 ].pageX + event.touches[ 1 ].pageX ); - var y = 0.5 * ( event.touches[ 0 ].pageY + event.touches[ 1 ].pageY ); - - panStart.set( x, y ); - - } - - } - - function handleTouchStartDolly( event ) { - - var dx = event.touches[ 0 ].pageX - event.touches[ 1 ].pageX; - var dy = event.touches[ 0 ].pageY - event.touches[ 1 ].pageY; - - var distance = Math.sqrt( dx * dx + dy * dy ); - - dollyStart.set( 0, distance ); - - } - - function handleTouchStartDollyPan( event ) { - - if ( scope.enableZoom ) handleTouchStartDolly( event ); - - if ( scope.enablePan ) handleTouchStartPan( event ); - - } - - function handleTouchStartDollyRotate( event ) { - - if ( scope.enableZoom ) handleTouchStartDolly( event ); - - if ( scope.enableRotate ) handleTouchStartRotate( event ); - - } - - function handleTouchMoveRotate( event ) { - - if ( event.touches.length == 1 ) { - - rotateEnd.set( event.touches[ 0 ].pageX, event.touches[ 0 ].pageY ); - - } else { - - var x = 0.5 * ( event.touches[ 0 ].pageX + event.touches[ 1 ].pageX ); - var y = 0.5 * ( event.touches[ 0 ].pageY + event.touches[ 1 ].pageY ); - - rotateEnd.set( x, y ); - - } - - rotateDelta.subVectors( rotateEnd, rotateStart ).multiplyScalar( scope.rotateSpeed ); - - var element = scope.domElement; - - rotateLeft( 2 * Math.PI * rotateDelta.x / element.clientHeight ); // yes, height - - rotateUp( 2 * Math.PI * rotateDelta.y / element.clientHeight ); - - rotateStart.copy( rotateEnd ); - - } - - function handleTouchMovePan( event ) { - - if ( event.touches.length == 1 ) { - - panEnd.set( event.touches[ 0 ].pageX, event.touches[ 0 ].pageY ); - - } else { - - var x = 0.5 * ( event.touches[ 0 ].pageX + event.touches[ 1 ].pageX ); - var y = 0.5 * ( event.touches[ 0 ].pageY + event.touches[ 1 ].pageY ); - - panEnd.set( x, y ); - - } - - panDelta.subVectors( panEnd, panStart ).multiplyScalar( scope.panSpeed ); - - pan( panDelta.x, panDelta.y ); - - panStart.copy( panEnd ); - - } - - function handleTouchMoveDolly( event ) { - - var dx = event.touches[ 0 ].pageX - event.touches[ 1 ].pageX; - var dy = event.touches[ 0 ].pageY - event.touches[ 1 ].pageY; - - var distance = Math.sqrt( dx * dx + dy * dy ); - - dollyEnd.set( 0, distance ); - - dollyDelta.set( 0, Math.pow( dollyEnd.y / dollyStart.y, scope.zoomSpeed ) ); - - dollyOut( dollyDelta.y ); - - dollyStart.copy( dollyEnd ); - - } - - function handleTouchMoveDollyPan( event ) { - - if ( scope.enableZoom ) handleTouchMoveDolly( event ); - - if ( scope.enablePan ) handleTouchMovePan( event ); - - } - - function handleTouchMoveDollyRotate( event ) { - - if ( scope.enableZoom ) handleTouchMoveDolly( event ); - - if ( scope.enableRotate ) handleTouchMoveRotate( event ); - - } - - function handleTouchEnd( /*event*/ ) { - - // no-op - - } - - // - // event handlers - FSM: listen for events and reset state - // - - function onPointerDown( event ) { - - if ( scope.enabled === false ) return; - - switch ( event.pointerType ) { - - case 'mouse': - case 'pen': - onMouseDown( event ); - break; - - // TODO touch - - } - - } - - function onPointerMove( event ) { - - if ( scope.enabled === false ) return; - - switch ( event.pointerType ) { - - case 'mouse': - case 'pen': - onMouseMove( event ); - break; - - // TODO touch - - } - - } - - function onPointerUp( event ) { - - switch ( event.pointerType ) { - - case 'mouse': - case 'pen': - onMouseUp( event ); - break; - - // TODO touch - - } - - } - - function onMouseDown( event ) { - - // Prevent the browser from scrolling. - event.preventDefault(); - - // Manually set the focus since calling preventDefault above - // prevents the browser from setting it automatically. - - scope.domElement.focus ? scope.domElement.focus() : window.focus(); - - var mouseAction; - - switch ( event.button ) { - - case 0: - - mouseAction = scope.mouseButtons.LEFT; - break; - - case 1: - - mouseAction = scope.mouseButtons.MIDDLE; - break; - - case 2: - - mouseAction = scope.mouseButtons.RIGHT; - break; - - default: - - mouseAction = - 1; - - } - - switch ( mouseAction ) { - - case MOUSE.DOLLY: - - if ( scope.enableZoom === false ) return; - - handleMouseDownDolly( event ); - - state = STATE.DOLLY; - - break; - - case MOUSE.ROTATE: - - if ( event.ctrlKey || event.metaKey || event.shiftKey ) { - - if ( scope.enablePan === false ) return; - - handleMouseDownPan( event ); - - state = STATE.PAN; - - } else { - - if ( scope.enableRotate === false ) return; - - handleMouseDownRotate( event ); - - state = STATE.ROTATE; - - } - - break; - - case MOUSE.PAN: - - if ( event.ctrlKey || event.metaKey || event.shiftKey ) { - - if ( scope.enableRotate === false ) return; - - handleMouseDownRotate( event ); - - state = STATE.ROTATE; - - } else { - - if ( scope.enablePan === false ) return; - - handleMouseDownPan( event ); - - state = STATE.PAN; - - } - - break; - - default: - - state = STATE.NONE; - - } - - if ( state !== STATE.NONE ) { - - scope.domElement.ownerDocument.addEventListener( 'pointermove', onPointerMove ); - scope.domElement.ownerDocument.addEventListener( 'pointerup', onPointerUp ); - - scope.dispatchEvent( startEvent ); - - } - - } - - function onMouseMove( event ) { - - if ( scope.enabled === false ) return; - - event.preventDefault(); - - switch ( state ) { - - case STATE.ROTATE: - - if ( scope.enableRotate === false ) return; - - handleMouseMoveRotate( event ); - - break; - - case STATE.DOLLY: - - if ( scope.enableZoom === false ) return; - - handleMouseMoveDolly( event ); - - break; - - case STATE.PAN: - - if ( scope.enablePan === false ) return; - - handleMouseMovePan( event ); - - break; - - } - - } - - function onMouseUp( event ) { - - scope.domElement.ownerDocument.removeEventListener( 'pointermove', onPointerMove ); - scope.domElement.ownerDocument.removeEventListener( 'pointerup', onPointerUp ); - - if ( scope.enabled === false ) return; - - handleMouseUp( event ); - - scope.dispatchEvent( endEvent ); - - state = STATE.NONE; - - } - - function onMouseWheel( event ) { - - if ( scope.enabled === false || scope.enableZoom === false || ( state !== STATE.NONE && state !== STATE.ROTATE ) ) return; - - event.preventDefault(); - - scope.dispatchEvent( startEvent ); - - handleMouseWheel( event ); - - scope.dispatchEvent( endEvent ); - - } - - function onKeyDown( event ) { - - if ( scope.enabled === false || scope.enablePan === false ) return; - - handleKeyDown( event ); - - } - - function onTouchStart( event ) { - - if ( scope.enabled === false ) return; - - event.preventDefault(); // prevent scrolling - - switch ( event.touches.length ) { - - case 1: - - switch ( scope.touches.ONE ) { - - case TOUCH.ROTATE: - - if ( scope.enableRotate === false ) return; - - handleTouchStartRotate( event ); - - state = STATE.TOUCH_ROTATE; - - break; - - case TOUCH.PAN: - - if ( scope.enablePan === false ) return; - - handleTouchStartPan( event ); - - state = STATE.TOUCH_PAN; - - break; - - default: - - state = STATE.NONE; - - } - - break; - - case 2: - - switch ( scope.touches.TWO ) { - - case TOUCH.DOLLY_PAN: - - if ( scope.enableZoom === false && scope.enablePan === false ) return; - - handleTouchStartDollyPan( event ); - - state = STATE.TOUCH_DOLLY_PAN; - - break; - - case TOUCH.DOLLY_ROTATE: - - if ( scope.enableZoom === false && scope.enableRotate === false ) return; - - handleTouchStartDollyRotate( event ); - - state = STATE.TOUCH_DOLLY_ROTATE; - - break; - - default: - - state = STATE.NONE; - - } - - break; - - default: - - state = STATE.NONE; - - } - - if ( state !== STATE.NONE ) { - - scope.dispatchEvent( startEvent ); - - } - - } - - function onTouchMove( event ) { - - if ( scope.enabled === false ) return; - - event.preventDefault(); // prevent scrolling - - switch ( state ) { - - case STATE.TOUCH_ROTATE: - - if ( scope.enableRotate === false ) return; - - handleTouchMoveRotate( event ); - - scope.update(); - - break; - - case STATE.TOUCH_PAN: - - if ( scope.enablePan === false ) return; - - handleTouchMovePan( event ); - - scope.update(); - - break; - - case STATE.TOUCH_DOLLY_PAN: - - if ( scope.enableZoom === false && scope.enablePan === false ) return; - - handleTouchMoveDollyPan( event ); - - scope.update(); - - break; - - case STATE.TOUCH_DOLLY_ROTATE: - - if ( scope.enableZoom === false && scope.enableRotate === false ) return; - - handleTouchMoveDollyRotate( event ); - - scope.update(); - - break; - - default: - - state = STATE.NONE; - - } - - } - - function onTouchEnd( event ) { - - if ( scope.enabled === false ) return; - - handleTouchEnd( event ); - - scope.dispatchEvent( endEvent ); - - state = STATE.NONE; - - } - - function onContextMenu( event ) { - - if ( scope.enabled === false ) return; - - event.preventDefault(); - - } - - // - - scope.domElement.addEventListener( 'contextmenu', onContextMenu ); - - scope.domElement.addEventListener( 'pointerdown', onPointerDown ); - scope.domElement.addEventListener( 'wheel', onMouseWheel ); - - scope.domElement.addEventListener( 'touchstart', onTouchStart ); - scope.domElement.addEventListener( 'touchend', onTouchEnd ); - scope.domElement.addEventListener( 'touchmove', onTouchMove ); - - // force an update at start - - this.update(); - -}; - -OrbitControls.prototype = Object.create( EventDispatcher.prototype ); -OrbitControls.prototype.constructor = OrbitControls; - - -// This set of controls performs orbiting, dollying (zooming), and panning. -// Unlike TrackballControls, it maintains the "up" direction object.up (+Y by default). -// This is very similar to OrbitControls, another set of touch behavior -// -// Orbit - right mouse, or left mouse + ctrl/meta/shiftKey / touch: two-finger rotate -// Zoom - middle mouse, or mousewheel / touch: two-finger spread or squish -// Pan - left mouse, or arrow keys / touch: one-finger move - -var MapControls = function ( object, domElement ) { - - OrbitControls.call( this, object, domElement ); - - this.screenSpacePanning = false; // pan orthogonal to world-space direction camera.up - - this.mouseButtons.LEFT = MOUSE.PAN; - this.mouseButtons.RIGHT = MOUSE.ROTATE; - - this.touches.ONE = TOUCH.PAN; - this.touches.TWO = TOUCH.DOLLY_ROTATE; - -}; - -MapControls.prototype = Object.create( EventDispatcher.prototype ); -MapControls.prototype.constructor = MapControls; - -export { OrbitControls, MapControls }; diff --git a/lib/modules/components/obm-collada-viewer.js b/lib/modules/components/obm-collada-viewer.js new file mode 100644 index 0000000..5a3a223 --- /dev/null +++ b/lib/modules/components/obm-collada-viewer.js @@ -0,0 +1,439 @@ +/** + * Collada viewer component + */ + +import * as THREE from 'three'; +import { OrbitControls } from 'three/addons/controls/OrbitControls.js'; +import { ColladaLoader } from 'three/addons/loaders/ColladaLoader.js'; + +const COLLADA_FOLDER = '/collada'; + +class ColladaViewer extends HTMLElement { + + static get observedAttributes() { + return ['file', 'zoom']; + } + + constructor() { + super(); + this.attachShadow({ mode: 'open' }); + this.scene = null; + this.camera = null; + this.renderer = null; + this.controls = null; + this.container = null; + // Map of source elements to their loading states + this.objects = new Map(); + this.resizeObserver = null; + this.mutationObserver = null; + this.animationFrame = null; + } + + connectedCallback() { + // Avoid initializing twice + if (this.renderer) return; + this.shadowRoot.innerHTML = ` + +
+ `; + + this.container = this.shadowRoot.querySelector('#viewer'); + this.init(); + this.resizeObserver = new ResizeObserver(() => { + this.resize(); + }); + this.resizeObserver.observe(this.container); + + // Watch for changes to child objects and their attributes + this.mutationObserver = new MutationObserver(() => { + this.syncObjects(); + }); + this.mutationObserver.observe(this, { + childList: true, + subtree: true, + attributes: true, + attributeFilter: [ + 'file', + 'position', + 'rotation', + 'scale' + ] + }); + + this.syncObjects(); + this.animate(); + } + + disconnectedCallback() { + this.resizeObserver?.disconnect(); + this.mutationObserver?.disconnect(); + + if (this.animationFrame !== null) { + cancelAnimationFrame(this.animationFrame); + this.animationFrame = null; + } + + for (const state of this.objects.values()) { + this.disposeState(state); + } + this.objects.clear(); + + this.controls?.dispose(); + this.renderer?.dispose(); + this.renderer?.domElement.remove(); + + this.resizeObserver = null; + this.mutationObserver = null; + this.renderer = null; + this.controls = null; + this.scene = null; + this.camera = null; + this.container = null; + } + + attributeChangedCallback(name, oldValue, newValue) { + if (oldValue === newValue) return; + if (!this.isConnected) return; + + if (name === 'file') { + this.syncObjects(); + } + + if (name === 'zoom' && this.camera) { + this.applyZoom(); + } + } + + init() { + this.scene = new THREE.Scene(); + this.scene.background = new THREE.Color(0xffffff); + this.camera = new THREE.PerspectiveCamera( + 15, 1, 0.1, 50 + ); + this.camera.position.set(10, 10, 20); + this.camera.lookAt(0, 0, 0); + this.scene.add( + new THREE.AmbientLight(0xffffff, 0.4) + ); + const directionalLight = new THREE.DirectionalLight( + 0xffffff, 0.8 + ); + directionalLight.position.set(1, 1, 0).normalize(); + this.scene.add(directionalLight); + this.renderer = new THREE.WebGLRenderer({ + antialias: true + }); + this.renderer.setPixelRatio(window.devicePixelRatio); + this.renderer.localClippingEnabled = true; + this.container.appendChild(this.renderer.domElement); + this.controls = new OrbitControls( + this.camera, + this.renderer.domElement + ); + this.controls.enablePan = false; + this.resize(); + } + + /** + * Synchronize the Three.js scene with the HTML declaration. + * + * If collada-object children exist, they take precedence + * over the legacy file attribute. + */ + syncObjects() { + if (!this.scene) return; + + const children = Array.from(this.children).filter( + child => child.tagName.toLowerCase() === 'collada-object' + ); + + const sources = children.length + ? children + : (this.hasAttribute('file') ? [this] : []); + + const desired = new Map(); + + for (const source of sources) { + const file = source.getAttribute('file'); + if (!file) continue; + + const position = this.parseVector( + source.getAttribute('position'), + [0, 0, 0] + ); + + const rotation = this.parseVector( + source.getAttribute('rotation'), + [0, 0, 0] + ); + + const scale = this.parseVector( + source.getAttribute('scale'), + [1, 1, 1], + true + ); + + const signature = JSON.stringify({ + file, + position, + rotation, + scale + }); + + desired.set(source, { + file, + position, + rotation, + scale, + signature + }); + } + + let sceneChanged = false; + + // Remove objects that are no longer declared + for (const [source, state] of this.objects) { + const spec = desired.get(source); + + if (!spec || spec.signature !== state.signature) { + this.disposeState(state); + this.objects.delete(source); + sceneChanged = true; + } + } + + // Load new objects or changed declarations + for (const [source, spec] of desired) { + if (this.objects.has(source)) continue; + + const state = { + signature: spec.signature, + token: {}, + group: null + }; + + this.objects.set(source, state); + this.loadObject(source, spec, state); + } + + if (sceneChanged) { + this.fitToObjects(); + this.render(); + } + } + + /** + * Parse a vector from "x y z". + * Scale also accepts a single value, e.g. "0.8". + */ + parseVector(value, fallback, allowScalar = false) { + if (!value) return [...fallback]; + + const values = value.trim().split(/[\s,]+/).map(Number); + + if ( + allowScalar && + values.length === 1 && + Number.isFinite(values[0]) + ) { + return [values[0], values[0], values[0]]; + } + + if ( + values.length !== 3 || + !values.every(Number.isFinite) + ) { + console.warn('Invalid Collada vector:', value); + return [...fallback]; + } + + return values; + } + + loadObject(source, spec, state) { + const loader = new ColladaLoader(); + + loader.load( + `${COLLADA_FOLDER}/${spec.file}.dae`, + (collada) => { + // Ignore results from removed or modified objects + if ( + !this.isConnected || + this.objects.get(source) !== state + ) { + this.disposeModel(collada.scene); + return; + } + + const group = new THREE.Group(); + + group.add(collada.scene); + group.position.set(...spec.position); + + group.rotation.set( + THREE.MathUtils.degToRad(spec.rotation[0]), + THREE.MathUtils.degToRad(spec.rotation[1]), + THREE.MathUtils.degToRad(spec.rotation[2]) + ); + + group.scale.set(...spec.scale); + + state.group = group; + this.scene.add(group); + + this.fitToObjects(); + this.applyZoom() + this.render(); + }, + undefined, + (error) => { + if ( + this.isConnected && + this.objects.get(source) === state + ) { + console.error( + `Erreur de chargement Collada : ${spec.file}`, + error + ); + } + } + ); + } + + disposeState(state) { + // Invalidate any pending asynchronous load + state.token = {}; + + if (state.group) { + this.scene?.remove(state.group); + this.disposeModel(state.group); + state.group = null; + } + } + + applyZoom() { + // global scene zoom + const isMobile = window.matchMedia('(max-width: 700px)').matches; + + const value = isMobile + ? this.getAttribute('zoom-mobile') || '100%' + : this.getAttribute('zoom') || '100%'; + + const match = value.match(/^(\d+(?:\.\d+)?)%$/); + if (!match) return; + + this.camera.zoom = Number(match[1]) / 100; + this.camera.updateProjectionMatrix(); + this.controls.update(); + } + + /** + * Automatically frame all loaded objects. + */ + fitToObjects() { + if (!this.scene || !this.camera) return; + + const box = new THREE.Box3().setFromObject(this.scene); + + if (box.isEmpty()) return; + + const center = box.getCenter(new THREE.Vector3()); + const sphere = box.getBoundingSphere(new THREE.Sphere()); + + const radius = Math.max(sphere.radius, 0.01); + const direction = new THREE.Vector3(1, 1, 2).normalize(); + + const distance = radius * 1.2 / + Math.sin(THREE.MathUtils.degToRad(this.camera.fov / 2)); + + this.camera.position.copy( + center.clone().add(direction.multiplyScalar(distance)) + ); + + this.camera.near = Math.max(distance / 1000, 0.01); + this.camera.far = distance * 100 + radius; + this.camera.lookAt(center); + this.camera.updateProjectionMatrix(); + + this.controls.target.copy(center); + this.controls.update(); + } + + resize() { + if (!this.renderer) return; + const width = this.container.clientWidth; + const height = this.container.clientHeight; + if (!width || !height) return; + this.camera.aspect = width / height; + this.camera.updateProjectionMatrix(); + this.renderer.setSize(width, height); + this.render(); + } + + animate() { + this.animationFrame = requestAnimationFrame( + () => this.animate() + ); + this.render(); + } + + render() { + if (this.renderer && this.scene && this.camera) { + this.renderer.render(this.scene, this.camera); + } + } + + disposeModel(model) { + const geometries = new Set(); + const materials = new Set(); + const textures = new Set(); + + model.traverse((child) => { + if (!child.isMesh) return; + + if (child.geometry) { + geometries.add(child.geometry); + } + + const list = Array.isArray(child.material) + ? child.material + : [child.material]; + + list.forEach(material => { + if (!material) return; + + materials.add(material); + + // Dispose textures referenced by material properties + Object.values(material).forEach(value => { + if (value?.isTexture) { + textures.add(value); + } + }); + }); + }); + + geometries.forEach(item => item.dispose()); + materials.forEach(item => item.dispose()); + textures.forEach(item => item.dispose()); + } +} + +if (!customElements.get('collada-viewer')) { + customElements.define('collada-viewer', ColladaViewer); +} + +export default ColladaViewer; diff --git a/lib/modules/components/obm-navigation.js b/lib/modules/components/obm-navigation.js index 0361797..c6c8852 100644 --- a/lib/modules/components/obm-navigation.js +++ b/lib/modules/components/obm-navigation.js @@ -55,7 +55,7 @@ class ObmSiteNav extends HTMLElement {
Open Building Management