Changeset 23805

Timestamp:

09/20/13 18:29:19 (10 years ago)

Author:

nit

Message:

[titan] optimize

Location:

titan/titan

Files:

• skin.h (modified) (4 diffs)
• struct.h (modified) (1 diff)

titan/titan/skin.h

@@ -1924 +1924 @@
         int pictype = 0; //0 = png, 1 = jpg HW, 2 = jpg SW
         unsigned long tmpcol = 0;
-        unsigned char r = 0, g = 0, b = 0;
+        unsigned char r = 0, g = 0, b = 0, ralpha = 0;
 
         length = strlen(filename);
@@ -2053 +2053 @@
                                                 {
                                                         tmpcol = skinfb->fblong[x];
-                                                        alpha_composite(r, src[0], src[3], (tmpcol & 0xff0000) >> 16);
-                                                        alpha_composite(g, src[1], src[3], (tmpcol & 0x00ff00) >> 8);
-                                                        alpha_composite(b, src[2], src[3], tmpcol & 0xff);
+                                                        ralpha = 255 - src[3]; 
+                                                        alpha_composite(r, src[0], src[3], ralpha, (tmpcol & 0xff0000) >> 16);
+                                                        alpha_composite(g, src[1], src[3], ralpha, (tmpcol & 0x00ff00) >> 8);
+                                                        alpha_composite(b, src[2], src[3], ralpha, tmpcol & 0xff);
                                                         skinfb->fblong[x] = (255 << 24) | r << 16 | g << 8 | b;
                                                 }
@@ -2225 +2226 @@
         FTC_SBit sbit;
         unsigned long tmpcol = 0, tmpcol1 = 0;
-        long buffercol = 0;
         unsigned char red, green, blue, r, g, b;
         unsigned char* src = NULL;
+        unsigned char ralpha = 0;
 
         if(currentchar == 32) space = 1;
@@ -2285 +2286 @@
                 for(x = y; x < pxw; x++)
                 {
-                        buffercol = src[0];
-                        src++;
-                        if(buffercol > min)
+                        if(src[0] > min)
                         {
                                 //renderquality 255-0 = best
-                                if(buffercol > max)
+                                if(src[0] > max)
                                         skinfb->fblong[x] = tmpcol;
                                 else
                                 {
                                         tmpcol1 = skinfb->fblong[x];
-                                        alpha_composite(r, red, buffercol, (tmpcol1 & 0xff0000) >> 16);
-                                        alpha_composite(g, green, buffercol, (tmpcol1 & 0x00ff00) >> 8);
-                                        alpha_composite(b, blue, buffercol, tmpcol1 & 0xff);
+                                        ralpha = 255 - src[0]; 
+                                        alpha_composite(r, red, src[0], ralpha, (tmpcol1 & 0xff0000) >> 16);
+                                        alpha_composite(g, green, src[0], ralpha, (tmpcol1 & 0x00ff00) >> 8);
+                                        alpha_composite(b, blue, src[0], ralpha, tmpcol1 & 0xff);
                                         skinfb->fblong[x] = transparent << 24 | r << 16 | g << 8 | b;
                                 }
                         }
+                        src++;
                 }
         }

titan/titan/struct.h

@@ -175 +175 @@
 #define bcdtoint(i) ((((i & 0xf0) >> 4) * 10) + (i & 0x0f))
 
-#define alpha_composite(composite, fg, alpha, bg) { \
+#define alpha_composite(composite, fg, alpha, ralpha, bg) { \
 unsigned short temp = ((unsigned short)(fg)*(unsigned short)(alpha) +   \
-(unsigned short)(bg)*(unsigned short)(255 - (unsigned short)(alpha)) +  \
+(unsigned short)(bg)*(unsigned short)(ralpha) +  \
 (unsigned short)128);  \
 (composite) = (unsigned char)((temp + (temp >> 8)) >> 8); }