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

NIFStream: remove getShort, getMatrix3, getQuaternion

Browse source
This commit is contained in:
Alexei Kotov 2023-09-13 21:56:02 +03:00
parent 090da90302
commit 956ede52fb
4 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
components/nif/controller.cpp
View file

@ -264,7 +264,7 @@ namespace Nif
bankDir = nif->getInt(); bankDir = nif->getInt();
maxBankAngle = nif->getFloat(); maxBankAngle = nif->getFloat();
smoothing = nif->getFloat(); smoothing = nif->getFloat();
followAxis = nif->getShort(); nif->read(followAxis);
posData.read(nif); posData.read(nif);
floatData.read(nif); floatData.read(nif);
} }
@ -507,7 +507,7 @@ namespace Nif
void NiTransformInterpolator::read(NIFStream* nif) void NiTransformInterpolator::read(NIFStream* nif)
{ {
defaultPos = nif->getVector3(); defaultPos = nif->getVector3();
defaultRot = nif->getQuaternion(); nif->read(defaultRot);
defaultScale = nif->getFloat(); defaultScale = nif->getFloat();
if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 109)) if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 109))
{ {
@ -655,7 +655,7 @@ namespace Nif
if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 109)) if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 109))
{ {
mPosValue = nif->getVector3(); mPosValue = nif->getVector3();
mRotValue = nif->getQuaternion(); nif->read(mRotValue);
mScaleValue = nif->getFloat(); mScaleValue = nif->getFloat();
if (!nif->getBoolean()) if (!nif->getBoolean())
mPosValue = osg::Vec3f(); mPosValue = osg::Vec3f();

2
components/nif/controller.hpp
View file

@ -203,7 +203,7 @@ namespace Nif
int bankDir; int bankDir;
float maxBankAngle, smoothing; float maxBankAngle, smoothing;
short followAxis; uint16_t followAxis;
void read(NIFStream* nif) override; void read(NIFStream* nif) override;
void post(Reader& nif) override; void post(Reader& nif) override;

3
components/nif/nifstream.hpp
View file

@ -149,7 +149,6 @@ namespace Nif
/// DEPRECATED: Use read() or get() /// DEPRECATED: Use read() or get()
char getChar() { return get<char>(); } char getChar() { return get<char>(); }
short getShort() { return get<short>(); }
unsigned short getUShort() { return get<unsigned short>(); } unsigned short getUShort() { return get<unsigned short>(); }
int getInt() { return get<int>(); } int getInt() { return get<int>(); }
unsigned int getUInt() { return get<unsigned int>(); } unsigned int getUInt() { return get<unsigned int>(); }
@ -157,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>(); }
Matrix3 getMatrix3() { return get<Matrix3>(); }
osg::Quat getQuaternion() { return get<osg::Quat>(); }
bool getBoolean() { return get<bool>(); } bool getBoolean() { return get<bool>(); }
std::string getString() { return get<std::string>(); } std::string getString() { return get<std::string>(); }
}; };

2
components/nif/node.cpp
View file

@ -25,7 +25,7 @@ namespace Nif
case BOX_BV: case BOX_BV:
{ {
box.center = nif->getVector3(); box.center = nif->getVector3();
box.axes = nif->getMatrix3(); nif->read(box.axes);
box.extents = nif->getVector3(); box.extents = nif->getVector3();
break; break;
} }