mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-29 00:32:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'texturetype' into 'master'

Browse Source 
In TextureType, use osg::Object's name field

See merge request OpenMW/openmw!4143
This commit is contained in:
psi29a 2024-06-01 15:31:27 +00:00
commit 615d503731
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/sceneutil/serialize.cpp
View File

@ -145,9 +145,6 @@ namespace SceneUtil
: osgDB::ObjectWrapper(createInstanceFunc<SceneUtil::TextureType>, "SceneUtil::TextureType", : osgDB::ObjectWrapper(createInstanceFunc<SceneUtil::TextureType>, "SceneUtil::TextureType",
"osg::Object osg::StateAttribute SceneUtil::TextureType") "osg::Object osg::StateAttribute SceneUtil::TextureType")
{ {
addSerializer(new osgDB::StringSerializer<SceneUtil::TextureType>(
"Name", {}, &SceneUtil::TextureType::getName, &SceneUtil::TextureType::setName),
osgDB::BaseSerializer::RW_STRING);
} }
}; };

14
components/sceneutil/texturetype.hpp
View File

@ -11,14 +11,10 @@ namespace SceneUtil
public: public:
TextureType() = default; TextureType() = default;
TextureType(const std::string& name) TextureType(const std::string& name) { setName(name); }
: mName(name)
{
}
TextureType(const TextureType& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY) TextureType(const TextureType& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY)
: StateAttribute(copy, copyop) : StateAttribute(copy, copyop)
, mName(copy.mName)
{ {
} }
@ -30,15 +26,9 @@ namespace SceneUtil
int compare(const osg::StateAttribute& sa) const override int compare(const osg::StateAttribute& sa) const override
{ {
COMPARE_StateAttribute_Types(TextureType, sa); COMPARE_StateAttribute_Types(TextureType, sa);
COMPARE_StateAttribute_Parameter(mName); COMPARE_StateAttribute_Parameter(_name);
return 0; return 0;
} }
void setName(const std::string& name) { mName = name; }
const std::string& getName() const { return mName; }
private:
std::string mName;
}; };
} }
#endif #endif