diff --git a/CSE167StarterCodeFinal-master/Boat.cpp b/CSE167StarterCodeFinal-master/Boat.cpp index 615f28d..15f7512 100644 --- a/CSE167StarterCodeFinal-master/Boat.cpp +++ b/CSE167StarterCodeFinal-master/Boat.cpp @@ -63,7 +63,7 @@ void Boat::update() { } // update orit translate, wave - pos += speed * dir; + pos += speed * 0.1f * dir; translate = glm::translate(glm::mat4(1.0f), pos); @@ -91,14 +91,18 @@ void Boat::update() { if (selfY > -2.0f) { glm::vec3 xxx =Window::cam_pos; xxx.y = 0.0f; - pos += 2 * speed * glm::normalize(glm::vec3(0.0f, 0.0f, 0.0f) - xxx); + pos += 0.2 * speed * glm::normalize(glm::vec3(0.0f, 0.0f, 0.0f) - xxx); angle += 3.1416f /2.0f; - orbit = glm::rotate(glm::mat4(1.0f), angle, glm::vec3(0.0f, 1.0f, 0.0f)); - dir = glm::vec3(orbit * glm::vec4(0.0f, 0.0f, 1.0f, 1.0f)); + //orbit = glm::rotate(glm::mat4(1.0f), angle, glm::vec3(0.0f, 1.0f, 0.0f)); + //dir = glm::vec3(orbit * glm::vec4(0.0f, 0.0f, 1.0f, 1.0f)); } } - speed -= 0.001f; + if (speed > 0.2) { + speed = 0.2; + } + + speed -= 0.005f; if (speed < 0.0f) speed = 0.0f; diff --git a/CSE167StarterCodeFinal-master/GLFWStarterProject/GLFWStarterProject.vcxproj b/CSE167StarterCodeFinal-master/GLFWStarterProject/GLFWStarterProject.vcxproj index cb25c3d..4b9398d 100644 --- a/CSE167StarterCodeFinal-master/GLFWStarterProject/GLFWStarterProject.vcxproj +++ b/CSE167StarterCodeFinal-master/GLFWStarterProject/GLFWStarterProject.vcxproj @@ -19,6 +19,7 @@ + @@ -36,6 +37,7 @@ + diff --git a/CSE167StarterCodeFinal-master/GLFWStarterProject/GLFWStarterProject.vcxproj.filters b/CSE167StarterCodeFinal-master/GLFWStarterProject/GLFWStarterProject.vcxproj.filters index 84c9ffd..3a63d74 100644 --- a/CSE167StarterCodeFinal-master/GLFWStarterProject/GLFWStarterProject.vcxproj.filters +++ b/CSE167StarterCodeFinal-master/GLFWStarterProject/GLFWStarterProject.vcxproj.filters @@ -60,6 +60,9 @@ Header Files + + Header Files + @@ -110,6 +113,9 @@ Source Files + + Source Files +