Changeset 9991 for ps

Timestamp:

08/11/11 01:57:54 (13 years ago)

Author:

ben

Message:

Fixes incorrect distance calculation.
Improves dock foundation snapping.

Location:

ps/trunk/binaries/data/mods/public

Files:

• gui/session/input.js (modified) (2 diffs)
• simulation/components/BuildRestrictions.js (modified) (7 diffs)
• simulation/components/GuiInterface.js (modified) (3 diffs)

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

@@ -563 +563 @@
                 "z": placementPosition.z
             });
-            if (snapData.snapped)
+            if (snapData)
                 placementAngle = snapData.angle;
             
@@ -825 +825 @@
                 "z": placementPosition.z
             });
-            if (snapData.snapped)
+            if (snapData)
                 placementAngle = snapData.angle;
             

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

@@ -140 +140 @@
     if (this.template.Category == "Dock")
     {
-        // Dock must be oriented from land facing into water
+        // TODO: Probably should check unit passability classes here, to determine if:
+        //      1. ships can be spawned "nearby"
+        //      2. builders can pass the terrain where the dock is placed (don't worry about paths)
+        //  so it's correct even if the criteria changes for these units
         var cmpFootprint = Engine.QueryInterface(this.entity, IID_Footprint);
         if (!cmpFootprint)
@@ -158 +161 @@
             halfSize = shape.radius;
         }
-
+        
         var cmpTerrain = Engine.QueryInterface(SYSTEM_ENTITY, IID_Terrain);
         var cmpWaterManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_WaterManager);
@@ -169 +172 @@
         var sz = halfSize * Math.sin(ang);
         var cz = halfSize * Math.cos(ang);
-        if ((cmpTerrain.GetGroundLevel(pos.x + sz, pos.y + cz) > cmpWaterManager.GetWaterLevel(pos.x + sz, pos.y + cz)) || // front
-            (cmpTerrain.GetGroundLevel(pos.x - sz, pos.y - cz) <= cmpWaterManager.GetWaterLevel(pos.x - sz, pos.y - cz)))   // back
+        if ((cmpWaterManager.GetWaterLevel(pos.x + sz, pos.y + cz) - cmpTerrain.GetGroundLevel(pos.x + sz, pos.y + cz)) < 1.0 // front
+            || (cmpWaterManager.GetWaterLevel(pos.x - sz, pos.y - cz) - cmpTerrain.GetGroundLevel(pos.x - sz, pos.y - cz)) > 2.0)   // back
         {
             return false;   // Fail
@@ -179 +182 @@
     if (this.template.Distance)
     {
-        var minDist = 65535;
-        var maxDist = 0;
+        var nearest = 65535;
         var ents = Engine.GetEntitiesWithInterface(IID_BuildRestrictions);
         for each (var ent in ents)
@@ -186 +188 @@
             var cmpBuildRestrictions = Engine.QueryInterface(ent, IID_BuildRestrictions);
             if (cmpBuildRestrictions.GetCategory() == this.template.Distance.FromCategory && IsOwnedByPlayer(player, ent))
-            {
+            {   // Find nearest building matching this category
                 var cmpEntPosition = Engine.QueryInterface(ent, IID_Position);
                 if (cmpEntPosition && cmpEntPosition.IsInWorld())
@@ -192 +194 @@
                     var entPos = cmpEntPosition.GetPosition2D();
                     var dist = Math.sqrt((pos.x-entPos.x)*(pos.x-entPos.x) + (pos.y-entPos.y)*(pos.y-entPos.y));
-                    if (dist < minDist)
+                    if (dist < nearest)
                     {
-                        minDist = dist;
-                    }
-                    if (dist > maxDist)
-                    {
-                        maxDist = dist;
+                        nearest = dist;
                     }
                 }
@@ -204 +202 @@
         }
         
-        if (this.template.Distance.MinDistance !== undefined && minDist < this.template.Distance.MinDistance
-            || this.template.Distance.MaxDistance !== undefined && maxDist > this.template.Distance.MaxDistance)
+        if ((this.template.Distance.MinDistance && nearest < this.template.Distance.MinDistance)
+            || (this.template.Distance.MaxDistance && nearest > this.template.Distance.MaxDistance))
         {
             return false;   // Fail

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

@@ -510 +510 @@
         var cmpTerrain = Engine.QueryInterface(SYSTEM_ENTITY, IID_Terrain);
         var cmpWaterManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_WaterManager);
+        if (!cmpTerrain || !cmpWaterManager)
+        {
+            return false;
+        }
+        
+        // Get footprint size
+        var halfSize = 0;
+        if (template.Footprint.Square)
+        {
+            halfSize = Math.max(template.Footprint.Square["@depth"], template.Footprint.Square["@width"])/2;
+        }
+        else if (template.Footprint.Circle)
+        {
+            halfSize = template.Footprint.Circle["@radius"];
+        }
         
         // Find direction of most open water, algorithm:
@@ -518 +533 @@
         //  5. Calculate angle using average of sequence
         const numPoints = 16;
-        const dist = 20.0;
         var waterPoints = [];
         for (var i = 0; i < numPoints; ++i)
         {
             var angle = (i/numPoints)*2*Math.PI;
-            var nx = data.x - dist*Math.sin(angle);
-            var nz = data.z + dist*Math.cos(angle);
+            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))
@@ -560 +574 @@
         }
 
-        return { "snapped": true, "x": data.x, "z": data.z, "angle": -(((waterPoints[start] + consec[start]/2) % numPoints)/numPoints*2*Math.PI) };
-    }
-
-    return {"snapped": false};
+        return {"x": data.x, "z": data.z, "angle": -(((waterPoints[start] + consec[start]/2) % numPoints)/numPoints*2*Math.PI) };
+    }
+
+    return false;
 };