From 145de2095122ff862a237413ca48d12edacd0c28 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Mon, 28 Nov 2022 17:10:22 +0200 Subject: [OKG/HWK2] Implemented scene from 12-14 seconds --- .../Homework 2/mannequin.html | 34 +++++++++++++--------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/Year 2/Computer Graphics Fundamentals/Homework 2/mannequin.html b/Year 2/Computer Graphics Fundamentals/Homework 2/mannequin.html index da7f70c..7320900 100644 --- a/Year 2/Computer Graphics Fundamentals/Homework 2/mannequin.html +++ b/Year 2/Computer Graphics Fundamentals/Homework 2/mannequin.html @@ -96,13 +96,17 @@ //scene.add(cube); var jotaro = newJotaro(); - //jotaro.rotation.x = Math.PI / 2; jotaro.position.x = 120; jotaro.position.z = 60; jotaro.rotation.y = Math.PI / 2; scene.add(jotaro); - // scene.add(newKira()); + var kira = newKira(); + kira.position.x = 180; + kira.position.z = 60; + kira.rotation.y = -Math.PI / 2; + scene.add(kira); + var koichi = newKoichi(); koichi.rotation.x = Math.PI / 2; @@ -684,24 +688,26 @@ **/ var animationData = { - 0: [ + 9: [ [ - 5, jotaro, + 0, jotaro, null, - {"version":6,"data":[3.8,[0,-90,0],[-1.3,0,-2],[0,0,5],[6,0,0],[0],[-6,-6,-0.6],[-6,0,0],[0],[6,6,-0.6],[7,-0.6,-5],[15],[-15,0,0],[10,10],[-86.8,50.3,65.1],[15],[15,0,0],[10,10]]}, - [50, 0, 0], - [2, 0, 0], + {"version":6,"data":[7,[0,-90,0],[0.9,3,-21.7],[4.2,1.2,2.5],[6,12.2,15.5],[43.3],[-6,-6,-26.7],[-6,-13.1,18.3],[45.3],[6,6,-22.8],[9.4,-27.2,9.2],[30.3],[-7.5,15,0],[10,10],[-9.3,27.3,9.3],[28.8],[18,-24.3,7.3],[10,10]]}, + [0,-2,0], [0,1.1,0] + ], + ], + 12: [ + [ + 0, [170, 40, 55], [120, 50, 60], true ], [ - 3, [50, 0, 0], [0, -10, 0], false - ] + 2, null, [120, 60, 60], true + ], ], - 5: [ + 14.9: [ [ - 0, jotaro, - null, - {"version":6,"data":[3.8,[0,-90,0],[0,0,-2],[0,0,5],[6,0,0],[0],[-6,-6,-0.6],[-6,0,0],[0],[6,6,-0.6],[-38.1,-66.6,-62],[15],[-15,0,0],[10,10],[89.2,85,-124.8],[15],[15,0,0],[10,10]]} - ] + 0, [150, 40, 65], null, true + ], ], }; fillBacklog(); -- cgit v1.3.1-23-gd82d