Merge branch 'master' of github.com:Faerbit/swp

Levels/Geometry/movableBlock.obj

@@ -0,0 +1,48 @@
+# Blender v2.72 (sub 0) OBJ File: 'movableBlock.blend'
+# www.blender.org
+o Cube_Cube.001
+v -0.781204 -0.781204 0.781204
+v -0.781204 -0.781204 -0.781204
+v 0.781204 -0.781204 -0.781204
+v 0.781204 -0.781204 0.781204
+v -0.781204 0.781204 0.781204
+v -0.781204 0.781204 -0.781204
+v 0.781204 0.781204 -0.781204
+v 0.781204 0.781204 0.781204
+vt 0.004724 0.997658
+vt 0.004724 0.007107
+vt 0.995276 0.007107
+vt 0.995276 0.997658
+vt 0.008245 0.991189
+vt 0.008245 0.004505
+vt 0.994929 0.004505
+vt 0.994930 0.991189
+vt 0.011069 0.988345
+vt 0.011069 0.007349
+vt 0.992064 0.007349
+vt 0.992064 0.988345
+vt 0.001813 0.999704
+vt 0.001602 0.000731
+vt 0.999816 0.001904
+vt 1.000026 0.998811
+vt 0.993718 0.995789
+vt 0.006324 0.995789
+vt 0.006324 0.008395
+vt 0.993718 0.008394
+vt 0.998012 0.997858
+vt 0.005204 0.997859
+vt 0.005204 0.005051
+vt 0.998012 0.005050
+vn -1.000000 0.000000 0.000000
+vn 0.000000 0.000000 -1.000000
+vn 1.000000 0.000000 0.000000
+vn 0.000000 0.000000 1.000000
+vn 0.000000 -1.000000 0.000000
+vn 0.000000 1.000000 0.000000
+s off
+f 5/1/1 6/2/1 2/3/1 1/4/1
+f 6/5/2 7/6/2 3/7/2 2/8/2
+f 7/9/3 8/10/3 4/11/3 3/12/3
+f 8/13/4 5/14/4 1/15/4 4/16/4
+f 1/17/5 2/18/5 3/19/5 4/20/5
+f 8/21/6 7/22/6 6/23/6 5/24/6

level.cc

@@ -133,7 +133,7 @@ void Level::load() {
     physics.addBox(1,3.0f,1,*blockObject2,2,physicObjects.size());
 
     Model columnModel = Model("Column.obj", 1.0f);
-    Material columnMaterial = Material("columnTexture_small.png", 0.1f, 0.6, 0.4f, 2.0f);
+    Material columnMaterial = Material("columnTexture2.png", 0.1f, 0.6, 0.4f, 2.0f);
     Object* columnObject = new Object(columnModel, columnMaterial, glm::vec3(-2.0f, 7.0f, -2.0f),
             glm::vec3(0.0f, 0.0f, 0.0f));
     objects.push_back(columnObject);