Ticket #5011: rangeOp.patch

binaries/data/mods/public/maps/random/new_rms_test.js

@@ -3 +3 @@
 
 var g_Map = new RandomMap(0, "grass1_spring");
 
-placePlayerBases({
-    "PlayerPlacement": playerPlacementCircle(fractionToTiles(0.39))
-});
+var clTerrain = g_Map.createTileClass();
 
-placePlayersNomad(g_Map.createTileClass());
+clTerrain.add(g_Map.getCenter());
+
+for (let i = 0; i < 2; ++i)
+    createArea(
+        new MapBoundsPlacer(),
+        new TerrainPainter(i == 0 ? "blue" : "red"),
+        new NearTileClassConstraint(clTerrain, 10, i == 0));
+
+g_Camera = {
+    "Position":
+    {
+        "x": g_Map.getCenter().x * 4,
+        "y": 0,
+        "z": g_Map.getCenter().y * 4
+    },
+    "Rotation": 0,
+    "Declination": 0.5
+};
 
 g_Map.ExportMap();

binaries/data/mods/public/maps/random/rmgen/Constraint.js

@@ -128 +128 @@
 /**
  * The NearTileClassConstraint is met if at least one tile within the given radius of the tile is marked with the given TileClass.
  */
-function NearTileClassConstraint(tileClass, distance)
+function NearTileClassConstraint(tileClass, distance, useRangeOp)
 {
     this.tileClass = tileClass;
     this.distance = distance;
+    this.useRangeOp = useRangeOp;
 }
 
 NearTileClassConstraint.prototype.allows = function(position)
 {
-    return this.tileClass.countMembersInRadius(position, this.distance) > 0;
+    return this.tileClass.countMembersInRadius(position, this.distance, this.useRangeOp) > 0;
 };
 
 /**

binaries/data/mods/public/maps/random/rmgen/TileClass.js

@@ -97 +97 @@
         this.rangeCount[position.y].add(position.x, -1);
 };
 
-TileClass.prototype.countInRadius = function(position, radius, returnMembers)
+TileClass.prototype.countInRadius = function(position, radius, returnMembers, useRangeOp)
 {
     let members = 0;
     let nonMembers = 0;
@@ -106 +106 @@
     for (let y = position.y - radius; y <= position.y + radius; ++y)
     {
         let iy = Math.floor(y);
-        if (radius >= 27) // Switchover point before RangeOp actually performs better than a straight algorithm
+        if (useRangeOp)
         {
             if (iy >= 0 && iy < this.size)
             {
@@ -148 +148 @@
         return nonMembers;
 };
 
-TileClass.prototype.countMembersInRadius = function(position, radius)
+TileClass.prototype.countMembersInRadius = function(position, radius, useRangeOp)
 {
-    return this.countInRadius(position, radius, true);
+    return this.countInRadius(position, radius, true, useRangeOp);
 };
 
 TileClass.prototype.countNonMembersInRadius = function(position, radius)
 {
-    return this.countInRadius(position, radius, false);
+    return this.countInRadius(position, radius, false, useRangeOp);
 };