Changeset 18710

Timestamp:

Sep 6, 2016, 11:49:57 PM (8 years ago)

Author:

FeXoR

Message:

Adds globalscripts/BicubicInterpolation.js, the corresponding license_mit.txt and points to it for other files with the same license in LICENSE.txt - reviewed by Philip and Itms. Uses that to fix an interpolation issue in gaia.js and also fixes a "fail by one" there - reviewed by elexis. Fixes #4174

Location:

ps/trunk

Files:

• LICENSE.txt (modified) (5 diffs)
• binaries/data/mods/public/globalscripts/BicubicInterpolation.js (added)
• binaries/data/mods/public/maps/random/rmgen2/gaia.js (modified) (1 diff)
• license_mit.txt (added)

ps/trunk/LICENSE.txt

@@ -38 +38 @@
 
   /build/premake/*.lua
-    MIT
+    MIT
 
   /docs
@@ -50 +50 @@
 
   /source/lib
-    MIT
+    MIT
 
   /source/scriptinterface/third_party
@@ -61 +61 @@
     GPL version 2 (or later)
     ISC (pkcs5_pbkdf2.cpp)
-    MIT (pkcs5_pbkdf2.h)
+    MIT (pkcs5_pbkdf2.h)
 
   /source/third-party/jsonspirit
-    MIT
+    MIT
 
   /source/third_party/mikktspace
@@ -70 +70 @@
 
   /source/third_party/mongoose
-    MIT
+    MIT
 
   /source/third_party/tinygettext
@@ -80 +80 @@
   /source/tools/atlas
     GPL version 2 (or later) - see license_gpl-2.0.txt
+
+
+

ps/trunk/binaries/data/mods/public/maps/random/rmgen2/gaia.js

@@ -1275 +1275 @@
  * @param tilemap - The IDs of the palletmap to be painted for each heightmap tile
  * @param pallet - The tile texture names used by the tilemap.
- * @returns the ratio of heightmap tiles per map size tiles
+ * @return the ratio of heightmap tiles per map size tiles
  */
 function paintHeightmap(heightmap, tilemap, pallet, func = undefined)
 {
-    let lastI = -1;
-    let mapSize = getMapSize();
+    let mapSize = getMapSize(); // Width of the map in terrain tiles
     let hmSize = Math.sqrt(heightmap.length);
-    let scale = hmSize / mapSize;
-
-    for (let y = 0; y < mapSize; ++y)
-        for (let x = 0; x < mapSize; ++x)
-        {
-            let i = Math.floor(x * scale) * hmSize + Math.floor(y * scale);
-
-            let height = heightmap[i];
-            let tile = pallet[tilemap[i]];
-
-            if (i == lastI)
+    let scale = hmSize / (mapSize + 1); // There are mapSize + 1 vertices (each 1 tile is surrounded by 2x2 vertices)
+
+    for (let x = 0; x <= mapSize; ++x)
+        for (let y = 0; y <= mapSize; ++y)
+        {
+            let hmPoint = { "x": x * scale, "y": y * scale };
+            let hmTile = { "x": Math.floor(hmPoint.x), "y": Math.floor(hmPoint.y) };
+            let shift = { "x": 0, "y": 0 };
+
+            if (hmTile.x == 0)
+                shift.x = 1;
+            else if (hmTile.x == hmSize - 1)
+                shift.x = - 2;
+            else if (hmTile.x == hmSize - 2)
+                shift.x = - 1;
+
+            if (hmTile.y == 0)
+                shift.y = 1;
+            else if (hmTile.y == hmSize - 1)
+                shift.y = - 2;
+            else if (hmTile.y == hmSize - 2)
+                shift.y = - 1;
+
+            let neighbors = [];
+            for (let localYi = 0; localYi < 4; ++localYi)
+                for (let localXi = 0; localXi < 4; ++localXi)
+                    neighbors.push(heightmap[(hmTile.x + localXi + shift.x - 1) * hmSize + (hmTile.y + localYi + shift.y - 1)]);
+
+            setHeight(x, y, bicubicInterpolation(hmPoint.x - hmTile.x - shift.x, hmPoint.y - hmTile.y - shift.y, ...neighbors) / scale);
+
+            if (x < mapSize && y < mapSize)
             {
-                let nearby = [i];
-
-                if (i + hmSize < heightmap.length)
-                {
-                    nearby.push(i + hmSize);
-                    height = (heightmap[nearby[0]] + heightmap[nearby[1]]) / 2;
-                }
-
-                tile = pallet[tilemap[nearby[randInt(0, nearby.length - 1)]]];
+                let i = hmTile.x * hmSize + hmTile.y;
+                let tile = pallet[tilemap[i]];
+                placeTerrain(x, y, tile);
+
+                if (func)
+                    func(tile, x, y);
             }
-
-            setHeight(x, y, height / scale);
-            placeTerrain(x, y, tile);
-
-            if (func)
-                func(tile, x, y);
-
-            lastI = i;
         }