[OKG/HWK2] Animated about 30 more seconds of character movement

1 files changed, 122 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 02d9c6a..ce39b74 100644
--- a/Year 2/Computer Graphics Fundamentals/Homework 2/mannequin.html
+++ b/Year 2/Computer Graphics Fundamentals/Homework 2/mannequin.html
@@ -47,7 +47,7 @@
 

 			var aspect = window.innerWidth/window.innerHeight;

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

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

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

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

 			camera.lookAt( camLookAt );

 

@@ -82,6 +82,8 @@
 			sun.position.set( 60, 190, 50 );

 			sun.target = ground;

 			sun.castShadow = true;

+			sun.shadowMapWidth = 1024;

+			sun.shadowMapHeight = 1024;

 			scene.add( sun );

 

 			var ambient = new THREE.AmbientLight(0xffffff, 0.7);

@@ -113,7 +115,7 @@
 			var koichi = newKoichi();

 			koichi.rotation.x = Math.PI / 2;

 			koichi.rotation.z = Math.PI * 0.9;

-			koichi.position.set(90, 1, 60);

+			koichi.position.set(80, 1, 60);

 			koichi.head.turn = 90;

 			koichi.head.tilt = 20;

 			koichi.l_ankle.turn = 85;

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

 			 **/

 

-			const START = 500;

+			const START = 4000;

 

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

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

@@ -705,6 +707,7 @@
 						0, [180, 55, 90], [180, 55, 60], true

 					],

 				],

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

 				  650: [

 					[

 						50, kira,

@@ -713,6 +716,7 @@
 						null, [0, -0.3, 0]

 					],

 				],

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

 				  850: [

 					[

 						40, jotaro,

@@ -734,6 +738,7 @@
 						400, [160, 50, 55], [120, 55, 60], true

 					],

 				],

+				// Jotaro се изправя

 				 1400: [

 					[

 						50, jotaro,

@@ -751,6 +756,7 @@
 						0, [155, 60, 65], [140, 60, 60], true

 					],

 				],

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

 				 2500: [

 					[

 						100, kira,

@@ -762,21 +768,133 @@
 						0, [130, 53, 60], [150, 55, 57], true

 					],

 				],

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

 				 2900: [

 					[

 						400, jotaro,

 						null,

 						{"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]]},

-					]

+					],

 				],

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

 				 4100: [

 					[

 						100, 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]

+					],

+					[

+						200, 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]]},

+					],

+				],

+				// Kira ходи зад Jotaro

+				 4400: [

+					[

+						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]]},

+					],

+					[

+						800, kira,

+						null,

+						null,

+						[-80, 0, -25],

+					],

+				],

+				 4500: [

+					[

+						100, kira,

+						null,

+						{"version":6,"data":[11.4,[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,-12.3],[16.9],[8.1,-1,3.8],[1.3,28.5],[-1.2,3.1,-2.1],[34.8],[9.5,7.4,-2],[14.9,9.3]]},

+					],

+				],

+				 4600: [

+					[

+						100, kira,

+						null,

+						{"version":6,"data":[11.4,[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]]},

+					],

+				],

+				 4700: [

+					[

+						100, kira,

+						null,

+						{"version":6,"data":[3.8,[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,-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]]},

+					],

+				],

+				 4800: [

+					[

+						100, kira,

+						null,

+						{"version":6,"data":[3.8,[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,2.4],[16.9],[8.1,-1,3.8],[1.3,28.5],[-1.2,3.1,-14.5],[34.8],[9.5,7.4,-2],[14.9,9.3]]},

 					]

 				],

+				 4900: [ // Kira е зад Jotaro

+					[

+						100, kira,

+						null,

+						{"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]]},

+					],

+				],

+				 5000: [

+					[

+						100, kira,

+						null,

+						{"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,2.4],[16.9],[8.1,-1,3.8],[1.3,28.5],[-1.2,3.1,-14.5],[34.8],[9.5,7.4,-2],[14.9,9.3]]},

+					]

+				],

+				 5100: [

+					[

+						100, kira,

+						null,

+						{"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]]},

+					],

+				],

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

+				 5780: [

+					[

+						70, 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]

+					],

+					[

+						70, kira,

+						null,

+						{"version":6,"data":[3.8,[0,-90,0],[-0.1,-2.5,-2.5],[0.7,26.7,-1.6],[1.4,5.7,4.5],[15.6],[-6,-6,-0.6],[-2.4,-7,1.4],[9.5],[6,6,-0.6],[5.8,-8.8,-3],[15],[8.1,-1,3.8],[1.3,28.5],[-1.2,3.1,-4.4],[14],[9.5,7.4,-2],[14.9,9.3]]},

+						null, [0, -0.2, 0]

+					],

+				],

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

+				 6450: [

+					[

+						50, kira,

+						null,

+						{"version":6,"data":[3.8,[0,-90,0],[-0.1,-2.5,-2.5],[10.7,9.9,-3.3],[1.4,5.7,4.5],[15.6],[-6,-6,-0.6],[-2.4,-7,1.4],[9.5],[6,6,-0.6],[5.8,-8.8,-3],[15],[8.1,-1,3.8],[1.3,28.5],[-1.2,3.1,-4.4],[14],[9.5,7.4,-2],[14.9,9.3]]},

+					],

+				],

+				// Kira си вдига главата

+				 6890: [

+					[

+						20, kira,

+						null,

+						{"version":6,"data":[3.8,[0,-90,0],[-0.1,-2.5,-2.5],[4.5,-5.1,-9.8],[1.4,5.7,4.5],[15.6],[-6,-6,-0.6],[-2.4,-7,1.4],[9.5],[6,6,-0.6],[5.8,-8.8,-3],[15],[8.1,-1,3.8],[1.3,28.5],[-1.2,3.1,-4.4],[14],[9.5,7.4,-2],[14.9,9.3]]},

+					],

+				],

+				 6910: [

+					[

+						20, kira,

+						null,

+						{"version":6,"data":[3.8,[0,-90,0],[-0.1,-2.5,-2.5],[0.6,1.7,9.5],[1.4,5.7,4.5],[15.6],[-6,-6,-0.6],[-2.4,-7,1.4],[9.5],[6,6,-0.6],[5.8,-8.8,-3],[15],[8.1,-1,3.8],[1.3,28.5],[-1.2,3.1,-4.4],[14],[9.5,7.4,-2],[14.9,9.3]]},

+						null, [0, 0, 0]

+					],

+				],

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

+					

+				],

 			};

 			fillBacklog();

 		</script>