mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-01 21:36:42 +00:00
Code Issues Releases Wiki Activity

Rewrite NiVertexColorProperty

Browse source
This commit is contained in:
Alexei Kotov 2023-02-10 23:37:54 +03:00
parent d39127cc3d
commit 99aa90f90c
3 changed files with 58 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
components/nif/property.cpp
View file

@ -227,10 +227,20 @@ namespace Nif
emissiveMult = nif->getFloat(); emissiveMult = nif->getFloat();
} }
void S_VertexColorProperty::read(NIFStream* nif) void NiVertexColorProperty::read(NIFStream* nif)
{ {
vertmode = nif->getInt(); Property::read(nif);
lightmode = nif->getInt(); mFlags = nif->getUShort();
if (nif->getVersion() <= NIFFile::NIFVersion::VER_OB)
{
mVertexMode = static_cast<VertexMode>(nif->getUInt());
mLightingMode = static_cast<LightMode>(nif->getUInt());
}
else
{
mVertexMode = static_cast<VertexMode>((mFlags >> 4) & 0x3);
mLightingMode = static_cast<LightMode>((mFlags >> 3) & 0x1);
}
} }
void S_AlphaProperty::read(NIFStream* nif) void S_AlphaProperty::read(NIFStream* nif)

37
components/nif/property.hpp
View file

@ -293,22 +293,6 @@ namespace Nif
void read(NIFStream* nif); void read(NIFStream* nif);
}; };
struct S_VertexColorProperty
{
/* Vertex mode:
0 - source ignore
1 - source emmisive
2 - source amb diff
Lighting mode
0 - lighting emmisive
1 - lighting emmisive ambient/diffuse
*/
int vertmode, lightmode;
void read(NIFStream* nif);
};
struct S_AlphaProperty struct S_AlphaProperty
{ {
/* /*
@ -402,9 +386,28 @@ namespace Nif
int alphaTestMode() const { return (flags >> 10) & 0x7; } int alphaTestMode() const { return (flags >> 10) & 0x7; }
}; };
struct NiVertexColorProperty : public StructPropT<S_VertexColorProperty> struct NiVertexColorProperty : public Property
{ {
enum class VertexMode : unsigned int
{
VertMode_SrcIgnore = 0,
VertMode_SrcEmissive = 1,
VertMode_SrcAmbDif = 2
};
enum class LightMode : unsigned int
{
LightMode_Emissive = 0,
LightMode_EmiAmbDif = 1
};
unsigned short mFlags;
VertexMode mVertexMode;
LightMode mLightingMode;
void read(NIFStream* nif) override;
}; };
struct NiStencilProperty : public Property struct NiStencilProperty : public Property
{ {
S_StencilProperty data; S_StencilProperty data;

34
components/nifosg/nifloader.cpp
View file

@ -2300,23 +2300,39 @@ namespace NifOsg
{ {
const Nif::NiVertexColorProperty* vertprop const Nif::NiVertexColorProperty* vertprop
= static_cast<const Nif::NiVertexColorProperty*>(property); = static_cast<const Nif::NiVertexColorProperty*>(property);
lightmode = vertprop->data.lightmode;
switch (vertprop->data.vertmode) switch (vertprop->mVertexMode)
{ {
case 0: case Nif::NiVertexColorProperty::VertexMode::VertMode_SrcIgnore:
{
mat->setColorMode(osg::Material::OFF); mat->setColorMode(osg::Material::OFF);
break; break;
case 1: }
case Nif::NiVertexColorProperty::VertexMode::VertMode_SrcEmissive:
{
mat->setColorMode(osg::Material::EMISSION); mat->setColorMode(osg::Material::EMISSION);
break; break;
case 2: }
if (lightmode != 0) case Nif::NiVertexColorProperty::VertexMode::VertMode_SrcAmbDif:
mat->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE); {
else switch (vertprop->mLightingMode)
mat->setColorMode(osg::Material::OFF); {
case Nif::NiVertexColorProperty::LightMode::LightMode_Emissive:
{
mat->setColorMode(osg::Material::OFF);
break;
}
case Nif::NiVertexColorProperty::LightMode::LightMode_EmiAmbDif:
default:
{
mat->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
break;
}
}
break; break;
}
} }
break; break;
} }
case Nif::RC_NiAlphaProperty: case Nif::RC_NiAlphaProperty: