mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-19 19:11:32 +00:00
Code Issues Releases Wiki Activity

NIFStream: remove getBoolean, getString

Browse source
This commit is contained in:
Alexei Kotov 2023-09-14 01:54:27 +03:00
parent 05d8975ed1
commit b0dfd74562
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/nif/nifstream.hpp
View file

@ -156,8 +156,6 @@ namespace Nif
osg::Vec2f getVector2() { return get<osg::Vec2f>(); } osg::Vec2f getVector2() { return get<osg::Vec2f>(); }
osg::Vec3f getVector3() { return get<osg::Vec3f>(); } osg::Vec3f getVector3() { return get<osg::Vec3f>(); }
osg::Vec4f getVector4() { return get<osg::Vec4f>(); } osg::Vec4f getVector4() { return get<osg::Vec4f>(); }
bool getBoolean() { return get<bool>(); }
std::string getString() { return get<std::string>(); }
}; };
template <> template <>

8
components/nif/node.cpp
View file

@ -153,8 +153,8 @@ namespace Nif
if (nif->getVersion() < NIFStream::generateVersion(10, 0, 1, 0)) if (nif->getVersion() < NIFStream::generateVersion(10, 0, 1, 0))
return; return;
unsigned int num = 0; unsigned int num = 0;
if (nif->getVersion() <= NIFStream::generateVersion(20, 1, 0, 3)) if (nif->getVersion() <= NIFStream::generateVersion(20, 1, 0, 3) && nif->get<bool>())
num = nif->getBoolean(); // Has Shader num = 1;
else if (nif->getVersion() >= NIFStream::generateVersion(20, 2, 0, 5)) else if (nif->getVersion() >= NIFStream::generateVersion(20, 2, 0, 5))
num = nif->getUInt(); num = nif->getUInt();
@ -163,7 +163,7 @@ namespace Nif
if (nif->getVersion() >= NIFStream::generateVersion(20, 2, 0, 5)) if (nif->getVersion() >= NIFStream::generateVersion(20, 2, 0, 5))
active = nif->getUInt(); active = nif->getUInt();
if (nif->getVersion() >= NIFFile::NIFVersion::VER_BGS) if (nif->getVersion() >= NIFFile::NIFVersion::VER_BGS)
needsUpdate = nif->getBoolean(); nif->read(needsUpdate);
} }
void NiGeometry::read(NIFStream* nif) void NiGeometry::read(NIFStream* nif)
@ -210,7 +210,7 @@ namespace Nif
nearDist = nif->getFloat(); nearDist = nif->getFloat();
farDist = nif->getFloat(); farDist = nif->getFloat();
if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0)) if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
orthographic = nif->getBoolean(); nif->read(orthographic);
vleft = nif->getFloat(); vleft = nif->getFloat();
vright = nif->getFloat(); vright = nif->getFloat();
vtop = nif->getFloat(); vtop = nif->getFloat();

4
components/nif/property.cpp
View file

@ -8,7 +8,7 @@ namespace Nif
void NiTexturingProperty::Texture::read(NIFStream* nif) void NiTexturingProperty::Texture::read(NIFStream* nif)
{ {
inUse = nif->getBoolean(); nif->read(inUse);
if (!inUse) if (!inUse)
return; return;
@ -36,7 +36,7 @@ namespace Nif
nif->skip(2); // Unknown short nif->skip(2); // Unknown short
else if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0)) else if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
{ {
if (nif->getBoolean()) // Has texture transform if (nif->get<bool>()) // Has texture transform
{ {
nif->getVector2(); // UV translation nif->getVector2(); // UV translation
nif->getVector2(); // UV scale nif->getVector2(); // UV scale