ESSImport: work on cell fog of war

apps/essimporter/converter.cpp

@@ -37,4 +37,54 @@ namespace ESSImport
         convertImage(&data[0], data.size(), maph.size, maph.size, Ogre::PF_BYTE_RGB, "map.tga");
     }
 
+    void ConvertCell::read(ESM::ESMReader &esm)
+    {
+        ESM::Cell cell;
+        std::string id = esm.getHNString("NAME");
+        cell.load(esm, false);
+
+        Cell newcell;
+        newcell.mCell = cell;
+
+        // fog of war
+        // seems to be a 1-bit pixel format, 16*16 pixels
+        // TODO: add bleeding of FOW into neighbouring cells (openmw handles this by writing to the textures,
+        // MW handles it when rendering only)
+        unsigned char nam8[32];
+        if (esm.isNextSub("NAM8"))
+        {
+            esm.getHExact(nam8, 32);
+
+            newcell.mFogOfWar.reserve(16*16);
+            for (int x=0; x<16; ++x)
+            {
+                for (int y=0; y<16; ++y)
+                {
+                    size_t pos = x*16+y;
+                    size_t bytepos = pos/8;
+                    assert(bytepos<32);
+                    int bit = pos%8;
+                    newcell.mFogOfWar.push_back(((nam8[bytepos] >> bit) & (0x1)) ? 0xffffffff : 0x000000ff);
+                }
+            }
+
+            std::ostringstream filename;
+            filename << "fog_" << cell.mData.mX << "_" << cell.mData.mY << ".tga";
+
+            convertImage((char*)&newcell.mFogOfWar[0], newcell.mFogOfWar.size()*4, 16, 16, Ogre::PF_BYTE_RGBA, filename.str());
+        }
+
+        std::vector<CellRef> cellrefs;
+        while (esm.hasMoreSubs())
+        {
+            CellRef ref;
+            ref.load (esm);
+            if (esm.isNextSub("DELE"))
+                std::cout << "deleted ref " << ref.mIndexedRefId << std::endl;
+        }
+
+        newcell.mRefs = cellrefs;
+        mCells[id] = newcell;
+    }
+
 }

apps/essimporter/converter.hpp

@@ -8,6 +8,7 @@
 #include <components/esm/loadbook.hpp>
 #include <components/esm/loadclas.hpp>
 #include <components/esm/loadglob.hpp>
+#include <components/esm/cellstate.hpp>
 #include "importcrec.hpp"
 
 #include "importercontext.hpp"
@@ -241,20 +242,36 @@ public:
 class ConvertCell : public Converter
 {
 public:
-    virtual void read(ESM::ESMReader& esm)
+    virtual void read(ESM::ESMReader& esm);
+
+    virtual void write(ESM::ESMWriter& esm)
     {
-        ESM::Cell cell;
-        std::string id = esm.getHNString("NAME");
-        cell.load(esm, false);
-        CellRef ref;
-        while (esm.hasMoreSubs())
+        for (std::map<std::string, Cell>::const_iterator it = mCells.begin(); it != mCells.end(); ++it)
         {
-            ref.load (esm);
-            if (esm.isNextSub("DELE"))
-                std::cout << "deleted ref " << ref.mIndexedRefId << std::endl;
+            const ESM::Cell& cell = it->second.mCell;
+            esm.startRecord(ESM::REC_CSTA);
+            ESM::CellState csta;
+            csta.mHasFogOfWar = 0;
+            csta.mId = cell.getCellId();
+            csta.mId.save(esm);
+            // TODO csta.mLastRespawn;
+            // shouldn't be needed if we respawn on global schedule like in original MW
+            csta.mWaterLevel = cell.mWater;
+            csta.save(esm);
+            esm.endRecord(ESM::REC_CSTA);
         }
     }
 
+private:
+    struct Cell
+    {
+        ESM::Cell mCell;
+        std::vector<CellRef> mRefs;
+        std::vector<unsigned int> mFogOfWar;
+    };
+
+    std::map<std::string, Cell> mCells;
+
 };
 
 }

apps/essimporter/importer.cpp

@@ -99,16 +99,18 @@ namespace ESSImport
 
     void Importer::compare()
     {
-        // data that always changes should be blacklisted
+        // data that always changes (and/or is already fully decoded) should be blacklisted
         std::set<std::pair<std::string, std::string> > blacklist;
         blacklist.insert(std::make_pair("GLOB", "FLTV")); // gamehour
         blacklist.insert(std::make_pair("REFR", "DATA")); // player position
+        blacklist.insert(std::make_pair("CELL", "NAM8")); // fog of war
 
         File file1;
         read(mEssFile, file1);
         File file2;
         read(mOutFile, file2); // todo rename variable
 
+        // FIXME: use max(size1, size2)
         for (unsigned int i=0; i<file1.mRecords.size(); ++i)
         {
             File::Record rec = file1.mRecords[i];
@@ -183,8 +185,6 @@ namespace ESSImport
 
         Context context;
 
-        std::map<std::string, ESM::Global> globals;
-
         const unsigned int recREFR = ESM::FourCC<'R','E','F','R'>::value;
         const unsigned int recPCDT = ESM::FourCC<'P','C','D','T'>::value;
         const unsigned int recFMAP = ESM::FourCC<'F','M','A','P'>::value;

components/esm/loadcell.cpp

@@ -111,11 +111,6 @@ void Cell::loadData(ESMReader &esm)
     }
 
     esm.getHNT(mData, "DATA", 12);
-
-    // ess only, unknown
-    char nam8[32];
-    if (esm.isNextSub("NAM8"))
-        esm.getHExact(nam8, 32);
 }
 
 void Cell::postLoad(ESMReader &esm)