Changeset 9877 for code/branches/radarDreiD/src/libraries/util

Timestamp:

Dec 9, 2013, 2:06:55 PM (11 years ago)

Author:

wroennin

Message:

Math: New function to determine the ZOrder of the radarobjects; HUDTemplates: cleenup

Location:

code/branches/radarDreiD/src/libraries/util

Files:

• Math.cc (modified) (3 diffs)
• Math.h (modified) (1 diff)

code/branches/radarDreiD/src/libraries/util/Math.cc

@@ -208 +208 @@
     {
         // Orxonox Vectors: x_direction you are looking, y_direction points up, z_direction points to the right
-        orxonox::Vector3 distance = otherposition - myposition;
+        orxonox::Vector3 distance = otherposition - myposition; // get vector from Ship to object
 
         // new coordinate system:       x_axsis:        mydirection             (points front)
@@ -214 +214 @@
         //                                                      z_axsis:        myside                  (points right)
 
-        orxonox::Vector3 myside = mydirection.crossProduct(myorthonormal); // get vector from Ship to object
+        orxonox::Vector3 myside = mydirection.crossProduct(myorthonormal); // get 3. base vector
 
         distance = 4*distance / detectionlimit; // shrink vector on map
@@ -263 +263 @@
         else
                 return false;
+    }
+
+    /**
+                   @brief A value between 0 and 10, in order how other object is in front or in back
+                   @param myposition My position
+                   @param mydirection My viewing direction
+                   @param myorthonormal My orthonormalvector (pointing upwards through my head)
+                   @param otherposition The position of the other object
+                   @param detectionlimit The limit in which objects are shown on the map
+                   @return value between 0 and 100
+    */
+    int determineMap3DZOrder(const orxonox::Vector3& myposition, const orxonox::Vector3& mydirection, const orxonox::Vector3& myorthonormal, const orxonox::Vector3& otherposition, const float detectionlimit)
+    {
+        orxonox::Vector3 distance = otherposition - myposition; // get vector from Ship to object
+        orxonox::Vector3 myside = mydirection.crossProduct(myorthonormal);      // get vector to the side
+
+        distance = 4*distance / detectionlimit; // shrink vector on map
+        if(distance.length() > 1.0f) // if object would wander outside of the map
+        {
+                distance = distance / distance.length();
+        }
+
+        // perform a coordinate transformation to get distance in relation of the position of the ship
+        orxonox::Vector3 distanceShip = getTransformedVector(distance, mydirection, myorthonormal, myside);
+
+        return (int) 50 - 100*distanceShip.x;
     }
 

code/branches/radarDreiD/src/libraries/util/Math.h

@@ -94 +94 @@
     _UtilExport orxonox::Vector2 get3DProjection(const orxonox::Vector3& myposition, const orxonox::Vector3& mydirection, const orxonox::Vector3& myorthonormal, const orxonox::Vector3& otherposition, const float mapangle, const float detectionlimit);
     _UtilExport bool isObjectHigherThanShipOnMap(const orxonox::Vector3& myposition, const orxonox::Vector3& mydirection, const orxonox::Vector3& myorthonormal, const orxonox::Vector3& otherposition, const float mapangle);
+    _UtilExport int determineMap3DZOrder(const orxonox::Vector3& myposition, const orxonox::Vector3& mydirection, const orxonox::Vector3& myorthonormal, const orxonox::Vector3& otherposition, const float detectionlimit);
     _UtilExport orxonox::Vector3 getTransformedVector(const orxonox::Vector3& distance, const orxonox::Vector3& mydirection, const orxonox::Vector3& myorthonormal, const orxonox::Vector3& myside);
     _UtilExport orxonox::Vector3 getPredictedPosition(const orxonox::Vector3& myposition, float projectilespeed, const orxonox::Vector3& targetposition, const orxonox::Vector3& targetvelocity);