diff --git a/src/main.js b/src/main.js index bb1068c..1f8c007 100644 --- a/src/main.js +++ b/src/main.js @@ -36,6 +36,8 @@ document.addEventListener('keyup', PlayerMovement.handleKeyUp); //https://threejs.org/docs/#api/en/animation/AnimationAction Animations.addAnimationMixerOnMesh(assets.player, ["Walk"]); Animations.addAnimationMixerOnMesh(assets.nameplateModel, ["Float"]);assets.nameplateModel.animationActions.Float.play(); +Animations.addAnimationMixerOnMesh(assets.worldStatue, ["Animation"]);assets.worldStatue.animationActions.Animation.play(); +Animations.addAnimationMixerOnMesh(assets.printerStatue, ["Printing"]);assets.printerStatue.animationActions.Printing.play(); function animate() { diff --git a/src/utils/addAssetsOnScene.js b/src/utils/addAssetsOnScene.js index c81d8d0..6b692eb 100644 --- a/src/utils/addAssetsOnScene.js +++ b/src/utils/addAssetsOnScene.js @@ -236,9 +236,10 @@ export async function addAssetsOnScene(scene){ scene.add( worldStatue.scene ); const printerStatue = await loadModel('src/objects/models/statue3DPrinter.gltf'); - printerStatue.scene.scale.set(0.085,0.085,0.085); + //printerStatue.scene.scale.set(0.085,0.085,0.085); + printerStatue.scene.scale.set(0.09,0.09,0.09); printerStatue.scene.position.x = 14.3; - printerStatue.scene.position.y = -13.65; + printerStatue.scene.position.y = -13.6; printerStatue.scene.rotateOnWorldAxis(new THREE.Vector3(1,0,0), MathUtils.degToRad(90));//Must be standing up printerStatue.scene.rotateOnWorldAxis(new THREE.Vector3(0,0,1), MathUtils.degToRad(-90));//Must be standing up alignGround(ground, printerStatue.scene); @@ -286,6 +287,8 @@ export async function addAssetsOnScene(scene){ fenceScenes: fences, player: player, pathTiles: pathTiles, - nameplateModel: nameplateModel + nameplateModel: nameplateModel, + worldStatue: worldStatue, + printerStatue: printerStatue }; } \ No newline at end of file