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

Remove last remnants of deprecated NIFStream methods

Browse source
This commit is contained in:
Alexei Kotov 2023-09-17 22:43:02 +03:00
parent c551f23667
commit defe5ba5e7
2 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
components/nif/effect.cpp
View file

@ -26,27 +26,27 @@ namespace Nif
{ {
NiDynamicEffect::read(nif); NiDynamicEffect::read(nif);
mDimmer = nif->getFloat(); nif->read(mDimmer);
mAmbient = nif->getVector3(); nif->read(mAmbient);
mDiffuse = nif->getVector3(); nif->read(mDiffuse);
mSpecular = nif->getVector3(); nif->read(mSpecular);
} }
void NiPointLight::read(NIFStream* nif) void NiPointLight::read(NIFStream* nif)
{ {
NiLight::read(nif); NiLight::read(nif);
mConstantAttenuation = nif->getFloat(); nif->read(mConstantAttenuation);
mLinearAttenuation = nif->getFloat(); nif->read(mLinearAttenuation);
mQuadraticAttenuation = nif->getFloat(); nif->read(mQuadraticAttenuation);
} }
void NiSpotLight::read(NIFStream* nif) void NiSpotLight::read(NIFStream* nif)
{ {
NiPointLight::read(nif); NiPointLight::read(nif);
mCutoff = nif->getFloat(); nif->read(mCutoff);
mExponent = nif->getFloat(); nif->read(mExponent);
} }
void NiTextureEffect::read(NIFStream* nif) void NiTextureEffect::read(NIFStream* nif)

10
components/nif/nifstream.hpp
View file

@ -146,16 +146,6 @@ namespace Nif
/// Read a sequence of null-terminated strings /// Read a sequence of null-terminated strings
std::string getStringPalette(); std::string getStringPalette();
/// DEPRECATED: Use read() or get()
char getChar() { return get<char>(); }
unsigned short getUShort() { return get<unsigned short>(); }
int getInt() { return get<int>(); }
unsigned int getUInt() { return get<unsigned int>(); }
float getFloat() { return get<float>(); }
osg::Vec2f getVector2() { return get<osg::Vec2f>(); }
osg::Vec3f getVector3() { return get<osg::Vec3f>(); }
osg::Vec4f getVector4() { return get<osg::Vec4f>(); }
}; };
template <> template <>