Changeset 15391

Timestamp:

04/28/12 15:12:18 (11 years ago)

Author:

nit

Message:

[titan] fix autoscale

File:

• titan/titan/skin.h (modified) (1 diff)

titan/titan/skin.h

@@ -1356 +1356 @@
 void calcautoscale(int width, int height, int mwidth, int mheight, int* scalewidth, int* scaleheight)
 {
-        if(width < mwidth && height < mheight && height > 0)
+        float srcRatio = (float)width / (float)height;
+        float dstRatio = (float)mwidth / (float)mheight;
+
+        if(dstRatio > srcRatio)
         {
                 *scaleheight = mheight;
-                *scalewidth = width * (mheight / height);
-                
-                if(*scalewidth > mwidth && width > 0)
-                {
-                        *scalewidth = mwidth;
-                        *scaleheight = height * (mwidth / width);
-                }                               
-        }
-        else if(width < mwidth && height > mheight && mheight > 0 && (height / mheight) > 0)
-        {
-                *scaleheight = mheight;
-                *scalewidth = width / (height / mheight);
-        }
-        else if(width > mwidth && height < mheight && mwidth > 0 && (width / mwidth) > 0)
+                *scalewidth = mheight * srcRatio;
+        }
+        else
         {
                 *scalewidth = mwidth;
-                *scaleheight = height / (width / mwidth);
-        }
-        else if(width > mwidth && height > mheight && mheight > 0 && (height / mheight) > 0)
-        {
-                *scaleheight = mheight;
-                *scalewidth = width / (height / mheight);
-                
-                if(*scalewidth > mwidth && mwidth > 0 && (width / mwidth) > 0)
-                {
-                        *scalewidth = mwidth;
-                        *scaleheight = height / (width / mwidth);
-                }
+                *scaleheight = mwidth / srcRatio;
         }
 }