mirror
/
openmw
mirror of https://github.com/OpenMW/openmw.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Some more minor NIF support fixes

Browse Source
pull/2689/head
Capostrophic 5 years ago
parent 9b21249a9e
commit e363d5df21
11 changed files with 40 additions and 42 deletions
Show Stats Download Patch File Download Diff File

2
components/nif/base.hpp
Unescape Escape View File

@ -59,7 +59,7 @@ public:
controller.post(nif);
}
};
typedef Named NiSequenceStreamHelper;
using NiSequenceStreamHelper = Named;
} // Namespace
#endif

19
components/nif/controlled.cpp
Unescape Escape View File

@ -10,17 +10,18 @@ namespace Nif
Named::read(nif);
external = nif->getChar() != 0;
if(external)
bool internal = false;
if (external)
filename = nif->getString();
else
{
nif->getChar(); // always 1
internal = nif->getChar();
if (!external && internal)
data.read(nif);
}
pixel = nif->getInt();
mipmap = nif->getInt();
alpha = nif->getInt();
pixel = nif->getUInt();
mipmap = nif->getUInt();
alpha = nif->getUInt();
nif->getChar(); // always 1
}
@ -113,8 +114,4 @@ namespace Nif
mCenter = nif->getVector3();
}
}

6
components/nif/controlled.hpp
Unescape Escape View File

@ -46,13 +46,13 @@ public:
3 - Compressed
4 - Bumpmap
5 - Default */
int pixel;
unsigned int pixel;
/* Mipmap format
0 - no
1 - yes
2 - default */
int mipmap;
unsigned int mipmap;
/* Alpha
0 - none
@ -60,7 +60,7 @@ public:
2 - smooth
3 - default (use material alpha, or multiply material with texture if present)
*/
int alpha;
unsigned int alpha;
void read(NIFStream *nif);
void post(NIFFile *nif);

9
components/nif/controller.cpp
Unescape Escape View File

@ -92,6 +92,12 @@ namespace Nif
void NiMaterialColorController::read(NIFStream *nif)
{
Controller::read(nif);
// Two bits that correspond to the controlled material color.
// 00: Ambient
// 01: Diffuse
// 10: Specular
// 11: Emissive
targetColor = (flags >> 4) & 3;
data.read(nif);
}
@ -189,7 +195,8 @@ namespace Nif
{
Controller::read(nif);
data.read(nif);
nif->getChar(); // always 0
if (nif->getVersion() >= NIFFile::NIFVersion::VER_MW)
/*bool alwaysActive = */nif->getChar(); // Always 0
}
void NiGeomMorpherController::post(NIFFile *nif)

3
components/nif/controller.hpp
Unescape Escape View File

