Changeset 60:e16e13d8cd68 for scn2k/scn2k_grpimpl.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_grpimpl.cc (modified) (8 diffs)

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 @@
         }
 }
+