Changeset 23808

Timestamp:

09/20/13 22:28:03 (10 years ago)

Author:

nit

Message:

[titan] optimize gradient

File:

• titan/titan/skin.h (modified) (10 diffs)

titan/titan/skin.h

@@ -2675 +2675 @@
 void drawgradient(int posx, int posy, int width, int height, long col1, long col2, int transparent, int flag)
 {
-        int p = 0, i = 0, x = 0, y = 0, steps = 0, xstep = 0, ystep = 0;
+        int p, i, x, y, steps, xstep, ystep, tmp = 0;
         int xcount = 0, ycount = 0, owidth = width, oheight = height;
         unsigned char r3, g3, b3;
@@ -2685 +2685 @@
         {
                 if(flag == LEFTMIDDLE) width = width / 2;
+                if(width < 10)
+                        steps = width;
                 if(width < 100)
-                        steps = width;
+                        steps = width / 2;
                 else
                         steps = width / 5;
@@ -2695 +2697 @@
         {
                 if(flag == TOPMIDDLE) height = height / 2;
-                if(height < 100)
+                if(height < 10)
                         steps = height;
+                else if(height < 100)
+                        steps = height / 2;
                 else
                         steps = height / 5;
@@ -2710 +2714 @@
         unsigned char g2 = (col2 >> 8) & 0xff;
         unsigned char b2 = col2 & 0xff;
+
+        int yend = (posy + ystep) * skinfb->width;
+        int xend = posx + xstep;
+        posy *= skinfb->width;
 
         for(i = 0; i < steps; i++)
@@ -2718 +2726 @@
                 b3 = (b1 * p + b2 * i) / steps;
                 col = (transparent << 24) | (r3 << 16) | (g3 << 8) | b3;
-        
-                for(y = 0; y < ystep; y++)
-                        for(x = 0; x < xstep; x++)
-                                drawpixel(posx + x, posy + y, col);
+                
+                for(y = posy; y < yend; y += skinfb->width)
+                        for(x = posx; x < xend; x++)
+                                drawpixelfast(x, y, col);
 
                 if(flag == LEFTRIGHT || flag == LEFTMIDDLE)
@@ -2727 +2735 @@
                         posx += xstep;
                         xcount += xstep;
+                        xend = posx + xstep;
                 }
                 else 
                 {
-                        posy += ystep;
+                        tmp = ystep * skinfb->width;
+                        posy += tmp;
                         ycount += ystep;
+                        yend = posy + tmp;
                 }
         }
@@ -2745 +2756 @@
                         col = (transparent << 24) | (r3 << 16) | (g3 << 8) | b3;
                 
-                        for(y = 0; y < ystep; y++)
-                                for(x = 0; x < xstep; x++)
-                                        drawpixel(posx + x, posy + y, col);
+                        for(y = posy; y < yend; y += skinfb->width)
+                                for(x = posx; x < xend; x++)
+                                        drawpixelfast(x, y, col);
                         
                         if(flag == LEFTMIDDLE)
@@ -2753 +2764 @@
                                 posx += xstep;
                                 xcount += xstep;
+                                xend = posx + xstep;
                         }
                         else 
                         {
-                                posy += ystep;
+                                tmp = ystep * skinfb->width;
+                                posy += tmp;
                                 ycount += ystep;
+                                yend = posy + tmp;
                         }
                 }
@@ -2766 +2780 @@
                 if(owidth > xcount)
                 {
-                        int tmp = owidth - xcount;
-                        for(y = 0; y < ystep; y++)
-                                for(x = 0; x < tmp; x++)
-                                        drawpixel(posx + x, posy + y, col);
+                        int tmp = posx + (owidth - xcount);
+                        for(y = posy; y < yend; y += skinfb->width)
+                                for(x = posx; x < tmp; x++)
+                                        drawpixelfast(x, y, col);
                 }
         }
@@ -2776 +2790 @@
                 if(oheight > ycount)
                 {
-                        int tmp = oheight - ycount;
-                        for(y = 0; y < tmp; y++)
-                                for(x = 0; x < xstep; x++)
-                                        drawpixel(posx + x, posy + y, col);
+                        int tmp = posy + ((oheight - ycount) * skinfb->width);
+                        for(y = posy; y < tmp; y += skinfb->width)
+                                for(x = posx; x < xend; x++)
+                                        drawpixelfast(x, y, col);
                 }
         }