Changeset 60:e16e13d8cd68 for scn2k/scn2k_grp.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:

• scn2k/scn2k_grp.cc (modified) (7 diffs)

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)