From fb46270ec555c58dda5b1c21ce56442ba5e4158f Mon Sep 17 00:00:00 2001 From: Rune Harlyk Date: Fri, 23 Feb 2024 12:07:38 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=8F=AA=20Adds=20more=20types=20to=20scene?= =?UTF-8?q?builder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/lib/sceneBuilder.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/lib/sceneBuilder.ts b/app/src/lib/sceneBuilder.ts index a1ffce8..1ef64d1 100644 --- a/app/src/lib/sceneBuilder.ts +++ b/app/src/lib/sceneBuilder.ts @@ -24,7 +24,7 @@ import { } from 'three'; import { Sky } from 'three/addons/objects/Sky.js'; import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls'; -import { type URDFMimicJoint } from 'urdf-loader'; +import { type URDFJoint, type URDFMimicJoint, type URDFRobot } from 'urdf-loader'; import { PointerURDFDragControls } from 'urdf-loader/src/URDFDragControls'; export const addScene = () => new Scene(); @@ -71,7 +71,7 @@ export default class SceneBuilder { public controls: OrbitControls; public callback: Function; public gridHelper: GridHelper; - public model: Object3D; + public model: URDFRobot; public liveStreamTexture: CanvasTexture; private fog: FogExp2; private isLoaded: boolean = false; @@ -232,10 +232,10 @@ export default class SceneBuilder { this.model.joints[jointName].setJointValue(angle); } - isJoint = (j) => j.isURDFJoint && j.jointType !== 'fixed'; + isJoint = (j: URDFJoint) => j.isURDFJoint && j.jointType !== 'fixed'; highlightLinkGeometry = (m: URDFMimicJoint, revert: boolean, material: MeshPhongMaterial) => { - const traverse = (c) => { + const traverse = (c: any) => { if (c.type === 'Mesh') { if (revert) { c.material = c.__origMaterial; @@ -295,7 +295,7 @@ export default class SceneBuilder { this.renderer.domElement.addEventListener('touchmove', (data) => dragControls._mouseMove(data.touches[0]) ); - this.renderer.domElement.addEventListener('touchup', (data) => + this.renderer.domElement.addEventListener('touchend', (data) => dragControls._mouseUp(data.touches[0]) ); return this;