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

Adjust third person camera height based on character height

Browse source
This commit is contained in:
scrawl 2015-11-09 17:30:11 +01:00
parent 64abdbabe3
commit 1b52749ae1
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/openmw/mwrender/camera.cpp
View file

@ -42,7 +42,8 @@ namespace MWRender
{ {
Camera::Camera (osg::Camera* camera) Camera::Camera (osg::Camera* camera)
: mCamera(camera), : mHeightScale(1.f),
mCamera(camera),
mAnimation(NULL), mAnimation(NULL),
mFirstPersonView(true), mFirstPersonView(true),
mPreviewMode(false), mPreviewMode(false),
@ -93,7 +94,7 @@ namespace MWRender
osg::Vec3d position = worldMat.getTrans(); osg::Vec3d position = worldMat.getTrans();
if (!isFirstPerson()) if (!isFirstPerson())
position.z() += mHeight; position.z() += mHeight * mHeightScale;
return position; return position;
} }
@ -372,11 +373,17 @@ namespace MWRender
mTrackingNode = mAnimation->getNode("Camera"); mTrackingNode = mAnimation->getNode("Camera");
if (!mTrackingNode) if (!mTrackingNode)
mTrackingNode = mAnimation->getNode("Head"); mTrackingNode = mAnimation->getNode("Head");
mHeightScale = 1.f;
} }
else else
{ {
mAnimation->setViewMode(NpcAnimation::VM_Normal); mAnimation->setViewMode(NpcAnimation::VM_Normal);
mTrackingNode = mTrackingPtr.getRefData().getBaseNode(); osg::PositionAttitudeTransform* transform = mTrackingPtr.getRefData().getBaseNode();
mTrackingNode = transform;
if (transform)
mHeightScale = mTrackingPtr.getRefData().getBaseNode()->getScale().z();
else
mHeightScale = 1.f;
} }
rotateCamera(getPitch(), getYaw(), false); rotateCamera(getPitch(), getYaw(), false);
} }

3
apps/openmw/mwrender/camera.hpp
View file

@ -29,6 +29,7 @@ namespace MWRender
MWWorld::Ptr mTrackingPtr; MWWorld::Ptr mTrackingPtr;
osg::ref_ptr<const osg::Node> mTrackingNode; osg::ref_ptr<const osg::Node> mTrackingNode;
float mHeightScale;
osg::ref_ptr<osg::Camera> mCamera; osg::ref_ptr<osg::Camera> mCamera;
@ -97,6 +98,8 @@ namespace MWRender
bool isFirstPerson() const bool isFirstPerson() const
{ return !(mVanity.enabled || mPreviewMode || !mFirstPersonView); } { return !(mVanity.enabled || mPreviewMode || !mFirstPersonView); }
void updateScale();
void processViewChange(); void processViewChange();
void update(float duration, bool paused=false); void update(float duration, bool paused=false);

3
apps/openmw/mwrender/renderingmanager.cpp
View file

@ -439,6 +439,9 @@ namespace MWRender
void RenderingManager::scaleObject(const MWWorld::Ptr &ptr, const osg::Vec3f &scale) void RenderingManager::scaleObject(const MWWorld::Ptr &ptr, const osg::Vec3f &scale)
{ {
ptr.getRefData().getBaseNode()->setScale(scale); ptr.getRefData().getBaseNode()->setScale(scale);
if (ptr == mCamera->getTrackingPtr()) // update height of camera
mCamera->processViewChange();
} }
void RenderingManager::removeObject(const MWWorld::Ptr &ptr) void RenderingManager::removeObject(const MWWorld::Ptr &ptr)