mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-01 16:45:35 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2417 from Capostrophic/switchnode

Browse source 
Use NiSwitchNode initial index field
This commit is contained in:
Andrei Kortunov 2019-06-09 07:41:18 +04:00 committed by GitHub
commit 747b5fbc98
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/nif/node.hpp
View file

@ -238,10 +238,12 @@ struct NiRotatingParticles : Node
// A node used as the base to switch between child nodes, such as for LOD levels. // A node used as the base to switch between child nodes, such as for LOD levels.
struct NiSwitchNode : public NiNode struct NiSwitchNode : public NiNode
{ {
unsigned int initialIndex;
void read(NIFStream *nif) void read(NIFStream *nif)
{ {
NiNode::read(nif); NiNode::read(nif);
nif->getInt(); // unknown initialIndex = nif->getUInt();
} }
}; };

4
components/nifosg/nifloader.cpp
View file

@ -629,10 +629,8 @@ namespace NifOsg
if (nifNode->recType == Nif::RC_NiSwitchNode) if (nifNode->recType == Nif::RC_NiSwitchNode)
{ {
// show only first child by default
node->asSwitch()->setSingleChildOn(0);
const Nif::NiSwitchNode* niSwitchNode = static_cast<const Nif::NiSwitchNode*>(nifNode); const Nif::NiSwitchNode* niSwitchNode = static_cast<const Nif::NiSwitchNode*>(nifNode);
node->asSwitch()->setSingleChildOn(niSwitchNode->initialIndex);
if (niSwitchNode->name == Constants::NightDayLabel && !SceneUtil::hasUserDescription(rootNode, Constants::NightDayLabel)) if (niSwitchNode->name == Constants::NightDayLabel && !SceneUtil::hasUserDescription(rootNode, Constants::NightDayLabel))
rootNode->getOrCreateUserDataContainer()->addDescription(Constants::NightDayLabel); rootNode->getOrCreateUserDataContainer()->addDescription(Constants::NightDayLabel);
else if (niSwitchNode->name == Constants::HerbalismLabel && !SceneUtil::hasUserDescription(rootNode, Constants::HerbalismLabel)) else if (niSwitchNode->name == Constants::HerbalismLabel && !SceneUtil::hasUserDescription(rootNode, Constants::HerbalismLabel))