mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-03 17:39:42 +00:00
Code Issues Releases Wiki Activity

Rename nif/controlled to nif/texture

Browse source
This commit is contained in:
Alexei Kotov 2023-08-31 18:59:33 +03:00
parent 4a88726aba
commit fb8ead2bd4
9 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/CMakeLists.txt
View file

@ -103,7 +103,7 @@ add_component_dir (sceneutil
) )
add_component_dir (nif add_component_dir (nif
base controlled controller data effect extra niffile nifkey nifstream niftypes node particle physics property record record_ptr base controller data effect extra niffile nifkey nifstream niftypes node particle physics property record record_ptr texture
) )
add_component_dir (nifosg add_component_dir (nifosg

2
components/nif/controller.cpp
View file

@ -1,9 +1,9 @@
#include "controller.hpp" #include "controller.hpp"
#include "controlled.hpp"
#include "data.hpp" #include "data.hpp"
#include "node.hpp" #include "node.hpp"
#include "particle.hpp" #include "particle.hpp"
#include "texture.hpp"
namespace Nif namespace Nif
{ {

2
components/nif/effect.cpp
View file

@ -1,7 +1,7 @@
#include "effect.hpp" #include "effect.hpp"
#include "controlled.hpp"
#include "node.hpp" #include "node.hpp"
#include "texture.hpp"
namespace Nif namespace Nif
{ {

2
components/nif/niffile.cpp
View file

@ -10,7 +10,6 @@
#include <sstream> #include <sstream>
#include <stdexcept> #include <stdexcept>
#include "controlled.hpp"
#include "controller.hpp" #include "controller.hpp"
#include "data.hpp" #include "data.hpp"
#include "effect.hpp" #include "effect.hpp"
@ -20,6 +19,7 @@
#include "particle.hpp" #include "particle.hpp"
#include "physics.hpp" #include "physics.hpp"
#include "property.hpp" #include "property.hpp"
#include "texture.hpp"
namespace Nif namespace Nif
{ {

2
components/nif/property.cpp
View file

@ -1,7 +1,7 @@
#include "property.hpp" #include "property.hpp"
#include "controlled.hpp"
#include "data.hpp" #include "data.hpp"
#include "texture.hpp"
namespace Nif namespace Nif
{ {

2
components/nif/controlled.cpp → components/nif/texture.cpp
View file

@ -1,4 +1,4 @@
#include "controlled.hpp" #include "texture.hpp"
#include "data.hpp" #include "data.hpp"

10
components/nif/controlled.hpp → components/nif/texture.hpp
View file

@ -1,12 +1,16 @@
#ifndef OPENMW_COMPONENTS_NIF_CONTROLLED_HPP #ifndef OPENMW_COMPONENTS_NIF_TEXTURE_HPP
#define OPENMW_COMPONENTS_NIF_CONTROLLED_HPP #define OPENMW_COMPONENTS_NIF_TEXTURE_HPP
#include "base.hpp" #include "base.hpp"
namespace Nif namespace Nif
{ {
struct NiSourceTexture : public Named struct NiTexture : public Named
{
};
struct NiSourceTexture : public NiTexture
{ {
// Is this an external (references a separate texture file) or // Is this an external (references a separate texture file) or
// internal (data is inside the nif itself) texture? // internal (data is inside the nif itself) texture?

3
components/nifosg/nifloader.cpp
View file

@ -42,13 +42,14 @@
#include <osg/TexEnvCombine> #include <osg/TexEnvCombine>
#include <osg/Texture2D> #include <osg/Texture2D>
#include <components/nif/controlled.hpp>
#include <components/nif/effect.hpp> #include <components/nif/effect.hpp>
#include <components/nif/exception.hpp> #include <components/nif/exception.hpp>
#include <components/nif/extra.hpp> #include <components/nif/extra.hpp>
#include <components/nif/niffile.hpp> #include <components/nif/niffile.hpp>
#include <components/nif/node.hpp> #include <components/nif/node.hpp>
#include <components/nif/particle.hpp>
#include <components/nif/property.hpp> #include <components/nif/property.hpp>
#include <components/nif/texture.hpp>
#include <components/sceneutil/depth.hpp> #include <components/sceneutil/depth.hpp>
#include <components/sceneutil/morphgeometry.hpp> #include <components/sceneutil/morphgeometry.hpp>
#include <components/sceneutil/riggeometry.hpp> #include <components/sceneutil/riggeometry.hpp>

1
components/nifosg/particle.cpp
View file

@ -9,7 +9,6 @@
#include <components/debug/debuglog.hpp> #include <components/debug/debuglog.hpp>
#include <components/misc/rng.hpp> #include <components/misc/rng.hpp>
#include <components/nif/controlled.hpp>
#include <components/nif/data.hpp> #include <components/nif/data.hpp>
#include <components/sceneutil/morphgeometry.hpp> #include <components/sceneutil/morphgeometry.hpp>
#include <components/sceneutil/riggeometry.hpp> #include <components/sceneutil/riggeometry.hpp>