diff --git a/public/static/meshes/quiz/trophy.glb b/public/static/meshes/quiz/trophy.glb new file mode 100644 index 0000000..8762576 Binary files /dev/null and b/public/static/meshes/quiz/trophy.glb differ diff --git a/src/components/InteractiveObjects/MazeQuizGame/MazeQuizGame.js b/src/components/InteractiveObjects/MazeQuizGame/MazeQuizGame.js index 42fb670..9f43a19 100644 --- a/src/components/InteractiveObjects/MazeQuizGame/MazeQuizGame.js +++ b/src/components/InteractiveObjects/MazeQuizGame/MazeQuizGame.js @@ -103,8 +103,8 @@ class MazeQuizGame extends EventDispatcher { objects:[ { type: 'Gltf', - position:[0,.25,len + .52], scale: [0.037, 0.037, 0.037], rotation: [0, Math.PI/4, 0], - value: '/static/meshes/quiz/award.glb' + position:[0,.22,len + .52], scale: [0.33, 0.33, 0.33], rotation: [0, Math.PI/4, 0], + value: '/static/meshes/quiz/trophy.glb' } ] }; diff --git a/src/lib/Hero.js b/src/lib/Hero.js index 44fa2a5..424bfce 100644 --- a/src/lib/Hero.js +++ b/src/lib/Hero.js @@ -1,6 +1,6 @@ import { AnimationMixer, Vector3 } from 'three'; import { PointerControls } from './PointerControls'; -import { getBoundingBox, getBoundingBoxCenterPoint, getBoundingBoxSize } from './MeshUtils'; +import { getBoundingBox, getBoundingBoxSize } from './MeshUtils'; import { QueryFilterFlags } from '@dimforge/rapier3d'; class Hero{ @@ -148,7 +148,7 @@ class Hero{ this.fadeDuration = 1; } - if (this.currentAction.startsWith('idle') && play != 'idle'){ + if (this.currentAction.startsWith('idle') && play != 'idle' && !pc.controls.isLocked){ this.cameraIdleDelta += delta * 0.33; }else { this.cameraIdleDelta = 0;