@ -78,12 +78,13 @@ public:
void read(NIFStream *nif);
void post(NIFFile *nif);
};
typedef NiParticleSystemController NiBSPArrayController;
using NiBSPArrayController = NiParticleSystemController;
class NiMaterialColorController : public Controller
{
public:
NiPosDataPtr data;
unsigned int targetColor;
void read(NIFStream *nif);
void post(NIFFile *nif);

3
components/nif/data.cpp
Unescape Escape View File

@ -225,7 +225,8 @@ void NiSkinData::read(NIFStream *nif)
trafo.scale = nif->getFloat();
int boneNum = nif->getInt();
nif->getInt(); // -1
if (nif->getVersion() >= NIFFile::NIFVersion::VER_MW && nif->getVersion() <= NIFFile::NIFVersion::VER_GAMEBRYO)
nif->skip(4); // NiSkinPartition link
bones.resize(boneNum);
for (BoneInfo &bi : bones)

2
components/nif/niffile.cpp
Unescape Escape View File

@ -143,7 +143,7 @@ void NIFFile::parse(Files::IStreamPtr stream)
ver = nif.getUInt();
// 4.0.0.0 is an older, practically identical version of the format.
// It's not used by Morrowind assets but Morrowind supports it.
if(ver != VER_4_0_0_0 && ver != VER_MW)
if(ver != nif.generateVersion(4,0,0,0) && ver != VER_MW)
fail("Unsupported NIF version: " + printVersion(ver));
// Number of records
size_t recNum = nif.getInt();

22
components/nif/niffile.hpp
Unescape Escape View File

@ -75,26 +75,16 @@ class NIFFile final : public File
void operator = (NIFFile const &);
public:
// For generic versions NIFStream::generateVersion() is used instead
enum NIFVersion
{
// Feature-relevant
VER_4_1_0_0 = 0x04010000, // 1-byte booleans (previously 4-byte)
VER_5_0_0_1 = 0x05000001, // Optimized record type listings
VER_5_0_0_6 = 0x05000006, // Record groups
VER_10_0_1_8 = 0x0A000108, // The last version without user version
VER_20_1_0_1 = 0x14010001, // String tables
VER_20_2_0_5 = 0x14020005, // Record sizes
// Game-relevant
VER_4_0_0_0 = 0x04000000, // Freedom Force NIFs, supported by Morrowind
VER_MW = 0x04000002, // 4.0.0.2. Morrowind and Freedom Force NIFs
VER_4_2_1_0 = 0x04020100, // Used in Civ4 and Dark Age of Camelot
VER_CI = 0x04020200, // 4.2.2.0. Main Culpa Innata NIF version, also used in Civ4
VER_ZT2 = 0x0A000100, // 10.0.1.0. Main Zoo Tycoon 2 NIF version, also used in Oblivion and Civ4
VER_OB_OLD = 0x0A000102, // 10.0.1.2. Main older Oblivion NIF version
VER_MW = 0x04000002, // 4.0.0.2. Main Morrowind NIF version.
VER_CI = 0x04020200, // 4.2.2.0. Main Culpa Innata NIF version, also used in Civ4.
VER_ZT2 = 0x0A000100, // 10.0.1.0. Main Zoo Tycoon 2 NIF version, also used in Oblivion and Civ4.
VER_OB_OLD = 0x0A000102, // 10.0.1.2. Main older Oblivion NIF version.
VER_GAMEBRYO = 0x0A010000, // 10.1.0.0. Lots of games use it. The first version that has Gamebryo File Format header.
VER_10_2_0_0 = 0x0A020000, // Lots of games use this version as well.
VER_CIV4 = 0x14000004, // 20.0.0.4. Main Civilization IV NIF version.
VER_OB = 0x14000005, // 20.0.0.5. Main Oblivion NIF version
VER_OB = 0x14000005, // 20.0.0.5. Main Oblivion NIF version.
VER_BGS = 0x14020007 // 20.2.0.7. Main Fallout 3/4/76/New Vegas and Skyrim/SkyrimSE NIF version.
};
enum BethVersion

6
components/nif/nifstream.hpp
Unescape Escape View File

@ -163,6 +163,12 @@ public:
unsigned int getUserVersion();
unsigned int getBethVersion();
// Convert human-readable version numbers into a number that can be compared.
uint32_t generateVersion(uint8_t major, uint8_t minor, uint8_t patch, uint8_t rev)
{
return (major << 24) + (minor << 16) + (patch << 8) + rev;
}
///Read in a string of the given length
std::string getSizedString(size_t length)
{

3
components/nif/node.hpp
Unescape Escape View File

@ -284,7 +284,8 @@ struct NiLODNode : public NiSwitchNode
void read(NIFStream *nif)
{
NiSwitchNode::read(nif);
lodCenter = nif->getVector3();
if (nif->getVersion() >= NIFFile::NIFVersion::VER_MW && nif->getVersion() <= NIFFile::NIFVersion::VER_ZT2)
lodCenter = nif->getVector3();
unsigned int numLodLevels = nif->getUInt();
for (unsigned int i=0; i<numLodLevels; ++i)
{

7
components/nifosg/nifloader.cpp
Unescape Escape View File

@ -768,12 +768,7 @@ namespace NifOsg
const Nif::NiMaterialColorController* matctrl = static_cast<const Nif::NiMaterialColorController*>(ctrl.getPtr());
if (matctrl->data.empty())
continue;
// Two bits that correspond to the controlled material color.
// 00: Ambient
// 01: Diffuse
// 10: Specular
// 11: Emissive
MaterialColorController::TargetColor targetColor = static_cast<MaterialColorController::TargetColor>((matctrl->flags >> 4) & 3);
auto targetColor = static_cast<MaterialColorController::TargetColor>(matctrl->targetColor);
osg::ref_ptr<MaterialColorController> osgctrl(new MaterialColorController(matctrl->data.getPtr(), targetColor));
setupController(matctrl, osgctrl, animflags);
composite->addController(osgctrl);

Write Preview
Loading…
Cancel
Save