[OKG/HWK2] Finished animating movement and camera position. Shortened audio.

2 files changed, 82 insertions, 38 deletions

diff --git a/Year 2/Computer Graphics Fundamentals/Homework 2/mannequin.html b/Year 2/Computer Graphics Fundamentals/Homework 2/mannequin.html
index 3489419..2bdfecf 100644
--- a/Year 2/Computer Graphics Fundamentals/Homework 2/mannequin.html
+++ b/Year 2/Computer Graphics Fundamentals/Homework 2/mannequin.html
@@ -47,8 +47,8 @@
 

 			var aspect = window.innerWidth/window.innerHeight;

 			var camera = new THREE.PerspectiveCamera( 30, aspect );

-			camera.position.set( 150, 60, -100 ); //175, 60, 70 );

-			var camLookAt = lookingDirectionVec(camera, [0, -20, 100]);//[-5, -10, -1.5]);

+			camera.position.set( 175, 60, 70 );

+			var camLookAt = lookingDirectionVec(camera, [-5, -10, -1.5]);

 			camera.lookAt( camLookAt );

 

 			function onWindowResize(event)

@@ -109,7 +109,7 @@
 			starPlatinum.position.y -= 100;

 			starPlatinum.position.z = 60;

 			starPlatinum.rotation.y = Math.PI / 2;

-			starPlatinum.posture = {"version":6,"data":[0,[0,-90,0],[0.9,19.2,-2.8],[0,0,0],[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,140.1],[70.6],[22.6,0,0],[119.9,99.9]]};

+			starPlatinum.posture = {"version":6,"data":[0,[0,-90,0],[0.9,19.2,-2.8],[0,0,0],[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,170.9],[70.6],[22.6,0,0],[119.9,99.9]]};

 			scene.add(starPlatinum);

 

 			var kira = newKira();

@@ -190,7 +190,8 @@
 			 ** Анимация (система)

 			 **/

 

-			const START = 000;

+			const START = 0; // начало на анимация. за дебъгване

+			const NO_CAMERA_MOVEMENT = false; // дали камерата да се мести. за дебъгване

 

 			// На дъното на файла има animationData променлива. То е обект, чиито атрибути са секунди от началото на анимацията (t).

 			// Всеки атрибут е масив, който определя всичките "действия" който трябва да се "регистрират"

@@ -260,7 +261,7 @@
 						if (mo.nrot)

 							mo.mannequin.rotation.set(...vecBlend(mo.crot, mo.nrot, blendPer));

 					}

-					else if (false) {

+					else if (!NO_CAMERA_MOVEMENT) {

 						if (!mo.camposold) mo.camposold = vecToArr(camera.position);

 						if (!mo.camwatold) mo.camwatold = camLookAt.clone();

 						if (mo.campos) {

@@ -786,11 +787,9 @@
 						null,

 						null,

 						[0, 100, 0]

-					]

-				],

-				 550: [

+					],

 					[

-						0, [180, 55, 90], [180, 55, 60], true

+						0, [145, 55, 90], [160, 50, 60], true

 					],

 				],

 				// Killer Queen се обръща

@@ -805,10 +804,8 @@
 						100, starPlatinum,

 						null,

 						{"version":6,"data":[3.8,[0,-90,0],[0.9,19.2,-2.8],[0,0,0],[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],[4.6,8.3,33.2],[117.5],[22.6,0,0],[119.9,99.9]]},

-					]

-				],

+					],

 				// Kira се защитава от Star Platinum

-				 650: [

 					[

 						50, kira,

 						null,

@@ -816,26 +813,38 @@
 						null, [0, -0.3, 0]

 					],

 				],

+				 750: [

+					[

+						0, [210, 55, 55], [180, 45, 60], true

+					],

+					[

+						200, [210, 70, 55], [180, 60, 60], true

+					]

+				],

 				// Kira се обръща към Jotaro и Jotaro се смъква

