Changeset 60:e16e13d8cd68 for window/picture.cc

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:

• window/picture.cc (modified) (17 diffs)

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;
 }