From b0a88f49d0a352f02347a32ed61c58d9496ea5f5 Mon Sep 17 00:00:00 2001 From: Matraf Date: Fri, 21 Jan 2022 13:13:02 +0100 Subject: [PATCH] change fishKeyPointsSecond --- .../keypoints/fishKeyPointsSecond.csv | 81 ++++++++++++++++--- grafika_projekt/src/main.cpp | 13 +-- 2 files changed, 76 insertions(+), 18 deletions(-) diff --git a/grafika_projekt/keypoints/fishKeyPointsSecond.csv b/grafika_projekt/keypoints/fishKeyPointsSecond.csv index f1393fc..7305ce7 100644 --- a/grafika_projekt/keypoints/fishKeyPointsSecond.csv +++ b/grafika_projekt/keypoints/fishKeyPointsSecond.csv @@ -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 \ No newline at end of file +-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 \ No newline at end of file diff --git a/grafika_projekt/src/main.cpp b/grafika_projekt/src/main.cpp index 2666183..e11389c 100644 --- a/grafika_projekt/src/main.cpp +++ b/grafika_projekt/src/main.cpp @@ -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; }