quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove MIN use

Browse Source
This commit is contained in:
Garux 2019-08-23 14:40:45 +03:00
parent 49d1c98d81
commit da7c72547b
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
radiant/xywindow.cpp
View File

@ -265,7 +265,7 @@ void XYWnd::ZoomIn(){
// we don't go below a zoom factor corresponding to 10% of the max world size // we don't go below a zoom factor corresponding to 10% of the max world size
// (this has to be computed against the window size) // (this has to be computed against the window size)
void XYWnd::ZoomOut(){ void XYWnd::ZoomOut(){
float min_scale = MIN( Width(), Height() ) / ( 1.1f * ( g_MaxWorldCoord - g_MinWorldCoord ) ); float min_scale = std::min( Width(), Height() ) / ( 1.1f * ( g_MaxWorldCoord - g_MinWorldCoord ) );
float scale = Scale() * 4.0f / 5.0f; float scale = Scale() * 4.0f / 5.0f;
if ( scale < min_scale ) { if ( scale < min_scale ) {
if ( Scale() != min_scale ) { if ( Scale() != min_scale ) {
@ -296,13 +296,8 @@ void XYWnd::FocusOnBounds( AABB& bounds ){
SetOrigin( bounds.origin ); SetOrigin( bounds.origin );
int nDim1 = ( m_viewType == YZ ) ? 1 : 0; int nDim1 = ( m_viewType == YZ ) ? 1 : 0;
int nDim2 = ( m_viewType == XY ) ? 1 : 2; int nDim2 = ( m_viewType == XY ) ? 1 : 2;
if( bounds.extents[ nDim1 ] < 128.f ) SetScale( std::min( Width() / ( 3.f * std::max( 128.f, bounds.extents[ nDim1 ] ) ),
bounds.extents[ nDim1 ] = 128.f; Height() / ( 3.f * std::max( 128.f, bounds.extents[ nDim2 ] ) ) ) );
if( bounds.extents[ nDim2 ] < 128.f )
bounds.extents[ nDim2 ] = 128.f;
float scale1 = Width() / ( 3.f * bounds.extents[ nDim1 ] );
float scale2 = Height() / ( 3.f * bounds.extents[ nDim2 ] );
SetScale( MIN( scale1, scale2 ) );
} }