Make sure the player node's visibility cascades

This commit is contained in:
Chris Robinson 2013-01-30 02:38:50 -08:00
parent 04d4c125ba
commit 600d3bf9eb

View file

@ -129,11 +129,8 @@ namespace MWRender
MWBase::Environment::get().getWindowManager ()->showCrosshair MWBase::Environment::get().getWindowManager ()->showCrosshair
(!MWBase::Environment::get().getWindowManager ()->isGuiMode () && (mFirstPersonView && !mVanity.enabled && !mPreviewMode)); (!MWBase::Environment::get().getWindowManager ()->isGuiMode () && (mFirstPersonView && !mVanity.enabled && !mPreviewMode));
mPlayerNode->setVisible( /// \fixme We shouldn't hide the whole model, just certain components of the character (head, chest, feet, etc)
mVanity.enabled || mPreviewMode || !mFirstPersonView, mPlayerNode->setVisible(mVanity.enabled || mPreviewMode || !mFirstPersonView);
false
);
if (mFirstPersonView && !mVanity.enabled) { if (mFirstPersonView && !mVanity.enabled) {
return; return;
} }
@ -310,10 +307,7 @@ namespace MWRender
delete mAnimation; delete mAnimation;
mAnimation = anim; mAnimation = anim;
mPlayerNode->setVisible( mPlayerNode->setVisible(mVanity.enabled || mPreviewMode || !mFirstPersonView);
mVanity.enabled || mPreviewMode || !mFirstPersonView,
false
);
} }
void Player::setHeight(float height) void Player::setHeight(float height)