Changeset 10007 for ps

Timestamp:

08/15/11 01:36:13 (13 years ago)

Author:

ben

Message:

Changes shore definition to distance on land (all water included) for better dock placement.
Updates build passability classes.
Fixes tile expansion in CheckBuildingPlacement (don't use FromFloat).
Changes dock rotation snapping to search outward.

Location:

ps/trunk

Files:

• binaries/data/mods/public/gui/session/input.js (modified) (2 diffs)
• binaries/data/mods/public/simulation/components/GuiInterface.js (modified) (1 diff)
• binaries/data/mods/public/simulation/data/pathfinder.xml (modified) (1 diff)
• source/simulation2/components/CCmpPathfinder.cpp (modified) (4 diffs)

ps/trunk/binaries/data/mods/public/gui/session/input.js

@@ -564 +564 @@
             });
             if (snapData)
+            {
                 placementAngle = snapData.angle;
+                placementPosition.x = snapData.x;
+                placementPosition.z = snapData.z;
+            }
             
             updateBuildingPlacementPreview();
@@ -826 +830 @@
             });
             if (snapData)
+            {
                 placementAngle = snapData.angle;
+                placementPosition.x = snapData.x;
+                placementPosition.z = snapData.z;
+            }
             
             updateBuildingPlacementPreview();

ps/trunk/binaries/data/mods/public/simulation/components/GuiInterface.js

@@ -526 +526 @@
         }
         
-        // Find direction of most open water, algorithm:
-        //  1. Pick points in a circle around dock
-        //  2. If point is in water, add to array
-        //  3. Scan array looking for consective points
-        //  4. Find longest sequence of conseuctive points
-        //  5. Calculate angle using average of sequence
+        /* Find direction of most open water, algorithm:
+         *  1. Pick points in a circle around dock
+         *  2. If point is in water, add to array
+         *  3. Scan array looking for consective points
+         *  4. Find longest sequence of conseuctive points
+         *  5. If sequence equals all points, no direction can be determined,
+         *      expand search outward and try (1) again
+         *  6. Calculate angle using average of sequence
+         */
         const numPoints = 16;
-        var waterPoints = [];
-        for (var i = 0; i < numPoints; ++i)
-        {
-            var angle = (i/numPoints)*2*Math.PI;
-            var nx = data.x - halfSize*Math.sin(angle);
-            var nz = data.z + halfSize*Math.cos(angle);
-            
-            if (cmpTerrain.GetGroundLevel(nx, nz) < cmpWaterManager.GetWaterLevel(nx, nz))
+        for (var dist = 0; dist < 4; ++dist)
+        {
+            var waterPoints = [];
+            for (var i = 0; i < numPoints; ++i)
             {
-                waterPoints.push(i);
-            }
-        }
-        var consec = [];
-        var length = waterPoints.length;
-        for (var i = 0; i < length; ++i)
-        {
-            var count = 0;
-            for (var j = 0; j < (length-1); ++j)
-            {
-                if (((waterPoints[(i + j) % length]+1) % numPoints) == waterPoints[(i + j + 1) % length])
+                var angle = (i/numPoints)*2*Math.PI;
+                var d = halfSize*(dist+1);
+                var nx = data.x - d*Math.sin(angle);
+                var nz = data.z + d*Math.cos(angle);
+                
+                if (cmpTerrain.GetGroundLevel(nx, nz) < cmpWaterManager.GetWaterLevel(nx, nz))
                 {
-                    ++count;
-                }
-                else
-                {
-                    break;
+                    waterPoints.push(i);
                 }
             }
-            consec[i] = count;
-        }
-        var start = 0;
-        var count = 0;
-        for (var c in consec)
-        {
-            if (consec[c] > count)
+            var consec = [];
+            var length = waterPoints.length;
+            for (var i = 0; i < length; ++i)
             {
-                start = c;
-                count = consec[c];
+                var count = 0;
+                for (var j = 0; j < (length-1); ++j)
+                {
+                    if (((waterPoints[(i + j) % length]+1) % numPoints) == waterPoints[(i + j + 1) % length])
+                    {
+                        ++count;
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
+                consec[i] = count;
             }
-        }
-
-        return {"x": data.x, "z": data.z, "angle": -(((waterPoints[start] + consec[start]/2) % numPoints)/numPoints*2*Math.PI) };
+            var start = 0;
+            var count = 0;
+            for (var c in consec)
+            {
+                if (consec[c] > count)
+                {
+                    start = c;
+                    count = consec[c];
+                }
+            }
+            
+            // If we've found a shoreline, stop searching
+            if (count != numPoints-1)
+            {
+                return {"x": data.x, "z": data.z, "angle": -(((waterPoints[start] + consec[start]/2) % numPoints)/numPoints*2*Math.PI)};
+            }
+        }
     }
 

ps/trunk/binaries/data/mods/public/simulation/data/pathfinder.xml

@@ -24 +24 @@
     <building-land>
       <MaxWaterDepth>0</MaxWaterDepth>
-      <MinShoreDistance>2.0</MinShoreDistance>
+      <MinShoreDistance>1.0</MinShoreDistance>
       <MaxTerrainSlope>1.0</MaxTerrainSlope>
     </building-land>
     <building-shore>
-      <MaxShoreDistance>3.0</MaxShoreDistance>
-      <MaxTerrainSlope>1.5</MaxTerrainSlope>
+      <MaxShoreDistance>2.0</MaxShoreDistance>
+      <MaxTerrainSlope>1.25</MaxTerrainSlope>
     </building-shore>
 

ps/trunk/source/simulation2/components/CCmpPathfinder.cpp

@@ -400 +400 @@
             {
                 // Find a land tile
-                if (!waterGrid.get(i, j) && (
-                    (i > 0 && waterGrid.get(i-1, j)) || (i > 0 && j < m_MapSize-1 && waterGrid.get(i-1, j+1)) || (i > 0 && j > 0 && waterGrid.get(i-1, j-1)) ||
-                    (i < m_MapSize-1 && waterGrid.get(i+1, j)) || (i < m_MapSize-1 && j < m_MapSize-1 && waterGrid.get(i+1, j+1)) || (i < m_MapSize-1 && j > 0 && waterGrid.get(i+1, j-1)) ||
-                    (j > 0 && waterGrid.get(i, j-1)) || (j < m_MapSize-1 && waterGrid.get(i, j+1))
-                    ))
+                if (!waterGrid.get(i, j))
                 {
-                    shoreGrid.set(i, j, 0);
+                    if ((i > 0 && waterGrid.get(i-1, j)) || (i > 0 && j < m_MapSize-1 && waterGrid.get(i-1, j+1)) || (i > 0 && j > 0 && waterGrid.get(i-1, j-1))
+                        || (i < m_MapSize-1 && waterGrid.get(i+1, j)) || (i < m_MapSize-1 && j < m_MapSize-1 && waterGrid.get(i+1, j+1)) || (i < m_MapSize-1 && j > 0 && waterGrid.get(i+1, j-1))
+                        || (j > 0 && waterGrid.get(i, j-1)) || (j < m_MapSize-1 && waterGrid.get(i, j+1))
+                        )
+                    {   // If it's bordered by water, it's a shore tile
+                        shoreGrid.set(i, j, 0);
+                    }
+                    else
+                    {
+                        shoreGrid.set(i, j, shoreMax);
+                    }
                 }
-                else
-                {
-                    shoreGrid.set(i, j, shoreMax);
-                }
-            }
-        }
-
-        // Expand influences to find shore distance
+            }
+        }
+
+        // Expand influences on land to find shore distance
         for (size_t y = 0; y < m_MapSize; ++y)
         {
@@ -421 +423 @@
             for (size_t x = 0; x < m_MapSize; ++x)
             {
-                u16 g = shoreGrid.get(x, y);
-                if (g > min)
-                    shoreGrid.set(x, y, min);
-                else if (g < min)
-                    min = g;
-
-                ++min;
+                if (!waterGrid.get(x, y))
+                {
+                    u16 g = shoreGrid.get(x, y);
+                    if (g > min)
+                        shoreGrid.set(x, y, min);
+                    else if (g < min)
+                        min = g;
+
+                    ++min;
+                }
             }
             for (size_t x = m_MapSize; x > 0; --x)
             {
-                u16 g = shoreGrid.get(x-1, y);
-                if (g > min)
-                    shoreGrid.set(x-1, y, min);
-                else if (g < min)
-                    min = g;
-
-                ++min;
+                if (!waterGrid.get(x-1, y))
+                {
+                    u16 g = shoreGrid.get(x-1, y);
+                    if (g > min)
+                        shoreGrid.set(x-1, y, min);
+                    else if (g < min)
+                        min = g;
+
+                    ++min;
+                }
             }
         }
@@ -445 +453 @@
             for (size_t y = 0; y < m_MapSize; ++y)
             {
-                u16 g = shoreGrid.get(x, y);
-                if (g > min)
-                    shoreGrid.set(x, y, min);
-                else if (g < min)
-                    min = g;
-
-                ++min;
+                if (!waterGrid.get(x, y))
+                {
+                    u16 g = shoreGrid.get(x, y);
+                    if (g > min)
+                        shoreGrid.set(x, y, min);
+                    else if (g < min)
+                        min = g;
+
+                    ++min;
+                }
             }
             for (size_t y = m_MapSize; y > 0; --y)
             {
-                u16 g = shoreGrid.get(x, y-1);
-                if (g > min)
-                    shoreGrid.set(x, y-1, min);
-                else if (g < min)
-                    min = g;
-
-                ++min;
+                if (!waterGrid.get(x, y-1))
+                {
+                    u16 g = shoreGrid.get(x, y-1);
+                    if (g > min)
+                        shoreGrid.set(x, y-1, min);
+                    else if (g < min)
+                        min = g;
+
+                    ++min;
+                }
             }
         }
@@ -699 +713 @@
         return false;
 
-    CFixedVector2D halfSize(square.hw, square.hh);
-    halfSize = halfSize * 1.41421f;
+    // Expand bounds by 1/sqrt(2) tile (multiply by CELL_SIZE since we want world coordinates)
+    entity_pos_t expand = entity_pos_t::FromInt(2).Sqrt().Multiply(entity_pos_t::FromInt(CELL_SIZE / 2));
+    CFixedVector2D halfSize(square.hw + expand, square.hh + expand);
     CFixedVector2D halfBound = Geometry::GetHalfBoundingBox(square.u, square.v, halfSize);