optimized moving

RussellXie7 · Dec 14, 2017 · 228edc1 · 228edc1
1 parent 9e60d97
commit 228edc1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git 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
@@ -19,6 +19,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\Boat.h" />
     <ClInclude Include="..\boundingBox.h" />
     <ClInclude Include="..\CameraTexture.h" />
     <ClInclude Include="..\DofEffect.h" />
@@ -36,6 +37,7 @@
     <ClInclude Include="..\Window.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\Boat.cpp" />
     <ClCompile Include="..\boundingBox.cpp" />
     <ClCompile Include="..\CameraTexture.cpp" />
     <ClCompile Include="..\DofEffect.cpp" />

diff --git a/CSE167StarterCodeFinal-master/GLFWStarterProject/GLFWStarterProject.vcxproj.filters b/CSE167StarterCodeFinal-master/GLFWStarterProject/GLFWStarterProject.vcxproj.filters
@@ -60,6 +60,9 @@
     <ClInclude Include="..\SnowEffect.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\Boat.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\main.cpp">
@@ -110,6 +113,9 @@
     <ClCompile Include="..\SnowEffect.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\Boat.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />