Skip to content

Commit

Permalink
Merge branch 'v2-3' into v3-0
Browse files Browse the repository at this point in the history
darksylinc committed Dec 7, 2024
2 parents 75643c3 + 8ebfbfe commit 7574d04
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions OgreMain/src/OgreFrustum.cpp
Original file line number Diff line number Diff line change
@@ -351,7 +351,7 @@ namespace Ogre
top = mTop;
bottom = mBottom;

if( mFrustrumExtentsType == FET_TAN_HALF_ANGLES )
if( mFrustrumExtentsType == FET_TAN_HALF_ANGLES && mProjType != PT_ORTHOGRAPHIC )
{
left *= mNearDist;
right *= mNearDist;
@@ -1355,15 +1355,16 @@ namespace Ogre
FrustrumExtentsType frustrumExtentsType ) const
{
updateFrustum();
if( frustrumExtentsType == FET_TAN_HALF_ANGLES && mFrustrumExtentsType == FET_PROJ_PLANE_POS )
if( frustrumExtentsType == FET_TAN_HALF_ANGLES && mFrustrumExtentsType == FET_PROJ_PLANE_POS &&
mProjType != PT_ORTHOGRAPHIC )
{
outleft = mLeft / mNearDist;
outright = mRight / mNearDist;
outtop = mTop / mNearDist;
outbottom = mBottom / mNearDist;
}
else if( frustrumExtentsType == FET_PROJ_PLANE_POS &&
mFrustrumExtentsType == FET_TAN_HALF_ANGLES )
mFrustrumExtentsType == FET_TAN_HALF_ANGLES && mProjType != PT_ORTHOGRAPHIC )
{
outleft = mLeft * mNearDist;
outright = mRight * mNearDist;

0 comments on commit 7574d04

Please sign in to comment.