s452622/GRK-Projekt
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

change fishKeyPointsSecond

Browse Source
This commit is contained in:
Matraf 2022-01-21 13:13:02 +01:00
parent 801653b4cf
commit b0a88f49d0
2 changed files with 76 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
grafika_projekt/keypoints/fishKeyPointsSecond.csv
View File

@ -1,12 +1,69 @@
0.0, 0.0, 15.0
-20.0, 10.0, 10.0
-35.0, 15.0, 5.0
-55.0, 0.0, 5.0
-70.0, 0.0, 0.0
-70.0, 0.0, -10.0
-70.0, 0.0, -25.0
-85.0, 0.0, -35.0
-115.0, 0.0, -45.0
-135.0, 0.0, -25.0
-155.0, 0.0, -5.0
-175.0, 0.0, 0.0
-10.0,0.0,220.0
-10.0,0.0,210.0
-10.0,0.0,200.0
-10.0,0.0,190.0
-20.0,0.0,180.0
-30.0,0.0,170.0
-40.0,0.0,160.0
-50.0,0.0,150.0
-60.0,0.0,140.0
-60.0,0.0,130.0
-60.0,0.0,120.0
-50.0,0.0,110.0
-40.0,0.0,100.0
-30.0,0.0,90.0
-20.0,0.0,80.0
-10.0,0.0,70.0
-20.0,0.0,60.0
-20.0,0.0,50.0
-30.0,0.0,50.0
-40.0,0.0,50.0
-50.0,0.0,50.0
-60.0,0.0,50.0
-70.0,0.0,50.0
-80.0,0.0,40.0
-90.0,0.0,30.0
-100.0,0.0,20.0
-100.0,0.0,10.0
-100.0,0.0,0.0
-90.0,0.0,-10.0
-80.0,0.0,-20.0
-80.0,0.0,-30.0
-70.0,0.0,-30.0
-60.0,0.0,-30.0
-50.0,0.0,-40.0
-50.0,0.0,-50.0
-40.0,0.0,-50.0
-30.0,0.0,-60.0
-20.0,0.0,-60.0
-10.0,0.0,-60.0
0.0,0.0,-60.0
10.0,0.0,-70.0
20.0,0.0,-80.0
30.0,0.0,-90.0
40.0,0.0,-90.0
50.0,0.0,-90.0
60.0,0.0,-90.0
60.0,0.0,-100.0
60.0,0.0,-110.0
60.0,0.0,-120.0
60.0,0.0,-130.0
60.0,0.0,-140.0
60.0,0.0,-150.0
50.0,0.0,-160.0
40.0,0.0,-170.0
30.0,0.0,-170.0
20.0,0.0,-170.0
10.0,0.0,-170.0
0.0,0.0,-160.0
-10.0,0.0,-150.0
-20.0,0.0,-150.0
-30.0,0.0,-150.0
-40.0,0.0,-150.0
-50.0,0.0,-160.0
-60.0,0.0,-170.0
-70.0,0.0,-180.0
-80.0,0.0,-190.0
-80.0,0.0,-200.0
-80.0,0.0,-210.0
-80.0,0.0,-220.0
1 -10.0 0.0 0.0 15.0 220.0
2 -10.0 10.0 -20.0 0.0 10.0 210.0
3 -10.0 15.0 -35.0 0.0 5.0 200.0
4 -10.0 0.0 -55.0 0.0 5.0 190.0
5 -20.0 0.0 -70.0 0.0 0.0 180.0
6 -30.0 0.0 -70.0 0.0 -10.0 170.0
7 -40.0 0.0 -70.0 0.0 -25.0 160.0
8 -50.0 0.0 -85.0 0.0 -35.0 150.0
9 -60.0 0.0 -115.0 0.0 -45.0 140.0
10 -60.0 0.0 -135.0 0.0 -25.0 130.0
11 -60.0 0.0 -155.0 0.0 -5.0 120.0
12 -50.0 0.0 -175.0 0.0 0.0 110.0
13 -40.0 0.0 100.0
14 -30.0 0.0 90.0
15 -20.0 0.0 80.0
16 -10.0 0.0 70.0
17 -20.0 0.0 60.0
18 -20.0 0.0 50.0
19 -30.0 0.0 50.0
20 -40.0 0.0 50.0
21 -50.0 0.0 50.0
22 -60.0 0.0 50.0
23 -70.0 0.0 50.0
24 -80.0 0.0 40.0
25 -90.0 0.0 30.0
26 -100.0 0.0 20.0
27 -100.0 0.0 10.0
28 -100.0 0.0 0.0
29 -90.0 0.0 -10.0
30 -80.0 0.0 -20.0
31 -80.0 0.0 -30.0
32 -70.0 0.0 -30.0
33 -60.0 0.0 -30.0
34 -50.0 0.0 -40.0
35 -50.0 0.0 -50.0
36 -40.0 0.0 -50.0
37 -30.0 0.0 -60.0
38 -20.0 0.0 -60.0
39 -10.0 0.0 -60.0
40 0.0 0.0 -60.0
41 10.0 0.0 -70.0
42 20.0 0.0 -80.0
43 30.0 0.0 -90.0
44 40.0 0.0 -90.0
45 50.0 0.0 -90.0
46 60.0 0.0 -90.0
47 60.0 0.0 -100.0
48 60.0 0.0 -110.0
49 60.0 0.0 -120.0
50 60.0 0.0 -130.0
51 60.0 0.0 -140.0
52 60.0 0.0 -150.0
53 50.0 0.0 -160.0
54 40.0 0.0 -170.0
55 30.0 0.0 -170.0
56 20.0 0.0 -170.0
57 10.0 0.0 -170.0
58 0.0 0.0 -160.0
59 -10.0 0.0 -150.0
60 -20.0 0.0 -150.0
61 -30.0 0.0 -150.0
62 -40.0 0.0 -150.0
63 -50.0 0.0 -160.0
64 -60.0 0.0 -170.0
65 -70.0 0.0 -180.0
66 -80.0 0.0 -190.0
67 -80.0 0.0 -200.0
68 -80.0 0.0 -210.0
69 -80.0 0.0 -220.0