-				 850: [

+				 950: [

 					[

-						40, jotaro,

+						0, jotaro,

 						null,

 						{"version":6,"data":[7.6,[0,-90,0],[0,0,-25.5],[0,0,5],[8.8,23,0.8],[13.6],[-6,-6,-0.6],[-6,-19.6,-0.8],[8.2],[6,6,-0.6],[10.1,-32,2.2],[40.9],[-15,0,0],[10,10],[-12.5,34.5,0.9],[39.2],[8.3,0,0],[10,10]]},

 					],

 					[

+						0, starPlatinum,

+						null, null,

+						[0, -100, 0]

+					],

+					[

 						50, kira,

 						null,

 						{"version":6,"data":[7.6,[0,-90,0],[-0.1,-2.5,-12.5],[-0.6,6.2,6],[1.4,5.7,4.5],[15.6],[-6,-6,-0.6],[-2.4,-7,10.7],[31.2],[6,6,-0.6],[5,-2.7,11.7],[14.7],[0,-2.1,-7.9],[10,10],[-5.3,3.5,-7],[37.8],[9.5,7.4,-2],[108.3,86.1]]},

 						null, [0, -1, 0]

 					],

 					[

-						0, starPlatinum,

-						null, null,

-						[0, -100, 0]

+						0, killerQueen,

+						null,

+						{"version":6,"data":[7.6,[0,-90,0],[-0.1,-2.5,-12.5],[-0.6,6.2,6],[1.4,5.7,4.5],[15.6],[-6,-6,-0.6],[-2.4,-7,10.7],[31.2],[6,6,-0.6],[5,-2.7,11.7],[14.7],[0,-2.1,-7.9],[10,10],[-5.3,3.5,-7],[37.8],[9.5,7.4,-2],[108.3,86.1]]},

+						[30, 100, -10]

 					],

-				],

-				 900: [

 					[

 						0, [160, 30, 55], [120, 30, 60], true

 					],

@@ -846,19 +855,11 @@
 				// Jotaro се изправя

 				1400: [

 					[

-						50, jotaro,

+						0, jotaro,

 						null,

 						{"version":6,"data":[7.6,[-90,-87.4,-91.3],[3.5,-0.3,0.1],[0,0,2.4],[1.7,0,0],[0],[-6,-6,-0.6],[1.3,0,0],[0],[6,6,-0.6],[7,-0.6,-17.1],[50],[-14.9,0,0],[119.9,100],[-7.5,0.6,-19.9],[46.5],[6.5,0.7,-7.4],[120,100]]},

 					],

 					[

-						0, killerQueen,

-						null,

-						{"version":6,"data":[7.6,[0,-90,0],[-0.1,-2.5,-12.5],[-0.6,6.2,6],[1.4,5.7,4.5],[15.6],[-6,-6,-0.6],[-2.4,-7,10.7],[31.2],[6,6,-0.6],[5,-2.7,11.7],[14.7],[0,-2.1,-7.9],[10,10],[-5.3,3.5,-7],[37.8],[9.5,7.4,-2],[108.3,86.1]]},

-						[30, 100, -10]

-					]

-				],

-				1450: [

-					[

 						0, [60, 50, 130], [170, 50, 55], true

 					]

 				],

@@ -867,7 +868,7 @@
 						100, killerQueen,

 						null,

 						null,

-						[35, 100, 0]

+						[22, 100, 0]

 					],

 				],

 				1700: [

@@ -880,19 +881,23 @@
 				],

 				2050: [

 					[

-						0, [155, 60, 65], [140, 60, 60], true

+						0, [155, 60, 65], [140, 57, 60], true

 					],

 				],

 				// Kira поглежда към часовника си

 				2500: [

 					[

+						0, kira,

+						null, null,

+						null, [0, 0.1, 0]

+					],

+					[

 						100, kira,

 						null,

 						{"version":6,"data":[7.6,[0,-90,0],[-0.1,-2.5,-2.5],[-0.6,6.2,6],[1.4,5.7,4.5],[15.6],[-6,-6,-0.6],[-2.4,-7,10.7],[31.2],[6,6,-0.6],[52.3,-38.5,37.1],[127.7],[35.2,45.4,-24.4],[33.9,34.3],[-5.3,3.5,-6],[34.8],[9.5,7.4,-2],[108.3,86.1]]},

-						null, [0, 0.1, 0]

 					],

 					[

-						0, [130, 53, 60], [150, 55, 57], true

+						0, [180, 53, 100], [180, 45, 50], true

 					],

 				],

 				// Jotaro сочи към часовника на Kira

@@ -903,10 +908,23 @@
 						{"version":6,"data":[3.8,[0,-90,0],[-0.6,25.9,0.2],[0.1,-1.2,5.2],[1.9,0,0],[0],[-6,-6,-0.6],[-0.2,0,-0.3],[0.1],[6,6,-0.6],[7,-0.6,-5],[15],[-15,0,0],[10,10],[-23.3,-16.7,44.8],[37.4],[15,-49.3,0],[10,10]]},

 					],

 				],

