Merging r6364 through r6379 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6380 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
@@ -265,6 +265,9 @@ void CCameraSceneNode::render()
|
||||
//! update
|
||||
void CCameraSceneNode::updateMatrices()
|
||||
{
|
||||
#if defined(_IRR_COMPILE_WITH_90_DEGREE_CAMERA)
|
||||
ViewArea.getTransform(video::ETS_VIEW).buildCameraLookAtMatrixLH(getAbsolutePosition(), Target, UpVector);
|
||||
#else
|
||||
core::vector3df pos = getAbsolutePosition();
|
||||
core::vector3df tgtv = Target - pos;
|
||||
tgtv.normalize();
|
||||
@@ -282,6 +285,7 @@ void CCameraSceneNode::updateMatrices()
|
||||
}
|
||||
|
||||
ViewArea.getTransform(video::ETS_VIEW).buildCameraLookAtMatrixLH(pos, Target, up);
|
||||
#endif
|
||||
ViewArea.getTransform(video::ETS_VIEW) *= Affector;
|
||||
recalculateViewArea();
|
||||
}
|
||||
|
Reference in New Issue
Block a user