mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-04 05:56:39 +00:00
Code Issues Releases Wiki Activity

First/Third person transitions with mouse wheel

Browse source
This commit is contained in:
Sebastian Wick 2013-07-29 16:43:16 +02:00
parent 3fa4a194a7
commit d2b7cb5bb2
3 changed files with 40 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,7 +25,9 @@ namespace MWRender
mHeight(128.f), mHeight(128.f),
mCameraDistance(300.f), mCameraDistance(300.f),
mDistanceAdjusted(false), mDistanceAdjusted(false),
mAnimation(NULL) mAnimation(NULL),
mNearest(30.f),
mFurthest(800.f)
{ {
mVanity.enabled = false; mVanity.enabled = false;
mVanity.allowed = true; mVanity.allowed = true;
@ -232,16 +234,21 @@ namespace MWRender
if(mFirstPersonView && !mPreviewMode && !mVanity.enabled) if(mFirstPersonView && !mPreviewMode && !mVanity.enabled)
return; return;
mIsFurthest = false;
mIsNearest = false;
Ogre::Vector3 v(0.f, 0.f, dist); Ogre::Vector3 v(0.f, 0.f, dist);
if (adjust) { if (adjust) {
v += mCamera->getPosition(); v += mCamera->getPosition();
} }
if (v.z > 800.f) { if (v.z >= mFurthest) {
v.z = 800.f; v.z = mFurthest;
} else if (v.z < 10.f) { mIsFurthest = true;
} else if (!override && v.z < 10.f) {
v.z = 10.f; v.z = 10.f;
} else if (override && v.z < 50.f) { } else if (override && v.z <= mNearest) {
v.z = 50.f; v.z = mNearest;
mIsNearest = true;
} }
mCamera->setPosition(v); mCamera->setPosition(v);
@ -320,4 +327,14 @@ namespace MWRender
{ {
return mPreviewMode || mVanity.enabled; return mPreviewMode || mVanity.enabled;
} }
bool Camera::isNearest()
{
return mIsNearest;
}
bool Camera::isFurthest()
{
return mIsFurthest;
}
} }

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

@ -33,6 +33,10 @@ namespace MWRender
bool mFirstPersonView; bool mFirstPersonView;
bool mPreviewMode; bool mPreviewMode;
bool mFreeLook; bool mFreeLook;
float mNearest;
float mFurthest;
bool mIsNearest;
bool mIsFurthest;
struct { struct {
bool enabled, allowed; bool enabled, allowed;
@ -99,6 +103,10 @@ namespace MWRender
void togglePlayerLooking(bool enable); void togglePlayerLooking(bool enable);
bool isVanityOrPreviewModeEnabled(); bool isVanityOrPreviewModeEnabled();
bool isNearest();
bool isFurthest();
}; };
} }

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

@ -903,8 +903,16 @@ void RenderingManager::setCameraDistance(float dist, bool adjust, bool override)
{ {
if(!mCamera->isVanityOrPreviewModeEnabled() && !mCamera->isFirstPerson()) if(!mCamera->isVanityOrPreviewModeEnabled() && !mCamera->isFirstPerson())
{ {
if(mCamera->isNearest() && dist > 0.f)
mCamera->toggleViewMode();
else
mCamera->setCameraDistance(-dist / 120.f * 10, adjust, override); mCamera->setCameraDistance(-dist / 120.f * 10, adjust, override);
} }
else if(mCamera->isFirstPerson() && dist < 0.f)
{
mCamera->toggleViewMode();
mCamera->setCameraDistance(0.f, false, override);
}
} }
void RenderingManager::getInteriorMapPosition (Ogre::Vector2 position, float& nX, float& nY, int &x, int& y) void RenderingManager::getInteriorMapPosition (Ogre::Vector2 position, float& nX, float& nY, int &x, int& y)