13
grafika_projekt/src/main.cpp
View File

@ -425,18 +425,19 @@ void renderScene()
drawObjectTexture(fishContext, animationMatrix(time + 15, change2, fishKeyPointsFirst, fishKeyRotationFirst, glm::vec3(0.8f), 5.f), textureFish, programTexture);
drawObjectTexture(fishContext, animationMatrix(time + 15, change3, fishKeyPointsFirst, fishKeyRotationFirst, glm::vec3(0.8f), 5.f), textureFish, programTexture);
drawObjectTexture(fishContext, animationMatrix(time + 15, change4, fishKeyPointsFirst, fishKeyRotationFirst, glm::vec3(0.8f), 5.f), textureFish, programTexture);
drawObjectTexture(fangtoothContext, animationMatrix(time + 15, change1, fishKeyPointsSecond, fishKeyRotationSecond, glm::vec3(0.25f), 1.f), textureFangtooth, programTexture);
drawObjectTexture(fangtoothContext, animationMatrix(time + 15, change1, fishKeyPointsSecond, fishKeyRotationSecond, glm::vec3(0.25f), 4.f), textureFangtooth, programTexture);
drawObjectTexture(fishContext, animationMatrix(time + 15, change1, fishKeyPointsThird, fishKeyRotationThird, glm::vec3(0.8f), .1f), textureSecondFish, programTexture);
drawObjectTexture(fishContext, animationMatrix(time + 15, change2, fishKeyPointsThird, fishKeyRotationThird, glm::vec3(0.8f), .1f), textureSecondFish, programTexture);
drawObjectTexture(fishContext, animationMatrix(time + 15, change3, fishKeyPointsThird, fishKeyRotationThird, glm::vec3(0.8f), .1f), textureSecondFish, programTexture);
drawObjectTexture(fishContext, animationMatrix(time + 15, change4, fishKeyPointsThird, fishKeyRotationThird, glm::vec3(0.8f), .1f), textureSecondFish, programTexture);
drawObjectTexture(fishContext, animationMatrix(time + 15, change2, fishKeyPointsThird, fishKeyRotationThird, glm::vec3(0.8f), 1.f), textureSecondFish, programTexture);
drawObjectTexture(fishContext, animationMatrix(time + 15, change0, fishKeyPointsThird, fishKeyRotationThird, glm::vec3(0.8f), 1.f), textureSecondFish, programTexture);
drawObjectTexture(fishContext, animationMatrix(time + 15, change1, fishKeyPointsThird, fishKeyRotationThird, glm::vec3(0.8f), 1.f), textureSecondFish, programTexture);
drawObjectTexture(fishContext, animationMatrix(time + 15, change4, fishKeyPointsThird, fishKeyRotationThird, glm::vec3(0.8f), 1.f), textureSecondFish, programTexture);
time -= 5;
}
}
if (time > -10) {
drawObjectTexture(sharkContext, animationMatrix(time + 15, change1, sharkKeyPoints, sharkKeyRotation, glm::vec3(10.f), 1.f), textureShark, programTexture);
drawObjectTexture(sharkContext, animationMatrix(time + 15, change0, sharkKeyPoints, sharkKeyRotation, glm::vec3(10.f), 1.f), textureShark, programTexture);
time -= 5;
}