Changeset 60:e16e13d8cd68

Timestamp:

12/18/09 20:41:38 (2 years ago)

Author:

Thibaut GIRKA <thib@…>

Branch:

default

Message:

Replaced SATURATE -> ADD, implemented objComposite, corrected minor things

Files:

• scn2k/scn2k_grp.cc (modified) (7 diffs)
• scn2k/scn2k_grp.h (modified) (1 diff)
• scn2k/scn2k_grpimpl.cc (modified) (8 diffs)
• window/picture.cc (modified) (17 diffs)
• window/picture.h (modified) (1 diff)
• window/render.cc (modified) (4 diffs)
• window/render.h (modified) (1 diff)

scn2k/scn2k_grp.cc

@@ -169 +169 @@
         if (picture == NULL) return;
         if (attr & UPDATE_POS) {
-                if ( (attr & SATURATE) || zoom != -1) {
+                if (zoom != -1) {
                         int w=0, h=0;
                         GetSrcGeom(w,h);
@@ -239 +239 @@
                         picture->SetSurfaceRect(Rect(0,0,width,height));
                 }
-                if (attr & SATURATE)
-                        picture->SetSurfaceAttribute(PicBase::BLIT_SATURATE);
+                if (attr & BLIT_ADD)
+                        picture->SetSurfaceAttribute(PicBase::BLIT_ADD);
         } else if (gtype == MOJI) { // ¥Æ¥­¥¹¥ÈÉÁ²è
                 if (print_moji.length() == 0) return;
@@ -397 +397 @@
         }
 
-        picture->SetSurfaceAttribute(PicBase::BLIT_SATURATE);
-        attr = Attribute(attr | UPDATE_POS | SATURATE);
+        attr = Attribute(attr | UPDATE_POS);
 
         const char* buf = data + 16;
@@ -632 +631 @@
         RegisterCommand(1, 33, 1201, "recFill", (CmdImpl) &Grp::impl_recFill);
         RegisterCommand(1, 33, 1100, "recCopy", (CmdImpl) &Grp::impl_recCopy);
-        RegisterCommand(1, 33, 1101, "recMaskCopy", NULL); //FIXME
+        RegisterCommand(1, 33, 1101, "recMaskCopy", NULL); //TODO: Same thing as recCopy, but using source's alpha
         RegisterCommand(1, 33, 1600, "recAdd", (CmdImpl) &Grp::impl_recAdd);
         RegisterCommand(1, 33, 406, "grpPan", (CmdImpl) &Grp::impl_grpPan);
@@ -735 +734 @@
         RegisterCommand(1, 81, 1020, "objColLevel", NULL);
         RegisterCommand(1, 82, 1020, "objBgColLevel", NULL);
-        RegisterCommand(1, 81, 1021, "objComposite", NULL);//(CmdImpl) &Grp::impl_objComposite); //FIXME: May be broken
+        RegisterCommand(1, 81, 1021, "objComposite", (CmdImpl) &Grp::impl_objComposite); //FIXME: May be broken
         RegisterCommand(1, 82, 1021, "objBgComposite", (CmdImpl) &Grp::impl_objComposite);
         RegisterCommand(1, 81, 1024, "objSetText", (CmdImpl) &Grp::impl_objSetText);
@@ -1554 +1553 @@
 
         //TODO: ???
-        if (cmd.cmd1 == 1 && cmd.cmd2 == 0x3c && cmd.cmd3 == 0) { // ??? : KANOGI : ²èÁü¥ª¥Ö¥ž¥§¥¯¥È€Îºïœü¡©
+        if (cmd.cmd1 == 1 && cmd.cmd2 == 60 && cmd.cmd3 == 0) { // ??? : KANOGI : ²èÁü¥ª¥Ö¥ž¥§¥¯¥È€Îºïœü¡©
                 DeleteObjPic(cmd.args[0].value); // µì¥Õ¥¡¥€¥ëÌŸ€Îsurface€òºïœü
                 GrpObj& g = grpobj[cmd.args[0].value];
@@ -1561 +1560 @@
         }
 
-        //TODO: ???
-        if ( (cmd.cmd1 == 1 || cmd.cmd1 == 2) && cmd.cmd2 == 0x51) {
-                /*GrpObj& g = grpobj[cmd.args[0].value];
-                int attr;
-                GrpObjMap::iterator it;
-                for (it = g.children_obj.begin(); it != g.children_obj.end(); it++)
-                        attr |= it->second.attr;
-                if (attr & GrpObj::UPDATE_ALL)
-                        SetObjChanged(cmd.args[0].value);*/
+        // Refresh changed objects...
+        //FIXME: should may be go away?
+        //Seems it'll work only for objects in the foreground
+        if ( (cmd.cmd1 == 1 || cmd.cmd1 == 2) && cmd.cmd2 == 81) {
                 GrpObj* g;
                 if (cmd.cmd1 == 2)

scn2k/scn2k_grp.h

@@ -82 +82 @@
         vector<Rect> src_pos;
         enum GrpType { FILLRECT = 1, FILE = 2, GAN = 3, MOJI = 4, DIGIT = 5} gtype;
-        enum Attribute { NONE=0, WIPEON=1, SATURATE=2, HIDDEN=4,
+        enum Attribute { NONE=0, WIPEON=1, BLIT_ADD=2, HIDDEN=4,
                 UPDATE_PICTURE = 16, UPDATE_POS = 32, UPDATE_ALPHA = 64, UPDATE_SNUM = 128, UPDATE_CLIP = 256, UPDATE_VISIBLE = 512,
                 UPDATE_ALL = (UPDATE_PICTURE | UPDATE_POS | UPDATE_ALPHA | UPDATE_SNUM | UPDATE_CLIP | UPDATE_VISIBLE),

scn2k/scn2k_grpimpl.cc

@@ -157 +157 @@
 
 void Grp::impl_recCopy(Cmd& cmd) {
+        //TODO: Handle forms 0 and 1
         int sx = cmd.args[0].value;
         int sy = cmd.args[1].value;
@@ -174 +175 @@
                 cmd.cmd_type = CMD_SAVECMDGRP;
         }
-
         else if (cmd.cmd4 == 3) { // alpha ぀きcopy
                 unsigned char alpha;
@@ -193 +193 @@
 
 void Grp::impl_recAdd(Cmd& cmd) {
-        if (cmd.cmd4 == 3) { // saturate mode で alpha 付き copy
+        if (cmd.cmd4 == 3) { // add mode で alpha 付き copy
                 int sx = cmd.args[0].value;
                 int sy = cmd.args[1].value;
@@ -207 +207 @@
                 else if (cmd.args[8].value > 255) alpha = 255;
                 else alpha = cmd.args[8].value;
-                eprintf("copy surface w/ saturate %d:(%d,%d) size(%d,%d) -> %d:(%d,%d)\n",src,sx,sy,w,h,dest,dx,dy);
+                eprintf("copy surface w/ add %d:(%d,%d) size(%d,%d) -> %d:(%d,%d)\n",src,sx,sy,w,h,dest,dx,dy);
                 if (src == dest) {
                         DSurfaceMove(Ssurface(src), rect, Dsurface(WORKPDT), rect);
@@ -213 +213 @@
                 }
                 if (alpha != 0) {
-                        // saturate mode : screen (picture) を䞀時的に䜜成
+                        // add mode : screen (picture) を䞀時的に䜜成
                         PicBase* screen_tmp = parent.create_leaf(Rect(0, 0, parent.Width(), parent.Height()), 0);
-                        screen_tmp->SetSurface(Ssurface(src), 0, 0, PicBase::BLIT_SATURATE);
+                        screen_tmp->SetSurface(Ssurface(src), 0, 0, PicBase::BLIT_ADD);
                         screen_tmp->SetSurfaceRect(rect);
                         screen_tmp->Move(dx, dy);
@@ -351 +351 @@
 
         if (cmd.cmd3 == 1000) { /* ファむル名蚭定 */
-                g->gtype = GrpObj::FILE; //FIXME: Strange thing in the main menu; that happens with objComposite
+                g->gtype = GrpObj::FILE;
                 string name = cmd.Str(cmd.args[base_argc + 1]);
                 if (name.find('?') != -1) {//TODO
@@ -519 +519 @@
         int base_arg = 0;
         GrpObj* g = GetGraphicObjVarMode(cmd, base_arg, (cmd.cmd2 == 0x51));
-
         if (cmd.args[base_arg + 1].value == 1) {
-                g->attr = GrpObj::Attribute(g->attr | GrpObj::SATURATE);
+                g->attr = GrpObj::Attribute(g->attr | GrpObj::BLIT_ADD);
                 cmd.clear();
         } else if (cmd.args[base_arg + 1].value == 0) {
-                g->attr = GrpObj::Attribute(g->attr & (~GrpObj::SATURATE));
+                g->attr = GrpObj::Attribute(g->attr & (~GrpObj::BLIT_ADD));
                 cmd.clear();
         }
@@ -768 +767 @@
         }
 }
+

window/picture.cc

@@ -42 +42 @@
 using namespace std;
 
-int print_blit = 0;
 /* render.cc */
 void DSurfaceBlitAlpha(Surface* src_o, const Rect& srcrect_o, Surface* dst_o, const Rect& dstrect_o, const unsigned char* alpha, const Rect& alpharect);
-void DSurfaceBlitSaturate(Surface* src_o, const Rect& srcrect, Surface* dst_o, const Rect& dstrect, unsigned char alpha);
+void DSurfaceBlitAdd(Surface* src_o, const Rect& srcrect, Surface* dst_o, const Rect& dstrect, unsigned char alpha);
 void DSurfaceBlitMultiply(Surface* src_o, const Rect& srcrect, Surface* dst_o, const Rect& dstrect);
 void DSurfaceFill(Surface* src, const Rect& rect, int r, int g, int b, int a=0xff); // ¥¯¥ê¥¢
@@ -181 +180 @@
         Rect abs_r = QueryAbsPos(rpos);
         Rect ppos = parent_pos(rpos);
-if(print_blit) fprintf(stderr,"back.");
         if (parent) parent->BlitBack(z_pos, ppos);
-if(print_blit) fprintf(stderr,"self.");
         if (!is_hidden_now) Blit(rpos);
-if(print_blit) fprintf(stderr,"front.");
         if (parent) parent->BlitFront(z_pos, ppos);
-if(print_blit) fprintf(stderr,"end.");
 }
 
@@ -325 +320 @@
         surface_alpha = 0;
         surface_alpha_rect = Rect(0,0);
-        attribute &= ~(BLIT_SATURATE | BLIT_MULTIPLY);
+        attribute &= ~(BLIT_ADD | BLIT_MULTIPLY);
         if (surface_own) {
                 int key = SDL_MapRGB( ((SDL_Surface*)surface_own)->format, r, g, b);
@@ -403 +398 @@
                 root->DeleteSurface(surface_own);
         }
-        attribute &= ~(SURFACE_FREE | BLIT_SATURATE | BLIT_MULTIPLY | NO_PICTURE | SOLID);
+        attribute &= ~(SURFACE_FREE | BLIT_ADD | BLIT_MULTIPLY | NO_PICTURE | SOLID);
         attribute |= new_attr;
         surface_own = new_surface;
@@ -470 +465 @@
 
 void PicBase::SetSurfaceAttribute(int new_attribute) {
-        attribute &= ~(BLIT_SATURATE | BLIT_MULTIPLY);
-        attribute |= new_attribute & (BLIT_SATURATE | BLIT_MULTIPLY);
-        if (new_attribute & (BLIT_SATURATE | BLIT_MULTIPLY)) {
+        attribute &= ~(BLIT_ADD | BLIT_MULTIPLY);
+        attribute |= new_attribute & (BLIT_ADD | BLIT_MULTIPLY);
+        if (new_attribute & (BLIT_ADD | BLIT_MULTIPLY)) {
                 rel_solid_area = Rect(0,0);
         }
@@ -540 +535 @@
                 Rect apos = (*z)->QueryAbsPos(cpos);
                 Rect draw_rpos = (*z)->parent_pos(cpos);
-if(print_blit) fprintf(stderr,"cahce.");
                 root->BlitSurface(surface_back, draw_rpos, root->surface, apos);
                 goto self_redraw;
@@ -547 +541 @@
         if (parent) {
                 Rect ppos = parent_pos(rpos);
-if(print_blit) fprintf(stderr,"parent-back.");
                 parent->BlitBack(z_pos, ppos);
         }
         if (is_hidden_now) return;
 self_redraw:
-if(print_blit) fprintf(stderr,"back-self.");
         BlitSelf(rpos); // »Ò€ÏÉÁ²è€»€º¡¢Œ«Ê¬€À€±ÉÁ²è
 children_redraw:
@@ -565 +557 @@
 
 void PicContainer::BlitChildren(Rect rpos) {
-if (print_blit) fprintf(stderr,"bc.");
         iterator end = children.end();
         for (iterator it = children.begin(); it != end; it++) {
-if ( (*it)->is_hidden_now) if(print_blit) fprintf(stderr,"bch %p;",*it);
                 if ( (*it)->is_hidden_now) continue;
                 if ( (*it)->rel_pos.is_crossed(rpos)) {
@@ -602 +592 @@
         Rect apos = QueryAbsPos(rpos);
         // ɬÍ׀˱þ€ž€ÆÊÝž¡¢ÉÁ²è
-if(print_blit) fprintf(stderr,"self-back.");
         if (attribute & CACHE_BACK) root->BlitSurface(root->surface, apos, surface_back, rpos);
         if (! (attribute & NO_PICTURE)) {
@@ -611 +600 @@
                         rpos.intersect(clip);
                 }
-if(print_blit) fprintf(stderr,"self-blit.");
                 root->BlitSurface(surface_own, rpos, surface_alpha, surface_alpha_rect, root->surface, apos, attribute);
         } else if (parent == NULL) { // ¿Æ€¬€€€Ê€€€Ê€éÇطʟõî€ÎÀÕÇ€€ò€â€Ä
@@ -895 +883 @@
         vector<UpdateItem>::iterator end = update_rects.end();
 
-if(print_blit){
-        fprintf(stderr,"ExecUpdate Start: \n\t");
-        for (it=update_rects.begin(); it != end; it++) {
-                fprintf(stderr,"(%d,%d,%d,%d), ",it->apos.lx,it->apos.ty,it->apos.rx,it->apos.by);
-        }
-        fprintf(stderr,"\n");
-}
-
         for (it=update_rects.begin(); it != end; it++) {
                 if (it->rpos.width() == 0) continue;
@@ -926 +906 @@
         }
 
-if(print_blit){
-        fprintf(stderr,"->\t");
-        for (it=update_rects.begin(); it != end; it++) {
-                fprintf(stderr,"(%d,%d,%d,%d), ",it->apos.lx,it->apos.ty,it->apos.rx,it->apos.by);
-        }
-        fprintf(stderr,"\n");
-}
-
         int num = update_rects.size();
         SDL_Rect* r = new SDL_Rect[num];
@@ -943 +915 @@
                 Rect& ur = item.apos;
                 if (ur.width() == 0) continue;
-if(print_blit)fprintf(stderr,"%p: %d,%d,%d,%d",item.pic, item.apos.lx, item.apos.ty, item.apos.rx, item.apos.by);
 
                 item.pic->ExecReBlit(item.rpos);
-if(print_blit)fprintf(stderr,"\n");
+
                 ur.intersect(confine);
                 r[n].x = ur.lx;
@@ -955 +926 @@
                 n++;
         }
-if(print_blit)fprintf(stderr,"\n");
+
         SDL_UpdateRects(hw_surface, n, r);
         delete[] r;
@@ -1017 +988 @@
 #define ALPHA_MAX 255
 #endif
-void PicRoot::BlitSurface(Surface* src, const Rect& src_r, const unsigned char* alpha, const Rect& alpha_r, Surface* dest, const Rect& dest_r, int attribute) const {
-if (print_blit) fprintf(stderr," s %p %d:%d:%d:%d;",src, dest_r.lx, dest_r.ty, dest_r.rx, dest_r.by);
+void PicRoot::BlitSurface(Surface* src, const Rect& src_r, const unsigned char* alpha, const Rect& alpha_r,
+                          Surface* dest, const Rect& dest_r, int attribute) const
+{
         SDL_Rect sr = SDLed(src_r); SDL_Rect dr = SDLed(dest_r);
 
-        if (attribute & PicBase::BLIT_MULTIPLY) {
-if (print_blit) fprintf(stderr,"M");
+        if (attribute & PicBase::BLIT_MULTIPLY)
+        {
                 DSurfaceBlitMultiply(src, src_r, dest, dest_r);
                 return;
-        } else if (attribute & PicBase::BLIT_SATURATE && src->format->Amask == 0) {
-if (print_blit) fprintf(stderr,"S");
+        }
+        else if (attribute & PicBase::BLIT_ADD)
+        {
                 unsigned char a = 255;
-                if (alpha && alpha_r.width() >= 1 && alpha_r.height() >= 1) a = *alpha;
-                DSurfaceBlitSaturate(src, src_r, dest, dest_r, a);
+                if (alpha != NULL && alpha_r.width() >= 1 && alpha_r.height() >= 1)
+                        a = *alpha;
+                DSurfaceBlitAdd(src, src_r, dest, dest_r, a);
                 return;
         }
 
-if (print_blit) fprintf(stderr,"N");
-        if (alpha == NULL || alpha_r.width() == 0) { // simple blit
-if (print_blit) fprintf(stderr,"X");
+        if (alpha == NULL || alpha_r.width() == 0) // simple blit
+        {
                 SDL_BlitSurface(src, &sr, dest, &dr);
                 return;
@@ -1041 +1014 @@
         if (alpha_r.width() == 1 && alpha_r.height() == 1) {
                 if (*alpha == 255) {
-if (print_blit) fprintf(stderr,"Y");
                         SDL_BlitSurface(src, &sr, dest, &dr);
                         return;
                 }
                 if (src->format->Amask == 0) { // use per-surface alpha
-if (print_blit) fprintf(stderr,"Z");
                         SDL_SetAlpha(src, SDL_SRCALPHA, *alpha);
                         SDL_BlitSurface(src, &sr, dest, &dr);
@@ -1054 +1025 @@
         }
         // generic alpha blit
-if (print_blit) fprintf(stderr,"W");
         DSurfaceBlitAlpha(src, src_r, dest, dest_r, alpha, alpha_r);
-        return;
 }
 

window/picture.h

@@ -72 +72 @@
                 bool is_cached;
         public:
-                enum { /*MOBILE=1,*/ CACHE_BACK=2, /* CACHE_SELF=4,*/ NO_PICTURE=8, SOLID = 16, SURFACE_FREE = 32, FIT_SURFACE = 64, BLIT_SATURATE = 128, BLIT_MULTIPLY = 256, ALPHA_FREE=512};
+                enum { /*MOBILE=1,*/ CACHE_BACK=2, /* CACHE_SELF=4,*/ NO_PICTURE=8, SOLID = 16, SURFACE_FREE = 32, FIT_SURFACE = 64, BLIT_ADD = 128, BLIT_MULTIPLY = 256, ALPHA_FREE=512};
         private:
                 int attribute;

window/render.cc

@@ -252 +252 @@
 #define CMASK2 0x00ff00
 
-inline void blit_pixel(Uint32* dmem, Uint32* smem, const unsigned char* amem, bool use_srcalpha) {
-        Uint32 d = *dmem;
-        Uint32 s = *smem;
-        Uint32 as = s>>ASHIFT;
+inline void blit_pixel(Uint32* dest, Uint32* src, const unsigned char* alpha, bool use_srcalpha) {
+        Uint32 dest_value = *dest;
+        Uint32 src_value = *src;
+        Uint32 as = src_value >> ASHIFT;
         if (as == 255 || (!use_srcalpha) ) {
-                as = *amem;
+                as = *alpha;
         } else {
-                as += as>>7; /* 0-0xff -> 0-0x100 */
-                as *= *amem;
+                as += (as >> 7); /* 0-0xff -> 0-0x100 */
+                as *= *alpha;
                 as >>= 8;
         }
-        as += as>>7;
-        Uint32 s1 = s & CMASK1;
-        Uint32 d1 = d & CMASK1;
-        d1 = (d1 + (((s1-d1) * as) >> 8)) & CMASK1;
-        s &= CMASK2;
-        d &= CMASK2;
-        d = (d + (((s-d) * as) >> 8)) & CMASK2;
-        *dmem = d1 | d | 0xff000000;
-}
-
-static void blit_line(Uint32* dmem, Uint32* smem, const unsigned char* amem,int ax0, int ax1, int awidth, int aj0, int aj1, bool use_srcalpha) {
+        as += as >> 7;
+        // Isolate Red and Blue components
+        Uint32 src_c1 = src_value & CMASK1;
+        Uint32 dest_c1 = dest_value & CMASK1;
+        // Blend Red and Blue components
+        dest_c1 = (dest_c1 + (((src_c1-dest_c1) * as) >> 8)) & CMASK1;
+        // Isolate Green component
+        src_value &= CMASK2;
+        dest_value &= CMASK2;
+        // Blend Green component
+        dest_value = (dest_value + (((src_value-dest_value) * as) >> 8)) & CMASK2;
+        // Put it alltogether
+        *dest = dest_c1 | dest_value | 0xff000000;
+}
+
+static void blit_line(Uint32* dest, Uint32* src, const unsigned char* alpha,int ax0, int ax1, int awidth, int aj0, int aj1, bool use_srcalpha) {
         int j;
         int ax = ax0;
-        const unsigned char* a = amem + ax0;
-        Uint32* d = dmem;
-        Uint32* s = smem;
+        const unsigned char* a = alpha + ax0;
         if (awidth == 1) { //  €ï€ê€È€è€¯€¢€ë€Î€ÇºÇŬ²œ
                 for (j=aj0; j < aj1; j++) {
-                        blit_pixel(d++, s++, amem, use_srcalpha);
-                }
-        } else {
+                        blit_pixel(dest++, src++, alpha, use_srcalpha);
+                }
+        }
+        else
+        {
                 for (j=aj0; j < aj1; j++) {
                         for (; ax<awidth; ax++)
-                                blit_pixel(d++, s++, a++, use_srcalpha);
+                                blit_pixel(dest++, src++, a++, use_srcalpha);
                         ax = 0;
-                        a = amem;
-                }
-                for (; ax < ax1; ax++) blit_pixel(d++, s++, a++, use_srcalpha);
-        }
-}
-
-void DSurfaceBlitAlpha(Surface* src_o, const Rect& srcrect_o, Surface* dst_o, const Rect& dstrect_o, const unsigned char* alpha, const Rect& alpharect) {
+                        a = alpha;
+                }
+                for (; ax < ax1; ax++)
+                        blit_pixel(dest++, src++, a++, use_srcalpha);
+        }
+}
+
+void DSurfaceBlitAlpha(Surface* src_o, const Rect& srcrect_o, Surface* dst_o, const Rect& dstrect_o, const unsigned char* alpha, const Rect& alpharect)
+{
         SDL_Surface* dst = (SDL_Surface*)dst_o;
         SDL_Surface* src = (SDL_Surface*)src_o;
@@ -347 +354 @@
 }
 
-void DSurfaceBlitSaturate(Surface* src_o, const Rect& srcrect_o, Surface* dst_o, const Rect& dstrect_o, unsigned char alpha) {
+void DSurfaceBlitAdd(Surface* src_o, const Rect& srcrect_o, Surface* dst_o, const Rect& dstrect_o, unsigned char alpha) {
         SDL_Surface* dst = (SDL_Surface*)dst_o;
         SDL_Surface* src = (SDL_Surface*)src_o;
@@ -371 +378 @@
         int gshift = fmt.Gshift - fmt.Gloss; int gmask = fmt.Gmask;
         int bshift = fmt.Bshift - fmt.Bloss; int bmask = fmt.Bmask;
+        int ashift = src->format->Ashift - src->format->Aloss; int amask = src->format->Amask;
         int allmask = rmask | gmask | bmask;
-        int i;
-        for (i=0; i<height; i++) {
+        int i, j;
+        for (i=0; i < height; i++) {
                 char* d = dmem; char* s = smem;
-                int j; for (j=0; j<width; j++) {
+                for (j=0; j < width; j++) {
                         Uint32 sd = *(Uint32*)s;
                         Uint32 dd = *(Uint32*)d;
@@ -382 +390 @@
                                 Uint32 sg = (sd&gmask)>>gshift;
                                 Uint32 sb = (sd&bmask)>>bshift;
-                                if (alpha != ALPHA_MAX) {
-                                        sr = (sr*alpha)>>8;
-                                        sg = (sg*alpha)>>8;
-                                        sb = (sb*alpha)>>8;
+                                Uint32 alpha2 = alpha;
+                                if (amask)
+                                {
+                                        alpha2 = ((sd&amask)>>ashift);
+                                        alpha2 += alpha2 >> 7;
+                                        alpha2 *= alpha;
+                                        alpha2 >>= 8;
+                                }
+                                
+                                if (alpha2 != ALPHA_MAX) {
+                                        sr = (sr*alpha2)>>8;
+                                        sg = (sg*alpha2)>>8;
+                                        sb = (sb*alpha2)>>8;
                                 }
                                 Uint32 dr = sr + ((dd&rmask)>>rshift);

window/render.h

@@ -39 +39 @@
 void DSurfaceMove(Surface* src_o, const Rect& srcrect, Surface* dst_o, const Rect& dstrect); // ¥³¥Ô¡Œ
 void DSurfaceBlitAlpha(Surface* src_o, const Rect& srcrect_o, Surface* dst_o, const Rect& dstrect_o, const unsigned char* alpha, const Rect& alpharect);
-void DSurfaceBlitSaturate(Surface* src_o, const Rect& srcrect, Surface* dst_o, const Rect& dstrect, unsigned char alpha);
+void DSurfaceBlitAdd(Surface* src_o, const Rect& srcrect, Surface* dst_o, const Rect& dstrect, unsigned char alpha);
 void DSurfaceBlitMultiply(Surface* src_o, const Rect& srcrect_o, Surface* dst_o, const Rect& dstrect_o);