Changeset 9882 for ps

Timestamp:

07/19/11 10:52:17 (13 years ago)

Author:

ben

Message:

Removes hacks for typed array initialization

Location:

ps/trunk/binaries/data/mods/public/maps/random/rmgen

Files:

• map.js (modified) (5 diffs)
• painter.js (modified) (2 diffs)
• placer.js (modified) (2 diffs)
• tileclass.js (modified) (2 diffs)

ps/trunk/binaries/data/mods/public/maps/random/rmgen/map.js

@@ -21 +21 @@
     for (var i = 0; i < size; i++)
     {
-        this.texture[i] = new Uint16Array(Math.floor(size));    // uint16 - texture IDs // HACK: typed arrays require integer arguments
+        this.texture[i] = new Uint16Array(size);    // uint16 - texture IDs
         this.terrainObjects[i] = new Array(size);               // array of entities
-        this.area[i] = new Uint16Array(Math.floor(size));       // uint16 - area IDs    // HACK: typed arrays require integer arguments
+        this.area[i] = new Uint16Array(size);       // uint16 - area IDs
         
         for (var j = 0; j < size; j++)
@@ -36 +36 @@
     for (var i = 0; i < mapSize; i++)
     {
-        this.height[i] = new Float32Array(Math.floor(mapSize));     // float32  // HACK: typed arrays require integer arguments
+        this.height[i] = new Float32Array(mapSize);     // float32
         
         for (var j = 0; j < mapSize; j++)
@@ -98 +98 @@
     if (g_MapSettings.CircularMap)
     {   // Within map circle
-        var halfSize = 0.5*this.size;
+        var halfSize = Math.floor(0.5*this.size);
         var dx = (x - halfSize);
         var dz = (z - halfSize);
-        return Math.sqrt(dx*dx + dz*dz) < (halfSize - 1.5);
+        return Math.round(Math.sqrt(dx*dx + dz*dz)) < halfSize;
     }
     else
@@ -301 +301 @@
     //  Flat because it's easier to handle by the engine
     var mapSize = size+1;
-    var height16 = new Uint16Array(Math.floor(mapSize*mapSize));    // uint16   // HACK: typed arrays require integer arguments
+    var height16 = new Uint16Array(mapSize*mapSize);    // uint16
     for (var x = 0; x < mapSize; x++)
     {
@@ -333 +333 @@
     
     //  Convert 2D tile data to flat array
-    var tileIndex = new Uint16Array(Math.floor(size*size));     // uint16   // HACK: typed arrays require integer arguments
-    var tilePriority = new Uint16Array(Math.floor(size*size));  // uint16   // HACK: typed arrays require integer arguments
+    var tileIndex = new Uint16Array(size*size);     // uint16
+    var tilePriority = new Uint16Array(size*size);  // uint16
     for (var x = 0; x < size; x++)
     {

ps/trunk/binaries/data/mods/public/maps/random/rmgen/painter.js

@@ -70 +70 @@
     for (var i = 0; i < size; ++i)
     {
-        saw[i] = new Uint8Array(Math.floor(size));      // bool / uint8 // HACK: typed arrays require integer arguments
-        dist[i] = new Uint16Array(Math.floor(size));    // uint16   // HACK: typed arrays require integer arguments
+        saw[i] = new Uint8Array(size);      // bool / uint8
+        dist[i] = new Uint16Array(size);    // uint16
     }
 
@@ -222 +222 @@
     for (var i = 0; i < mapSize; ++i)
     {
-        saw[i] = new Uint8Array(Math.floor(mapSize));           // bool / uint8 // HACK: typed arrays require integer arguments
-        dist[i] = new Uint16Array(Math.floor(mapSize));         // uint16   // HACK: typed arrays require integer arguments
-        gotHeightPt[i] = new Uint8Array(Math.floor(mapSize));   // bool / uint8 // HACK: typed arrays require integer arguments
-        newHeight[i] = new Float32Array(Math.floor(mapSize));   // float32  // HACK: typed arrays require integer arguments
+        saw[i] = new Uint8Array(mapSize);           // bool / uint8
+        dist[i] = new Uint16Array(mapSize);         // uint16
+        gotHeightPt[i] = new Uint8Array(mapSize);   // bool / uint8
+        newHeight[i] = new Float32Array(mapSize);   // float32
     }
     

ps/trunk/binaries/data/mods/public/maps/random/rmgen/placer.js

@@ -36 +36 @@
     for (var i = 0; i < size; ++i)
     {
-        gotRet[i] = new Uint8Array(Math.floor(size));           // bool / uint8 // HACK: typed arrays require integer arguments
+        gotRet[i] = new Uint8Array(size);           // bool / uint8
     }
     
@@ -50 +50 @@
     }
     
-    var noise = new Float32Array(Math.floor(intPerim));         //float32   // HACK: typed arrays require integer arguments
-    var ctrlCoords = new Float32Array(Math.floor(ctrlPts+1));   //float32   // HACK: typed arrays require integer arguments
-    var ctrlVals = new Float32Array(Math.floor(ctrlPts+1));     //float32   // HACK: typed arrays require integer arguments
+    var noise = new Float32Array(intPerim);         //float32
+    var ctrlCoords = new Float32Array(ctrlPts+1);   //float32
+    var ctrlVals = new Float32Array(ctrlPts+1);     //float32
 
     // Generate some interpolated noise

ps/trunk/binaries/data/mods/public/maps/random/rmgen/tileclass.js

@@ -14 +14 @@
     }
     
-    this.vals = new Int16Array(Math.floor(2*this.nn));  // int16    // HACK: typed arrays require integer arguments
+    this.vals = new Int16Array(2*this.nn);  // int16
 }
 
@@ -79 +79 @@
     for (var i=0; i < size; ++i)
     {
-        this.inclusionCount[i] = new Int16Array(Math.floor(size)); //int16  // HACK: typed arrays require integer arguments
+        this.inclusionCount[i] = new Int16Array(size); //int16
         this.rangeCount[i] = new RangeOp(size);
     }