Pull recent changes from bitbucket

2019-01-24 16:01:34 +01:00 · 2019-01-24 16:01:34 +01:00 · 4aebb5f172
commit 4aebb5f172
parent 8da0e40449 1631d469e2
15 changed files with 2382445 additions and 2 deletions
--- a/data/32_dodge.obj
+++ b/data/32_dodge.obj
--- a/data/57chevy.obj
+++ b/data/57chevy.obj
--- a/data/83_honda_atc.obj
+++ b/data/83_honda_atc.obj
--- a/data/Max-Planck_400K.obj
+++ b/data/Max-Planck_400K.obj
--- a/data/bunny.obj
+++ b/data/bunny.obj
--- a/data/cow.obj
+++ b/data/cow.obj
--- a/data/dragon.obj
+++ b/data/dragon.obj
--- a/data/foot_bones.obj
+++ b/data/foot_bones.obj
--- a/data/hand.obj
+++ b/data/hand.obj
--- a/data/horse.obj
+++ b/data/horse.obj
--- a/data/mask.obj
+++ b/data/mask.obj
--- a/data/max_low.obj
+++ b/data/max_low.obj
--- a/data/venus_disc.obj
+++ b/data/venus_disc.obj
--- a/exercise3/src/Viewer.cpp
+++ b/exercise3/src/Viewer.cpp
@ -44,7 +44,7 @@ const float segmentColors[segmentColorCount][3] =
 };
 Viewer::Viewer()
-	: AbstractViewer("CG1 Exercise 2"),
+	: AbstractViewer("CG1 Exercise 3"),
 	renderer(polymesh)
 { 
 	SetupGUI();	
--- a/exercise5/src/Viewer.cpp
+++ b/exercise5/src/Viewer.cpp
@ -21,7 +21,7 @@
 #include <gui/ShaderPool.h>
 Viewer::Viewer()
-	: AbstractViewer("CG1 Exercise 4"),
+	: AbstractViewer("CG1 Exercise 5"),
 	renderer(polymesh),
 	corrPositions(nse::gui::VertexBuffer)
 {