Changeset 9988 for ps

Timestamp:

08/11/11 00:45:55 (13 years ago)

Author:

ben

Message:

Changes GetFocus to return points above water.
Fixes camera following of boats.

Location:

ps/trunk/source/graphics

Files:

• Camera.cpp (modified) (2 diffs)
• Camera.h (modified) (1 diff)

ps/trunk/source/graphics/Camera.cpp

@@ -287 +287 @@
 }
 
-CVector3D CCamera::GetFocus()
+CVector3D CCamera::GetFocus() const
 {
     // Basically the same as GetWorldCoordinates
@@ -294 +294 @@
     int x, z;
 
-    CVector3D origin, dir, delta, currentTarget;
+    CVector3D origin, dir, delta, terrainPoint, waterPoint;
 
     origin = m_Orientation.GetTranslation();
     dir = m_Orientation.GetIn();
 
-    if (tracer.RayIntersect(origin, dir, x, z, currentTarget))
-        return (currentTarget);
-
-    // Off the edge of the world?
-    // Work out where it /would/ hit, if the map were extended out to infinity with average height.
-
-    return (origin + dir * ((50.0f - origin.Y) / dir.Y));
+    bool gotTerrain = tracer.RayIntersect(origin, dir, x, z, terrainPoint);
+
+    CPlane plane;
+    plane.Set(CVector3D(0.f, 1.f, 0.f),                                     // upwards normal
+        CVector3D(0.f, g_Renderer.GetWaterManager()->m_WaterHeight, 0.f));  // passes through water plane
+
+    bool gotWater = plane.FindRayIntersection( origin, dir, &waterPoint );
+
+    // Clamp the water intersection to within the map's bounds, so that
+    // we'll always return a valid position on the map
+    ssize_t mapSize = g_Game->GetWorld()->GetTerrain()->GetVerticesPerSide();
+    if (gotWater)
+    {
+        waterPoint.X = clamp(waterPoint.X, 0.f, (float)((mapSize-1)*CELL_SIZE));
+        waterPoint.Z = clamp(waterPoint.Z, 0.f, (float)((mapSize-1)*CELL_SIZE));
+    }
+
+    if (gotTerrain)
+    {
+        if (gotWater)
+        {
+            // Intersecting both heightmap and water plane; choose the closest of those
+            if ((origin - terrainPoint).LengthSquared() < (origin - waterPoint).LengthSquared())
+                return terrainPoint;
+            else
+                return waterPoint;
+        }
+        else
+        {
+            // Intersecting heightmap but parallel to water plane
+            return terrainPoint;
+        }
+    }
+    else
+    {
+        if (gotWater)
+        {
+            // Only intersecting water plane
+            return waterPoint;
+        }
+        else
+        {
+            // Not intersecting terrain or water; just return 0,0,0.
+            return CVector3D(0.f, 0.f, 0.f);
+        }
+    }
 }
 

ps/trunk/source/graphics/Camera.h

@@ -88 +88 @@
         // Get the point on the plane at height h corresponding to pixel (px,py)
         CVector3D GetWorldCoordinates(int px, int py, float h) const;
-        // Get the point on the terrain the camera is pointing towards
-        CVector3D GetFocus();
+        // Get the point on the terrain (or water plane) the camera is pointing towards
+        CVector3D GetFocus() const;
 
         // Build an orientation matrix from camera position, camera focus point, and up-vector