Added assertions to Camera so that we can catch the camera getting stuck bug
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5575 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
parent
8c62806938
commit
c19280e6d1
@ -133,7 +133,8 @@ void Camera::setupCamera()
|
|||||||
m_camera->setFOV(m_fov);
|
m_camera->setFOV(m_fov);
|
||||||
m_camera->setAspectRatio(m_aspect);
|
m_camera->setAspectRatio(m_aspect);
|
||||||
m_camera->setFarValue(World::getWorld()->getTrack()->getCameraFar());
|
m_camera->setFarValue(World::getWorld()->getTrack()->getCameraFar());
|
||||||
} // setupCamera
|
|
||||||
|
} // setupCamera
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
/** Sets the mode of the camera.
|
/** Sets the mode of the camera.
|
||||||
@ -149,6 +150,10 @@ void Camera::setMode(Mode mode)
|
|||||||
computeNormalCameraPosition(&wanted_position, &wanted_target);
|
computeNormalCameraPosition(&wanted_position, &wanted_target);
|
||||||
m_camera->setPosition(wanted_position.toIrrVector());
|
m_camera->setPosition(wanted_position.toIrrVector());
|
||||||
m_camera->setTarget(wanted_target.toIrrVector());
|
m_camera->setTarget(wanted_target.toIrrVector());
|
||||||
|
assert(!isnan(m_camera->getPosition().X));
|
||||||
|
assert(!isnan(m_camera->getPosition().Y));
|
||||||
|
assert(!isnan(m_camera->getPosition().Z));
|
||||||
|
|
||||||
}
|
}
|
||||||
if(mode==CM_FINAL)
|
if(mode==CM_FINAL)
|
||||||
{
|
{
|
||||||
@ -190,6 +195,10 @@ void Camera::setInitialTransform()
|
|||||||
+ core::vector3df(0, 25, -50) );
|
+ core::vector3df(0, 25, -50) );
|
||||||
m_camera->setRotation(core::vector3df(0, 0, 0));
|
m_camera->setRotation(core::vector3df(0, 0, 0));
|
||||||
m_camera->setRotation( core::vector3df( 0.0f, 0.0f, 0.0f ) );
|
m_camera->setRotation( core::vector3df( 0.0f, 0.0f, 0.0f ) );
|
||||||
|
|
||||||
|
assert(!isnan(m_camera->getPosition().X));
|
||||||
|
assert(!isnan(m_camera->getPosition().Y));
|
||||||
|
assert(!isnan(m_camera->getPosition().Z));
|
||||||
} // setInitialTransform
|
} // setInitialTransform
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
@ -209,6 +218,10 @@ void Camera::smoothMoveCamera(float dt, const Vec3 &wanted_position,
|
|||||||
m_camera->setPosition(current_position);
|
m_camera->setPosition(current_position);
|
||||||
m_camera->setTarget(current_target);
|
m_camera->setTarget(current_target);
|
||||||
|
|
||||||
|
assert(!isnan(m_camera->getPosition().X));
|
||||||
|
assert(!isnan(m_camera->getPosition().Y));
|
||||||
|
assert(!isnan(m_camera->getPosition().Z));
|
||||||
|
|
||||||
if (race_manager->getNumLocalPlayers() < 2)
|
if (race_manager->getNumLocalPlayers() < 2)
|
||||||
{
|
{
|
||||||
sfx_manager->positionListener(current_position, current_target - current_position);
|
sfx_manager->positionListener(current_position, current_target - current_position);
|
||||||
|
Loading…
Reference in New Issue
Block a user