From 24654eb67a15b11cd1f896840327d411ce354b77 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Tue, 22 Nov 2022 09:40:05 +0200 Subject: [OKG/HWK2] Posture B's body Y is now also fixed with function --- Year 2/Computer Graphics Fundamentals/Homework 2/mannequin.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Year 2/Computer Graphics Fundamentals/Homework 2/mannequin.html b/Year 2/Computer Graphics Fundamentals/Homework 2/mannequin.html index 5aad4d2..2864dbc 100644 --- a/Year 2/Computer Graphics Fundamentals/Homework 2/mannequin.html +++ b/Year 2/Computer Graphics Fundamentals/Homework 2/mannequin.html @@ -197,7 +197,7 @@ mannequin : instr[1], A : (instr[2]) ? instr[2] : fixPostureY(instr[1].posture), - B : instr[3], + B : fixPostureY(instr[3]), cpos : instr[1].position.clone(), npos : (instr.length === 4 || !instr[4]) ? null : vecSum(instr[1].position, instr[4]), }); @@ -652,14 +652,14 @@ ** Анимационни действия **/ - const DEFAULT_POSTURE = {"version":6,"data":[0,[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],[7,-0.6,-5],[15],[-15,0,0],[10,10],[-7,0.6,-5],[15],[15,0,0],[10,10]]}; + const DEFAULT_POSTURE = {"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],[7,-0.6,-5],[15],[-15,0,0],[10,10],[-7,0.6,-5],[15],[15,0,0],[10,10]]}; var animationData = { 0: [ [ 5, jotaro, null, - {"version":6,"data":[0,[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]]}, + {"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]]}, ], [ 3, [50, 0, 0], [0, -10, 0], false @@ -669,7 +669,7 @@ [ 3, jotaro, null, - {"version":6,"data":[0,[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]]} + {"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]]} ] ], }; -- cgit v1.3.1-26-gb76a