Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/etri-smartspaces

Conflicts:
	bbiwarg/Utility/Timer.cs

bbiwarg/Graphics/OutputWindow.cs

@@ -292,7 +292,10 @@ namespace bbiwarg.Graphics
             GL.TexCoord2(0, 1); GL.Vertex3(2, 1, -1);
             GL.End();*/
 
+            Timer.start("swapBuffers");
             SwapBuffers();
+            Timer.stop("swapBuffers");
+
             Timer.stop("outputTextures");
 
             Timer.stop("onRenderFrame");

bbiwarg/Utility/Timer.cs

@@ -37,8 +37,8 @@ namespace bbiwarg.Utility
         }
 
         public static void output(String name) {
-            Console.WriteLine("name:" + name + "\t" + "mean:" + Math.Round(sumTimes[name] / Math.Max(numTimes[name], 1), 2) + "\t" + "min:" + minTimes[name] + "\t" + "max:" + maxTimes[name]);
-        }
+            Console.WriteLine("name:" + name + "\t" + "avg:" + Math.Round(sumTimes[name] / Math.Max(numTimes[name], 1), 2) + "\t" + "min:" + minTimes[name] + "\t" + "max:" + maxTimes[name]);
+       }
 
         public static void outputAll() {
             Console.WriteLine("---TIMERS-START---");