diff options
| author | Bret Curtis <bret.curtis@gmail.com> | 2022-01-22 23:52:08 +0100 |
|---|---|---|
| committer | Bret Curtis <psi29a@gmail.com> | 2022-01-23 17:19:30 +0100 |
| commit | cdbab2325f3ed96c3f14ad1bcd325306b7532d47 (patch) | |
| tree | da5e66220d804ba24424fb2e39eb7cdfff4bbb39 | |
| parent | a126e29a19565d731488528aca97c712344ac739 (diff) | |
rename esmterrain to esm3terrain
| -rw-r--r-- | apps/opencs/view/render/terrainstorage.cpp | 5 | ||||
| -rw-r--r-- | apps/opencs/view/render/terrainstorage.hpp | 4 | ||||
| -rw-r--r-- | apps/openmw/mwrender/landmanager.hpp | 2 | ||||
| -rw-r--r-- | apps/openmw/mwrender/terrainstorage.hpp | 2 | ||||
| -rw-r--r-- | components/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | components/esm3terrain/storage.cpp (renamed from components/esmterrain/storage.cpp) | 0 | ||||
| -rw-r--r-- | components/esm3terrain/storage.hpp (renamed from components/esmterrain/storage.hpp) | 0 |
7 files changed, 5 insertions, 10 deletions
diff --git a/apps/opencs/view/render/terrainstorage.cpp b/apps/opencs/view/render/terrainstorage.cpp index 035c073567..c015a6d620 100644 --- a/apps/opencs/view/render/terrainstorage.cpp +++ b/apps/opencs/view/render/terrainstorage.cpp @@ -1,10 +1,5 @@ #include "terrainstorage.hpp" -#include "../../model/world/land.hpp" -#include "../../model/world/landtexture.hpp" - -#include <components/esmterrain/storage.hpp> - namespace CSVRender { TerrainStorage::TerrainStorage(const CSMWorld::Data &data) diff --git a/apps/opencs/view/render/terrainstorage.hpp b/apps/opencs/view/render/terrainstorage.hpp index 762eb80036..d9320d72f3 100644 --- a/apps/opencs/view/render/terrainstorage.hpp +++ b/apps/opencs/view/render/terrainstorage.hpp @@ -3,7 +3,7 @@ #include <array> -#include <components/esmterrain/storage.hpp> +#include <components/esm3terrain/storage.hpp> #include "../../model/world/data.hpp" @@ -25,7 +25,7 @@ namespace CSVRender private: 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; const ESM::LandTexture* getLandTexture(int index, short plugin) override; diff --git a/apps/openmw/mwrender/landmanager.hpp b/apps/openmw/mwrender/landmanager.hpp index f3cc860854..e4b068eb76 100644 --- a/apps/openmw/mwrender/landmanager.hpp +++ b/apps/openmw/mwrender/landmanager.hpp @@ -4,7 +4,7 @@ #include <osg/Object> #include <components/resource/resourcemanager.hpp> -#include <components/esmterrain/storage.hpp> +#include <components/esm3terrain/storage.hpp> namespace ESM { diff --git a/apps/openmw/mwrender/terrainstorage.hpp b/apps/openmw/mwrender/terrainstorage.hpp index 90bf42b841..edea556157 100644 --- a/apps/openmw/mwrender/terrainstorage.hpp +++ b/apps/openmw/mwrender/terrainstorage.hpp @@ -3,7 +3,7 @@ #include <memory> -#include <components/esmterrain/storage.hpp> +#include <components/esm3terrain/storage.hpp> #include <components/resource/resourcesystem.hpp> diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index 1f70091247..9ab2c4b34f 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -90,7 +90,7 @@ add_component_dir (esm3 aisequence magiceffects custommarkerstate stolenitems transport animationstate controlsstate mappings ) -add_component_dir (esmterrain +add_component_dir (esm3terrain storage ) diff --git a/components/esmterrain/storage.cpp b/components/esm3terrain/storage.cpp index 4d3f3c3059..4d3f3c3059 100644 --- a/components/esmterrain/storage.cpp +++ b/components/esm3terrain/storage.cpp diff --git a/components/esmterrain/storage.hpp b/components/esm3terrain/storage.hpp index a2ac625c6c..a2ac625c6c 100644 --- a/components/esmterrain/storage.hpp +++ b/components/esm3terrain/storage.hpp |