Merge pull request #91 from DPigeon/last-commit

Last last commit
DPigeon · Aug 16, 2019 · 8a4f35c · 8a4f35c
2 parents 22f631a + 16506f8
commit 8a4f35c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Source/EventManager.cpp b/Source/EventManager.cpp
@@ -240,9 +240,6 @@ void EventManager::Update()
         SettingsScreen::Draw();
     }
 
-	// Draw FPS window when running the app
-    if (GetApplicationState() == ApplicationState::RUNNING)
-		AppInfoWindow::Draw(GetPlanetClickedMessage());
 	// Draw FPS window when done loading
     if (GetApplicationState() == ApplicationState::RUNNING)
         AppInfoWindow::Draw(GetPlanetClickedMessage());

diff --git a/Source/World.cpp b/Source/World.cpp
@@ -304,7 +304,7 @@ void World::Draw()
     {
         glUniform3f(ModelColorID, 0.0f, 0.0f, 1.0f);
         glUniform4f(MaterialID, 1.0f, 0.0f, 0.0f, 1.0f);
-        (*it)->SetScaling(vec3(0.05f, 0.05f, 0.05f)); // TO FIX
+        (*it)->SetScaling(vec3(0.05f, 0.05f, 0.05f));
         (*it)->Draw();
     }
 

diff --git a/VS2017/Assignment1.vcxproj b/VS2017/Assignment1.vcxproj
@@ -130,6 +130,7 @@
     <ClCompile Include="..\Source\BSpline.cpp" />
     <ClCompile Include="..\Source\BSplineCamera.cpp" />
     <ClCompile Include="..\Source\Camera.cpp" />
+    <ClCompile Include="..\Source\MenuScreen.cpp" />
     <ClCompile Include="..\Source\Projectile.cpp" />
     <ClCompile Include="..\Source\EventManager.cpp" />
     <ClCompile Include="..\Source\FirstPersonCamera.cpp" />
@@ -146,6 +147,7 @@
     <ClCompile Include="..\Source\Packages\imgui\imgui_widgets.cpp" />
     <ClCompile Include="..\Source\Renderer.cpp" />
     <ClCompile Include="..\Source\RocketModel.cpp" />
+    <ClCompile Include="..\Source\SettingsScreen.cpp" />
     <ClCompile Include="..\Source\Skybox.cpp" />
     <ClCompile Include="..\Source\SphereModel.cpp" />
     <ClCompile Include="..\Source\Star.cpp" />
@@ -159,6 +161,7 @@
     <ClInclude Include="..\Source\BSpline.h" />
     <ClInclude Include="..\Source\BSplineCamera.h" />
     <ClInclude Include="..\Source\Camera.h" />
+    <ClInclude Include="..\Source\MenuScreen.h" />
     <ClInclude Include="..\Source\OBJloader.h" />
     <ClInclude Include="..\Source\OBJloaderV2.h" />
     <ClInclude Include="..\Source\Projectile.h" />
@@ -179,6 +182,7 @@
     <ClInclude Include="..\Source\ParsingHelper.h" />
     <ClInclude Include="..\Source\Renderer.h" />
     <ClInclude Include="..\Source\RocketModel.h" />
+    <ClInclude Include="..\Source\SettingsScreen.h" />
     <ClInclude Include="..\Source\Skybox.h" />
     <ClInclude Include="..\Source\SphereModel.h" />
     <ClInclude Include="..\Source\Star.h" />