Changeset 9664 for ps

Timestamp:

06/26/11 04:56:54 (14 years ago)

Author:

ben

Message:

Changes terrain data returned by CMapGenerator to typed arrays, instead of an array of objects (this greatly reduces the size of the serialized data)

Location:

ps/trunk

Files:

• binaries/data/mods/public/maps/random/rmgen/map.js (modified) (3 diffs)
• source/graphics/MapReader.cpp (modified) (3 diffs)
• source/scriptinterface/ScriptConversions.cpp (modified) (3 diffs)

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

@@ -301 +301 @@
     //  Flat because it's easier to handle by the engine
     var mapSize = size+1;
-    var height16 = new Array(mapSize*mapSize);      // uint16
+    var height16 = new Uint16Array(mapSize*mapSize);        // uint16
     for (var x = 0; x < mapSize; x++)
     {
@@ -333 +333 @@
     
     //  Convert 2D tile data to flat array
-    var tiles = new Array(size*size);
+    var tileIndex = new Uint16Array(size*size);
+    var tilePriority = new Uint16Array(size*size);
     for (var x = 0; x < size; x++)
     {
@@ -339 +340 @@
         {
             // TODO: For now just use the texture's index as priority, might want to do this another way
-            tiles[z*size + x] = { "idx": this.texture[x][z], "priority": this.texture[x][z] };
-        }
-    }
-    data["tileData"] = tiles;
+            tileIndex[z*size + x] = this.texture[x][z];
+            tilePriority[z*size + x] = this.texture[x][z];
+        }
+    }
+    data["tileData"] = {"index": tileIndex, "priority": tilePriority};
     
     return data;

ps/trunk/source/graphics/MapReader.cpp

@@ -1141 +1141 @@
     // parse terrain from map data
     //  an error here should stop the loading process
-#define GET_TERRAIN_PROPERTY(prop, out)\
-    if (!pSimulation2->GetScriptInterface().GetProperty(m_MapData.get(), #prop, out))\
+#define GET_TERRAIN_PROPERTY(val, prop, out)\
+    if (!pSimulation2->GetScriptInterface().GetProperty(val, #prop, out))\
         {   LOGERROR(L"CMapReader::ParseTerrain() failed to get '%hs' property", #prop);\
             throw PSERROR_Game_World_MapLoadFailed("Error parsing terrain data.\nCheck application log for details"); }
 
     u32 size;
-    GET_TERRAIN_PROPERTY(size, size)
+    GET_TERRAIN_PROPERTY(m_MapData.get(), size, size)
 
     m_PatchesPerSide = size / PATCH_SIZE;
 
     // flat heightmap of u16 data
-    GET_TERRAIN_PROPERTY(height, m_Heightmap)
+    GET_TERRAIN_PROPERTY(m_MapData.get(), height, m_Heightmap)
 
     // load textures
     std::vector<std::string> textureNames;
-    GET_TERRAIN_PROPERTY(textureNames, textureNames)
+    GET_TERRAIN_PROPERTY(m_MapData.get(), textureNames, textureNames)
     num_terrain_tex = textureNames.size();
 
@@ -1171 +1171 @@
     m_Tiles.resize(SQR(size));
 
-    // flat array of tile descriptors
-    std::vector<CMapIO::STileDesc> tileData;
-    GET_TERRAIN_PROPERTY(tileData, tileData)
-
-    ENSURE(SQR(size) == tileData.size());
+    CScriptValRooted tileData;
+    GET_TERRAIN_PROPERTY(m_MapData.get(), tileData, tileData)
+
+    // parse tile data object into flat arrays
+    std::vector<u16> tileIndex;
+    std::vector<u16> tilePriority;
+    GET_TERRAIN_PROPERTY(tileData.get(), index, tileIndex);
+    GET_TERRAIN_PROPERTY(tileData.get(), priority, tilePriority);
+
+    ENSURE(SQR(size) == tileIndex.size() && SQR(size) == tilePriority.size());
 
     // reorder by patches and store
@@ -1187 +1192 @@
             size_t offY = y % PATCH_SIZE;
             
-            m_Tiles[(patchY * m_PatchesPerSide + patchX) * SQR(PATCH_SIZE) + (offY * PATCH_SIZE + offX)] = tileData[y*size + x];
+            STileDesc tile;
+            tile.m_Tex1Index = tileIndex[y*size + x];
+            tile.m_Priority = tilePriority[y*size + x];
+
+            m_Tiles[(patchY * m_PatchesPerSide + patchX) * SQR(PATCH_SIZE) + (offY * PATCH_SIZE + offX)] = tile;
         }
     }

ps/trunk/source/scriptinterface/ScriptConversions.cpp

@@ -21 +21 @@
 
 #include "graphics/Entity.h"
-#include "graphics/MapIO.h"
 #include "ps/utf16string.h"
 #include "ps/CLogger.h"
@@ -165 +164 @@
         FAIL("Failed to read Entity.orientation property");
 
-    return true;
-}
-
-template<> bool ScriptInterface::FromJSVal<CMapIO::STileDesc>(JSContext* cx, jsval v, CMapIO::STileDesc& out)
-{
-    JSObject* obj;
-    if (!JS_ValueToObject(cx, v, &obj) || obj == NULL)
-        FAIL("Argument must be an object");
-
-    jsval texIdx, priority;
-    if (!JS_GetProperty(cx, obj, "idx", &texIdx) || !FromJSVal(cx, texIdx, out.m_Tex1Index))
-        FAIL("Failed to read CMapIO::STileDesc.m_Tex1Index property");
-    if (!JS_GetProperty(cx, obj, "priority", &priority) || !FromJSVal(cx, priority, out.m_Priority))
-        FAIL("Failed to read CMapIO::STileDesc.m_Priority property");
-    
     return true;
 }
@@ -349 +333 @@
     return FromJSVal_vector(cx, v, out);
 }
-
-template<> bool ScriptInterface::FromJSVal<std::vector<CMapIO::STileDesc> >(JSContext* cx, jsval v, std::vector<CMapIO::STileDesc>& out)
-{
-    return FromJSVal_vector(cx, v, out);
-}