rename esmterrain to esm3terrain

ptmikheev-master-patch-38354
Bret Curtis 3 years ago committed by Bret Curtis
parent a126e29a19
commit cdbab2325f

@ -1,10 +1,5 @@
#include "terrainstorage.hpp" #include "terrainstorage.hpp"
#include "../../model/world/land.hpp"
#include "../../model/world/landtexture.hpp"
#include <components/esmterrain/storage.hpp>
namespace CSVRender namespace CSVRender
{ {
TerrainStorage::TerrainStorage(const CSMWorld::Data &data) TerrainStorage::TerrainStorage(const CSMWorld::Data &data)

@ -3,7 +3,7 @@
#include <array> #include <array>
#include <components/esmterrain/storage.hpp> #include <components/esm3terrain/storage.hpp>
#include "../../model/world/data.hpp" #include "../../model/world/data.hpp"
@ -25,7 +25,7 @@ namespace CSVRender
private: private:
const CSMWorld::Data& mData; const CSMWorld::Data& mData;
std::array<float, ESM::Land::LAND_SIZE * ESM::Land::LAND_SIZE> mAlteredHeight; std::array<float, ESM::Land::LAND_SIZE * ESM::Land::LAND_SIZE> mAlteredHeight{};
osg::ref_ptr<const ESMTerrain::LandObject> getLand (int cellX, int cellY) override; osg::ref_ptr<const ESMTerrain::LandObject> getLand (int cellX, int cellY) override;
const ESM::LandTexture* getLandTexture(int index, short plugin) override; const ESM::LandTexture* getLandTexture(int index, short plugin) override;

@ -4,7 +4,7 @@
#include <osg/Object> #include <osg/Object>
#include <components/resource/resourcemanager.hpp> #include <components/resource/resourcemanager.hpp>
#include <components/esmterrain/storage.hpp> #include <components/esm3terrain/storage.hpp>
namespace ESM namespace ESM
{ {

@ -3,7 +3,7 @@
#include <memory> #include <memory>
#include <components/esmterrain/storage.hpp> #include <components/esm3terrain/storage.hpp>
#include <components/resource/resourcesystem.hpp> #include <components/resource/resourcesystem.hpp>

@ -90,7 +90,7 @@ add_component_dir (esm3
aisequence magiceffects custommarkerstate stolenitems transport animationstate controlsstate mappings aisequence magiceffects custommarkerstate stolenitems transport animationstate controlsstate mappings
) )
add_component_dir (esmterrain add_component_dir (esm3terrain
storage storage
) )

Loading…
Cancel
Save