+				3300: [

+					[

+						0, [230, 50, 80], [160, 50, 55], true

+					]

+				],

+				3780: [

+					[

+						0, [135, 60, 70], [100, 57, 50], true

+					],

+				],

 				// Jotaro си връща ръката обратно и Kira се подготвя да ходи

 				4100: [

 					[

-						100, kira,

+						0, [140, 53, 40], [180, 48, 50], true

+					],

+					[

+						0, kira,

 						null,

 						{"version":6,"data":[11.4,[0,-90,0],[-0.1,-2.5,-2.5],[-0.6,6.2,6],[1.4,5.7,4.5],[15.6],[-6,-6,-0.6],[-2.4,-7,10.7],[31.2],[6,6,-0.6],[5.8,-8.8,-2],[16.9],[8.1,-1,3.8],[1.3,28.5],[-1.2,3.1,-6.2],[34.8],[9.5,7.4,-2],[14.9,9.3]]},

 						null, [0, -1.3, 0]

@@ -920,6 +938,12 @@
 				// Kira ходи зад Jotaro

 				4400: [

 					[

+						0, [110, 50, 130], [150, 50, 55], true

+					],

+					[

+						800, [80, 50, 130], [120, 50, 55], true

+					],

+					[

 						100, kira,

 						null,

 						{"version":6,"data":[15.2,[0,-90,0],[-0.1,-2.5,-2.5],[-0.4,13.5,-1.9],[1.4,5.7,4.5],[15.6],[-6,-6,-0.6],[-2.4,-7,10.7],[31.2],[6,6,-0.6],[5.8,-8.8,6.7],[16.9],[8.1,-1,3.8],[1.3,28.5],[-1.2,3.1,-20.2],[34.8],[9.5,7.4,-2],[14.9,9.3]]},

@@ -980,13 +1004,18 @@
 						{"version":6,"data":[3.8,[0,-90,0],[-0.1,-2.5,-2.5],[-0.4,13.5,6.3],[1.4,5.7,4.5],[15.6],[-6,-6,-0.6],[-2.4,-7,10.7],[31.2],[6,6,-0.6],[5.8,-8.8,-10.6],[16.9],[8.1,-1,3.8],[1.3,28.5],[-1.2,3.1,-7],[34.8],[9.5,7.4,-2],[14.9,9.3]]},

 					],

 				],

+				5300: [

+					[

+						0, [135, 60, 70], [100, 57, 50], true

+					],

+				],

 				// Jotaro пада на колене

 				5780: [

 					[

-						70, jotaro,

+						50, jotaro,

 						null,

 						{"version":6,"data":[3.8,[0,-90,0],[-13.9,-10.6,-24.3],[5.7,44.8,-13.4],[37.4,32.8,65.6],[150],[-6,-6,-7.1],[5.5,-23.5,138.5],[126.7],[6,6,-0.6],[13.3,-9.1,27.2],[0.1],[-90,-3.6,-1.5],[-9.8,12.5],[-89.9,44.7,12.6],[119.9],[72.6,-19.8,4.7],[14.9,9.3]]},

-						[0, -25, 0], [0, -0.1, 0]

+						[0, -26, 0], [0, -0.1, 0]

 					],

 					[

 						70, kira,

@@ -995,6 +1024,24 @@
 						null, [0, -0.2, 0]

 					],

 				],

+				5800: [

+					[

+						0, [120, 20, 100], [120, 5, 60], true

+					],

+				],

+				5900: [

+					[

+						0, [120, 20, 125], [120, 15, 60], true

+					],

+					[

+						200, [120, 20, 125], [120, 30, 60], true

+					]

+				],

+				6150: [

+					[

+						0, [100, 50, 53], [100, 55, 0], true

+					]

+				],

 				// Kira леко си накланя главата

 				6450: [

 					[

@@ -1019,9 +1066,6 @@
 						null, [0, 0, 0]

 					],

 				],

-				7400: [ // Killer Queen се появява и замахва към Jotaro

-					

-				],

 			};

 			fillBacklog();

 		</script>

diff --git a/Year 2/Computer Graphics Fundamentals/Homework 2/scene-audio.mp3 b/Year 2/Computer Graphics Fundamentals/Homework 2/scene-audio.mp3
index e2786f1..1253941 100644
--- a/Year 2/Computer Graphics Fundamentals/Homework 2/scene-audio.mp3
+++ b/Year 2/Computer Graphics Fundamentals/Homework 2/scene-audio.mp3