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

Remove some unused methods

Browse source
This commit is contained in:
Chris Robinson 2013-07-23 01:37:41 -07:00
parent ec575200e3
commit ef17fdeb15
3 changed files with 13 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -302,34 +302,13 @@ namespace MWRender
} }
} }
float Camera::getHeight() void Camera::getPosition(Ogre::Vector3 &focal, Ogre::Vector3 &camera)
{
if(mCamera->isParentTagPoint())
{
Ogre::TagPoint *tag = static_cast<Ogre::TagPoint*>(mCamera->getParentNode());
return tag->_getFullLocalTransform().getTrans().z;
}
return mCamera->getParentNode()->getPosition().z;
}
bool Camera::getPosition(Ogre::Vector3 &player, Ogre::Vector3 &camera)
{ {
mCamera->getParentSceneNode()->needUpdate(true); mCamera->getParentSceneNode()->needUpdate(true);
camera = mCamera->getRealPosition(); camera = mCamera->getRealPosition();
player = mTrackingPtr.getRefData().getBaseNode()->getPosition(); focal = Ogre::Vector3((mCamera->getParentNode()->_getFullTransform() *
Ogre::Vector4(0.0f, 0.0f, 0.0f, 1.0f)).ptr());
return mFirstPersonView && !mVanity.enabled && !mPreviewMode;
}
Ogre::Vector3 Camera::getPosition()
{
return mTrackingPtr.getRefData().getBaseNode()->getPosition();
}
void Camera::getSightAngles(float &pitch, float &yaw)
{
pitch = mMainCam.pitch;
yaw = mMainCam.yaw;
} }
void Camera::togglePlayerLooking(bool enable) void Camera::togglePlayerLooking(bool enable)

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

@ -93,14 +93,8 @@ namespace MWRender
void setAnimation(NpcAnimation *anim); void setAnimation(NpcAnimation *anim);
float getHeight(); /// Stores focal and camera world positions in passed arguments
void getPosition(Ogre::Vector3 &focal, Ogre::Vector3 &camera);
/// Stores player and camera world positions in passed arguments
/// \return true if camera at the eye-place
bool getPosition(Ogre::Vector3 &player, Ogre::Vector3 &camera);
Ogre::Vector3 getPosition();
void getSightAngles(float &pitch, float &yaw);
void togglePlayerLooking(bool enable); void togglePlayerLooking(bool enable);

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

@ -323,18 +323,18 @@ void RenderingManager::update (float duration, bool paused)
// player position // player position
MWWorld::RefData &data = player.getRefData(); MWWorld::RefData &data = player.getRefData();
float *_playerPos = data.getPosition().pos; Ogre::Vector3 playerPos(data.getPosition().pos);
Ogre::Vector3 playerPos(_playerPos[0], _playerPos[1], _playerPos[2]);
Ogre::Vector3 orig, dest; mCamera->setCameraDistance();
if(!mCamera->getPosition(orig, dest)) if(!mCamera->isFirstPerson())
{ {
orig.z += mCamera->getHeight() * mRootNode->getScale().z; Ogre::Vector3 orig, dest;
mCamera->getPosition(orig, dest);
btVector3 btOrig(orig.x, orig.y, orig.z); btVector3 btOrig(orig.x, orig.y, orig.z);
btVector3 btDest(dest.x, dest.y, dest.z); btVector3 btDest(dest.x, dest.y, dest.z);
std::pair<bool, float> test = mPhysicsEngine->sphereCast(mRendering.getCamera()->getNearClipDistance()*2.5, btOrig, btDest); std::pair<bool,float> test = mPhysicsEngine->sphereCast(mRendering.getCamera()->getNearClipDistance()*2.5, btOrig, btDest);
if (test.first) if(test.first)
mCamera->setCameraDistance(test.second * orig.distance(dest), false, false); mCamera->setCameraDistance(test.second * orig.distance(dest), false, false);
} }