teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

fix SkaManager issue

Browse source
This commit is contained in:
greye 2012-08-15 15:17:35 +04:00
parent 783e81afc3
commit 575244bd35
3 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
apps/openmw/mwrender/player.cpp
View file

@ -31,8 +31,6 @@ namespace MWRender
mCameraNode->attachObject(mCamera); mCameraNode->attachObject(mCamera);
mCameraNode->setPosition(0.f, 0.f, mHeight); mCameraNode->setPosition(0.f, 0.f, mHeight);
mPlayerNode->setVisible(false);
mPreviewCam.yaw = 0.f; mPreviewCam.yaw = 0.f;
mPreviewCam.offset = 600.f; mPreviewCam.offset = 600.f;
} }
@ -142,12 +140,11 @@ namespace MWRender
if (mFirstPersonView) { if (mFirstPersonView) {
mCamera->setPosition(0.f, 0.f, 0.f); mCamera->setPosition(0.f, 0.f, 0.f);
mCameraNode->setPosition(0.f, 0.f, 128.f); mCameraNode->setPosition(0.f, 0.f, 128.f);
mPlayerNode->setVisible(false);
} else { } else {
mCamera->setPosition(0.f, 0.f, mCameraDistance); mCamera->setPosition(0.f, 0.f, mCameraDistance);
mCameraNode->setPosition(0.f, 0.f, 104.f); mCameraNode->setPosition(0.f, 0.f, 104.f);
mPlayerNode->setVisible(true);
} }
mPlayerNode->setVisible(!mFirstPersonView, false);
} }
void Player::allowVanityMode(bool allow) void Player::allowVanityMode(bool allow)
@ -173,7 +170,7 @@ namespace MWRender
float offset = 300.f; float offset = 300.f;
Ogre::Vector3 rot(0.f, 0.f, 0.f); Ogre::Vector3 rot(0.f, 0.f, 0.f);
if (mVanity.enabled) { if (mVanity.enabled) {
mPlayerNode->setVisible(true); mPlayerNode->setVisible(true, false);
rot.x = Ogre::Degree(-30.f).valueRadians(); rot.x = Ogre::Degree(-30.f).valueRadians();
mMainCam.offset = mCamera->getPosition().z; mMainCam.offset = mCamera->getPosition().z;
@ -183,9 +180,7 @@ namespace MWRender
offset = mMainCam.offset; offset = mMainCam.offset;
moveCameraNode(mPlayerNode); moveCameraNode(mPlayerNode);
} mPlayerNode->setVisible(!mFirstPersonView, false);
if (offset == 0.f) {
mPlayerNode->setVisible(false);
} }
rot.z = getYaw(); rot.z = getYaw();
mCamera->setPosition(0.f, 0.f, offset); mCamera->setPosition(0.f, 0.f, offset);
@ -202,7 +197,7 @@ namespace MWRender
mPreviewMode = enable; mPreviewMode = enable;
float offset = mCamera->getPosition().z; float offset = mCamera->getPosition().z;
if (mPreviewMode) { if (mPreviewMode) {
mPlayerNode->setVisible(true); mPlayerNode->setVisible(true, false);
mMainCam.offset = offset; mMainCam.offset = offset;
offset = mPreviewCam.offset; offset = mPreviewCam.offset;
@ -212,9 +207,7 @@ namespace MWRender
offset = mMainCam.offset; offset = mMainCam.offset;
moveCameraNode(mPlayerNode); moveCameraNode(mPlayerNode);
} mPlayerNode->setVisible(!mFirstPersonView, false);
if (offset == 0.f) {
mPlayerNode->setVisible(false);
} }
mCamera->setPosition(0.f, 0.f, offset); mCamera->setPosition(0.f, 0.f, offset);
rotateCamera(Ogre::Vector3(getPitch(), 0.f, getYaw()), false); rotateCamera(Ogre::Vector3(getPitch(), 0.f, getYaw()), false);
@ -300,6 +293,12 @@ namespace MWRender
} }
} }
void Player::setAnimation(NpcAnimation *anim)
{
mAnimation = anim;
mPlayerNode->setVisible(!mFirstPersonView, false);
}
void Player::setHeight(float height) void Player::setHeight(float height)
{ {
mHeight = height; mHeight = height;

4
apps/openmw/mwrender/player.hpp
View file

@ -86,9 +86,7 @@ namespace MWRender
void setCameraDistance(float dist, bool adjust = false); void setCameraDistance(float dist, bool adjust = false);
void setAnimation(MWRender::NpcAnimation *anim) { void setAnimation(MWRender::NpcAnimation *anim);
mAnimation = anim;
}
void setHeight(float height); void setHeight(float height);
float getHeight(); float getHeight();

2
apps/openmw/mwrender/sky.cpp
View file

@ -405,6 +405,8 @@ void SkyManager::update(float duration)
{ {
if (!mEnabled) return; if (!mEnabled) return;
mRootNode->setPosition(mCamera->getPosition());
// UV Scroll the clouds // UV Scroll the clouds
mCloudAnimationTimer += duration * mCloudSpeed * (MWBase::Environment::get().getWorld()->getTimeScaleFactor()/30.f); mCloudAnimationTimer += duration * mCloudSpeed * (MWBase::Environment::get().getWorld()->getTimeScaleFactor()/30.f);
sh::Factory::getInstance().setSharedParameter ("cloudAnimationTimer", sh::Factory::getInstance().setSharedParameter ("cloudAnimationTimer",