[Orxonox-commit 5105] r9770 - code/branches/radarDreiD/src/libraries/util

[wroennin at orxonox.net]

Author: wroennin
Date: 2013-11-11 13:55:23 +0100 (Mon, 11 Nov 2013)
New Revision: 9770

Modified:
   code/branches/radarDreiD/src/libraries/util/Math.cc
Log:
Math.cc: added comment for directions, correccted vectors; New Test level radar3D_test.oxw

Modified: code/branches/radarDreiD/src/libraries/util/Math.cc
===================================================================
--- code/branches/radarDreiD/src/libraries/util/Math.cc	2013-11-11 12:26:41 UTC (rev 9769)
+++ code/branches/radarDreiD/src/libraries/util/Math.cc	2013-11-11 12:55:23 UTC (rev 9770)
@@ -210,7 +210,7 @@
     	orxonox::Vector3 distance = otherposition - myposition;
 
     	// new coordinate system base y_coordinate
-    	orxonox::Vector3 myside = mydirection.crossProduct(-myorthonormal);
+    	orxonox::Vector3 myside = -(mydirection.crossProduct(myorthonormal));
 
     	// inverse of the transform matrix
     	float determinant = +mydirection.x * (myside.y*myorthonormal.z - myorthonormal.y*myside.z)
@@ -246,8 +246,8 @@
     	distance = 5 * distance / detectionlimit;
 
     	// project vector for the rotated 3DMap on screen
-    	float xcoordinate = -distance.y; // -; cause in room myside points to the left, on screen x to the right
-    	float ycoordinate = (distance.x*sin(mapangle)+distance.z*cos(mapangle));
+    	float xcoordinate = distance.z; // z; cause z direction is to the side
+    	float ycoordinate = (distance.x*sin(mapangle)+distance.y*cos(mapangle));
     	return orxonox::Vector2(xcoordinate , ycoordinate);
     }