From 38165db828a5d889207b77848d161f99665d8028 Mon Sep 17 00:00:00 2001 From: LJ5O <75009579+LJ5O@users.noreply.github.com> Date: Sat, 27 Jan 2024 00:54:51 +0100 Subject: [PATCH] We should be able to build the website --- .gitignore | 4 +++- package.json | 3 ++- src/main.js | 54 +++++++++++++++++++++++++++------------------------- 3 files changed, 33 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index 2237260..071ec63 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ node_modules/ #backup files from Blender -*.blend1 \ No newline at end of file +*.blend1 +dist/ +dist/index.html diff --git a/package.json b/package.json index de3af19..2a80c4b 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,8 @@ "description": "", "main": "index.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" + "test": "echo \"Error: no test specified\" && exit 1", + "build": "vite build" }, "author": "", "license": "SEE LICENSE IN LICENSE", diff --git a/src/main.js b/src/main.js index b5dd647..57b4dde 100644 --- a/src/main.js +++ b/src/main.js @@ -22,37 +22,39 @@ renderer.setSize( window.innerWidth, window.innerHeight ); document.body.appendChild( renderer.domElement ); //Here, we create/load every asset used, and add it in the scene -let assets = await addAssetsOnScene(scene); +addAssetsOnScene(scene).then(assets => { -/* --------------------- */ -/* | MOVEMENT | */ -/* --------------------- */ -// Events to listen keyboard inputs -document.addEventListener('keydown', PlayerMovement.handleKeyDown); -document.addEventListener('keyup', PlayerMovement.handleKeyUp); + /* --------------------- */ + /* | MOVEMENT | */ + /* --------------------- */ + // Events to listen keyboard inputs + document.addEventListener('keydown', PlayerMovement.handleKeyDown); + document.addEventListener('keyup', PlayerMovement.handleKeyUp); -/* --------------------- */ -/* | ANIMATIONS | */ -/* --------------------- */ -//We can add an animationMixer on objects, and define ready to play actions on objects -//https://threejs.org/docs/#api/en/animation/AnimationAction -Animations.addAnimationMixerOnMesh(assets.player, ["Walk"]); -Animations.addAnimationMixerOnMesh(assets.nameplateModel, ["Animation"]);assets.nameplateModel.animationActions.Animation.play(); -Animations.addAnimationMixerOnMesh(assets.worldStatue, ["Animation"]);assets.worldStatue.animationActions.Animation.play(); -Animations.addAnimationMixerOnMesh(assets.printerStatue, ["Printing"]);assets.printerStatue.animationActions.Printing.play(); + /* --------------------- */ + /* | ANIMATIONS | */ + /* --------------------- */ + //We can add an animationMixer on objects, and define ready to play actions on objects + //https://threejs.org/docs/#api/en/animation/AnimationAction + Animations.addAnimationMixerOnMesh(assets.player, ["Walk"]); + Animations.addAnimationMixerOnMesh(assets.nameplateModel, ["Animation"]);assets.nameplateModel.animationActions.Animation.play(); + Animations.addAnimationMixerOnMesh(assets.worldStatue, ["Animation"]);assets.worldStatue.animationActions.Animation.play(); + Animations.addAnimationMixerOnMesh(assets.printerStatue, ["Printing"]);assets.printerStatue.animationActions.Printing.play(); -function animate() { - requestAnimationFrame( animate ); + function animate() { + requestAnimationFrame( animate ); - if(APP_DEBUG)console.log("Player position X : "+assets.player.scene.position.x+ " Y : "+assets.player.scene.position.y); + if(APP_DEBUG)console.log("Player position X : "+assets.player.scene.position.x+ " Y : "+assets.player.scene.position.y); - PlayerMovement.updatePlayerPositionAnimation(assets.player, camera, scene);//Updating player position and rotation - PlayerCollisions.checkPlayerCollisions(assets.player, assets.plates);//Checking collisions with player - Animations.updateAnimations(Clock.getDelta());//Playing animations + PlayerMovement.updatePlayerPositionAnimation(assets.player, camera, scene);//Updating player position and rotation + PlayerCollisions.checkPlayerCollisions(assets.player, assets.plates);//Checking collisions with player + Animations.updateAnimations(Clock.getDelta());//Playing animations - renderer.render( scene, camera );//Calculating and redering new frame + renderer.render( scene, camera );//Calculating and redering new frame -} -console.log("Ready to render scene, placed objects : "+scene.children.length); -animate(); + } + console.log("Ready to render scene, placed objects : "+scene.children.length); + animate(); + +});