Merge remote-tracking branch 'upstream/master'

assisi · Jul 19, 2016 · 5fdc20b · 5fdc20b
2 parents 40711ef + aea85ab
commit 5fdc20b
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/viewer/Playground.cpp b/viewer/Playground.cpp
@@ -257,10 +257,10 @@ class EnkiPlayground : public ViewerWidget
 		{
 			const EPuck* epuck = epucks[0];
 			Vector p(epuck->pos);
-			pos.setX(-p.x+cos(-yaw)*7);
-			pos.setY(-p.y+sin(-yaw)*7);
-			yaw = -epuck->angle;
-			altitude = 11;
+			camera.pos.setX(p.x+cos(camera.yaw)*7);
+			camera.pos.setY(p.y+sin(camera.yaw)*7);
+			camera.yaw = epuck->angle;
+			camera.altitude = 11;
 		}
 		#endif
 		QMap<PhysicalObject*, int>::iterator i = bullets.begin();