Remove ESM::LandObject dependency on ESM::Land

components/esm/esmterrain.cpp

@@ -6,6 +6,7 @@ ESM::LandData::LandData(const ESM::Land& land, int loadFlags)
     : mLoadFlags(loadFlags)
     , mSize(Constants::CellSizeInUnits)
     , mLandSize(ESM::Land::LAND_SIZE)
+    , mPlugin(land.getPlugin())
 {
     ESM::Land::LandData data;
     land.loadData(loadFlags, &data);

components/esm/esmterrain.hpp

@@ -27,6 +27,7 @@ namespace ESM
         float getMaxHeight() const { return mMaxHeight; }
         int getLandSize() const { return mLandSize; }
         int getLoadFlags() const { return mLoadFlags; }
+        int getPlugin() const { return mPlugin; }
 
     private:
         int mLoadFlags = 0;
@@ -34,6 +35,7 @@ namespace ESM
         float mMaxHeight = 0.f;
         float mSize = 0.f;
         int mLandSize = 0;
+        int mPlugin = 0;
         std::vector<float> mHeights;
         std::vector<std::int8_t> mNormals;
         std::vector<std::uint8_t> mColors;

components/esmterrain/storage.cpp

@@ -46,30 +46,21 @@ namespace ESMTerrain
         Map mMap;
     };
 
-    LandObject::LandObject()
-        : mLand(nullptr)
-    {
-    }
-
     LandObject::LandObject(const ESM4::Land* land, int loadFlags)
-        : mLand(nullptr)
+        : mData(*land, loadFlags)
-        , mData(*land, loadFlags)
     {
     }
 
     LandObject::LandObject(const ESM::Land* land, int loadFlags)
-        : mLand(land)
+        : mData(*land, loadFlags)
-        , mData(*land, loadFlags)
     {
     }
 
-    LandObject::LandObject(const LandObject& copy, const osg::CopyOp& copyop)
+    LandObject::LandObject(const LandObject& /*copy*/, const osg::CopyOp& /*copyOp*/)
-        : mLand(nullptr)
     {
+        throw std::logic_error("LandObject copy constructor is not implemented");
     }
 
-    LandObject::~LandObject() {}
-
     const float defaultHeight = ESM::Land::DEFAULT_HEIGHT;
 
     Storage::Storage(const VFS::Manager* vfs, const std::string& normalMapPattern,

components/esmterrain/storage.hpp

@@ -36,30 +36,26 @@ namespace ESMTerrain
     class LandObject : public osg::Object
     {
     public:
-        LandObject();
+        LandObject() = default;
         LandObject(const ESM::Land* land, int loadFlags);
         LandObject(const ESM4::Land* land, int loadFlags);
 
-        LandObject(const LandObject& copy, const osg::CopyOp& copyop);
-        virtual ~LandObject();
-
         META_Object(ESMTerrain, LandObject)
 
-        inline const ESM::LandData* getData(int flags) const
+        const ESM::LandData* getData(int flags) const
         {
             if ((mData.getLoadFlags() & flags) != flags)
                 return nullptr;
 
             return &mData;
         }
-        inline int getPlugin() const { return mLand->getPlugin(); }
-        inline int getLandSize() const { return mData.getLandSize(); }
-        inline int getRealSize() const { return mData.getSize(); }
 
-    private:
+        int getPlugin() const { return mData.getPlugin(); }
-        const ESM::Land* mLand;
 
+    private:
         ESM::LandData mData;
+
+        LandObject(const LandObject& copy, const osg::CopyOp& copyOp);
     };
 
     // Since plugins can define new texture palettes, we need to know the plugin index too