Changeset 661Tweet

Timestamp:

May 15, 2011, 5:31:42 PM (11 years ago)

Author:

Sam Hocevar

Message:

imlib: refactor image::PutPart? and image::PutPartMasked?, get rid of
unused methods image::PutPartXrev? and image::fill_image.

Location:

abuse/trunk

Files:

• TODO (modified) (2 diffs)
• src/common.h (modified) (1 diff)
• src/imlib/fonts.cpp (modified) (2 diffs)
• src/imlib/image.cpp (modified) (2 diffs)
• src/imlib/image.h (modified) (1 diff)
• src/imlib/jwindow.cpp (modified) (2 diffs)
• src/imlib/sprite.cpp (modified) (1 diff)
• src/imlib/video.h (modified) (1 diff)
• src/menu.cpp (modified) (1 diff)

abuse/trunk/TODO

@@ -57 +57 @@
 --------
 - move to vec2i:
-  - PutPart
+  - PutPart -> changer le 2e arg. de la bbox
   - AddDirty !!
   - update_dirty
 
+JCFont::tl,th -> m_size
+sprite::x,y -> m_pos
 console::draw_char : vec2i
 VolumeWindow::draw_vol plus grand !!
@@ -71 +73 @@
 jwindow::area
 
+refactor image::Line to merge loops
+

abuse/trunk/src/common.h

@@ -39 +39 @@
 static inline float Max(float a, float b) { return a > b ? a : b; }
 
+static inline vec2i Min(vec2i a, vec2i b) { return vec2i(Min(a.x, b.x), Min(a.y, b.y)); }
+static inline vec2i Max(vec2i a, vec2i b) { return vec2i(Max(a.x, b.x), Max(a.y, b.y)); }
+
 //
 // Byte swapping

abuse/trunk/src/imlib/fonts.cpp

@@ -28 +28 @@
 void texture_font::put_char(image *screen,  int x, int y, char ch)
 { if (fntpat)
-    screen->PutPartMasked(fntpat, let, x,y,
-       ((int)ch%32)*tl,((int)ch/32)*th,0,0,tl-1,th-1);
-  else screen->PutPart(let, x, y, ((int)ch%32)*tl, ((int)ch/32)*th,
-     ((int)ch%32)*tl+tl-1, ((int)ch/32)*th+th-1, 1);
+    screen->PutPartMasked(fntpat, vec2i(x, y), let,
+       vec2i(((int)ch%32)*tl,((int)ch/32)*th), vec2i(0,0), vec2i(tl-1,th-1));
+  else screen->PutPart(let, vec2i(x, y), vec2i(((int)ch%32)*tl, ((int)ch/32)*th),
+     vec2i(((int)ch%32)*tl+tl-1, ((int)ch/32)*th+th-1), 1);
 }
 
@@ -74 +74 @@
   {
     tmp.clear();
-    tmp.PutPart(letters, 0, 0, ((int)ch%32)*tl, ((int)ch/32)*th,
-                ((int)ch%32)*tl+tl-1, ((int)ch/32)*th+th-1, 1);
+    tmp.PutPart(letters, vec2i(0, 0), vec2i(((int)ch%32)*tl, ((int)ch/32)*th),
+                vec2i(((int)ch%32)*tl+tl-1, ((int)ch/32)*th+th-1), 1);
     let[ch] = new TransImage(&tmp, "JCfont");
   }

abuse/trunk/src/imlib/image.cpp

@@ -327 +327 @@
     if(m_special)
     {
-        PutPart(im, pos.x, pos.y, 0, 0, im->m_size.x-1, im->m_size.y-1, transparent);
+        PutPart(im, pos, vec2i(0), im->m_size - vec2i(1), transparent);
         return;
     }
@@ -380 +380 @@
 }
 
-void image::fill_image(image *screen, int16_t x1, int16_t y1, int16_t x2, int16_t y2, int16_t align)
-{
-  int16_t i, j, w, xx, start, xl, starty;
-  uint8_t *pg1, *pg2;
-  CHECK(x1<=x2 && y1<=y2);  // we should have gotten this
-
-  if (screen->m_special)
-  { x1=screen->m_special->bound_x1(x1);
-    y1=screen->m_special->bound_y1(y1);
-    x2=screen->m_special->bound_x2(x2+1)-1;
-    y2=screen->m_special->bound_y2(y2+1)-1;
-  }
-  else
-  { if (x1<0) x1=0;
-    if (y2<0) y1=0;
-    if (x2>=screen->Size().x)  x2=screen->Size().x-1;
-    if (y2>=screen->Size().y) y2=screen->Size().y-1;
-  }
-  if (x2<0 || y2<0 || x1>=screen->Size().x || y1>=screen->Size().y)
-    return ;
-  screen->AddDirty(x1, y1, x2 + 1, y2 + 1);
-  w=m_size.x;
-  if (align)
-  {
-    start=x1%w;
-    starty=y1%m_size.y;
-  }
-  else
-  { start=0;
-    starty=0;
-  }
-  screen->Lock();
-  Lock();
-  for (j=y1; j<=y2; j++)
-  {
-    pg1=screen->scan_line(j);
-    pg2=scan_line(starty++);
-    if (starty>=m_size.y) starty=0;
-    i=x1;
-    xx=start;
-    while (i<=x2)
-    {
-      xl=Min(w-xx, x2-i+1);
-
-      memcpy(&pg1[i], &pg2[xx], xl);
-      xx=0;
-      i+=xl;
-    }
-  }
-  Unlock();
-  screen->Unlock();
-}
-
-
-void image::PutPart(image *im, int16_t x, int16_t y, int16_t x1, int16_t y1,
-                    int16_t x2, int16_t y2, char transparent)
-{
-  int16_t xlen, ylen, j, i;
-  uint8_t *pg1, *pg2, *source, *dest;
-  CHECK(x1<=x2 && y1<=y2);
-
-  int cx1, cy1, cx2, cy2;
-  GetClip(cx1, cy1, cx2, cy2);
-
-  // see if the are to be put is outside of actual image, if so adjust
-  // to fit in the image
-  if (x1<0) { x+=-x1; x1=0; }
-  if (y1<0) { y+=-y1; y1=0; }
-  if (x2>=im->m_size.x) x2=im->m_size.x-1;
-  if (y2>=im->m_size.y) y2=im->m_size.y-1;
-  if (x1>x2 || y1>y2) return ;      // return if it was adjusted so that nothing will be put
-
-  // see if the image gets clipped off the screen
-  if (x >= cx2 || y >= cy2 || x + (x2 - x1) < cx1 || y + (y2 - y1) < cy1)
-    return ;
-
-  if (x<cx1)
-  { x1+=(cx1-x); x=cx1; }
-  if (y<cy1)
-  { y1+=(cy1-y); y=cy1; }
-
-  if (x + x2 - x1 + 1 >= cx2)
-  { x2 = cx2 - 1 - x + x1; }
-
-  if (y + y2 - y1 + 1 >= cy2)
-  { y2 = cy2 - 1 - y + y1; }
-  if (x1>x2 || y1>y2) return ;
-
-  xlen=x2-x1+1;
-  ylen=y2-y1+1;
-
-  AddDirty(x, y, x + xlen, y + ylen);
-
-  Lock();
-  im->Lock();
-
-  if (transparent)
-  {
-    for (j=0; j<ylen; j++)
-    {
-      pg1 = scan_line(y + j);
-      pg2 = im->scan_line(y1 + j);
-      for (i=0, source=&pg2[x1], dest=&pg1[x]; i<xlen; i++, source++, dest++)
-        if (*source) *dest=*source;
-    }
-  }
-  else
-  for (j=0; j<ylen; j++)
-  {
-    pg1 = scan_line(y + j);
-    pg2 = im->scan_line(y1 + j);
-    memcpy(&pg1[x], &pg2[x1], xlen);   // strait copy
-  }
-  im->Unlock();
-  Unlock();
-}
-
-void image::PutPartXrev(image *im, int16_t x, int16_t y, int16_t x1,
-                        int16_t y1, int16_t x2, int16_t y2, char transparent)
-{
-  int16_t xl, yl, j, i;
-  uint8_t *pg1, *pg2, *source, *dest;
-  CHECK(x1<=x2 && y1<=y2);
-
-  i=x1; x1=im->m_size.x-x2-1;  // reverse the x locations
-  x2=im->m_size.x-i-1;
-
-  if (x1<0)
-  { x-=x1; x1=0; }
-  if (y1<0)
-  { y-=y1; y1=0; }
-
-  if (m_special)
-  {
+void image::PutPart(image *im, vec2i pos, vec2i aa, vec2i bb, int transparent)
+{
+    vec2i span;
+    CHECK(aa <= bb);
+
     int cx1, cy1, cx2, cy2;
-    m_special->GetClip(cx1, cy1, cx2, cy2);
-    // FIXME: don't we need < cx1 instead of < 0 here?
-    if (x >= cx2 || y >= cy2 || x + (x2 - x1) < 0 || y + (y2 - y1) < 0)
-      return;
-    if (x<cx1)
-    { x1+=(cx1-x); x=cx1; }
-    if (y<cy1)
-    { y1+=(cy1-y); y=cy1; }
-    if (x + x2 - x1 + 1 >= cx2)
-    { x2 = cx2 - 1 - x + x1; }
-    if (y + y2 - y1 + 1 >= cy2)
-    { y2 = cy2 - 1 - y + y1; }
-  }
-  else  if (x > m_size.x || y > m_size.y || x+x2<0 || y+y2<0)
-    return ;
-
-  if (x<m_size.x && y<m_size.y && x1<im->m_size.x && y1<im->m_size.y &&
-      x1<=x2 && y1<=y2)
-  {
-    if (x2>=im->m_size.x)
-      x2=im->m_size.x-1;
-    if (y2>=im->m_size.y)
-      y2=im->m_size.y-1;
-    xl=x2-x1+1;
-    if (x+xl>m_size.x)
-      xl=m_size.x-x;
-    yl=y2-y1+1;
-    if (y+yl>m_size.y)
-      yl=m_size.y-y;
-    AddDirty(x, y, x + xl, y + yl);
+    GetClip(cx1, cy1, cx2, cy2);
+
+    // see if the are to be put is outside of actual image, if so adjust
+    // to fit in the image
+    pos += Min(aa, vec2i(0));
+    aa += Min(aa, vec2i(0));
+    bb = Min(bb, im->m_size - vec2i(1));
+    // return if it was adjusted so that nothing will be put
+    if (!(aa <= bb))
+        return;
+
+    // see if the image gets clipped off the screen
+    if (pos.x >= cx2 || pos.y >= cy2 || pos.x + (bb.x - aa.x) < cx1 || pos.y + (bb.y - aa.y) < cy1)
+        return;
+
+    aa += Max(vec2i(cx1, cy1) - pos, vec2i(0));
+    pos += Max(vec2i(cx1, cy1) - pos, vec2i(0));
+    bb = Min(bb, vec2i(cx2, cy2) - vec2i(1) - pos + aa);
+    if (!(aa <= bb))
+        return;
+
+    span = bb - aa + vec2i(1);
+
+    AddDirty(pos.x, pos.y, pos.x + span.x, pos.y + span.y);
+
     Lock();
     im->Lock();
-    for (j=0; j<yl; j++)
-    {
-      pg1=scan_line(y+j);
-      pg2=im->scan_line(y1+j);
-      if (transparent)
-      {
-    for (i=0, source=&pg2[x1], dest=&pg1[x+xl-1]; i<xl; i++, source++, dest--)
-          if (*source) *dest=*source;
-      }
-      else
-    for (i=0, source=&pg2[x1], dest=&pg1[x+xl-1]; i<xl; i++, source++, dest++)
-          *dest=*source;
-    }
+
+    for (int j = 0; j < span.y; j++)
+    {
+        uint8_t *dst = scan_line(pos.y + j) + pos.x;
+        uint8_t *src = im->scan_line(aa.y + j) + aa.x;
+        if (transparent)
+        {
+            for (int i = 0; i < span.x; i++, src++, dst++)
+                if (*src)
+                    *dst = *src;
+        }
+        else
+            memcpy(dst, src, span.x);
+    }
+
+    im->Unlock();
     Unlock();
-    im->Unlock();
-  }
-}
-
-void image::PutPartMasked(image *im, image *mask, int16_t x, int16_t y,
-                          int16_t maskx, int16_t masky,
-                          int16_t x1, int16_t y1, int16_t x2, int16_t y2)
-{
-  int16_t xl, yl, j, i, ml, mh;
-  uint8_t *pg1, *pg2, *pg3;
-  CHECK(x1<=x2 && y1<=y2);
-
-  if (m_special)
-  {
-    int cx1, cy1, cx2, cy2;
-    m_special->GetClip(cx1, cy1, cx2, cy2);
-    if (x >= cx2 || y >= cy2 || x+(x2-x1)<0 || y+(y2-y1)<0) return ;
-    if (x<cx1)
-    { x1+=(cx1-x); x=cx1; }
-    if (y<cy1)
-    { y1+=(cy1-y); y=cy1; }
-    if (x + x2 - x1 >= cx2)
-    { x2 = cx2 - 1 + x1 - x; }
-    if (y + y2 - y1 >= cy2)
-    { y2 = cy2 - 1 + y1 - y; }
-  }
-  else  if (x>m_size.x || y>m_size.y || x+x1<0 || y+y1<0)
-    return ;
-
-  ml=mask->Size().x;
-  mh=mask->Size().y;
-  if (x<m_size.x && y<m_size.y && x1<im->m_size.x && y1<im->m_size.y &&
-      maskx<ml && masky<mh && x1<=x2 && y1<=y2)
-  {
-
-    if (x2>=im->m_size.x)
-      x2=im->m_size.x-1;
-    if (y2>=im->m_size.y)
-      y2=im->m_size.y-1;
-    xl=x2-x1+1;
-    if (x+xl>m_size.x)
-      xl=m_size.x-x-1;
-    yl=y2-y1+1;
-    if (y+yl>m_size.y)
-      yl=m_size.y-y-1;
-    AddDirty(x, y, x + xl, y + yl);
+}
+
+void image::PutPartMasked(image *im, vec2i pos, image *mask, vec2i mpos,
+                          vec2i aa, vec2i bb)
+{
+    CHECK(aa <= bb);
+
+    if (m_special)
+    {
+        int cx1, cy1, cx2, cy2;
+        m_special->GetClip(cx1, cy1, cx2, cy2);
+
+        if (!(pos < vec2i(cx2, cy2) && pos >= aa - bb))
+            return;
+
+        aa += Max(vec2i(cx1, cy1) - pos, vec2i(0));
+        pos += Max(vec2i(cx1, cy1) - pos, vec2i(0));
+        bb = Min(bb, vec2i(cx2, cy2) - vec2i(1) - pos + aa);
+    }
+    else if (!(pos <= m_size && pos >= -aa))
+        return;
+
+    vec2i mask_size = mask->Size();
+
+    if (!(pos < m_size && aa < im->m_size && mpos < mask_size && aa <= bb))
+        return;
+
+    bb = Min(bb, im->m_size - vec2i(1));
+
+    vec2i span = bb - aa + vec2i(1);
+    span = Min(span, m_size - pos - vec2i(1));
+    AddDirty(pos.x, pos.y, pos.x + span.x, pos.y + span.y);
+
     Lock();
     mask->Lock();
     im->Lock();
-    for (j=0; j<yl; j++)
-    {
-      pg1=scan_line(y+j);
-      pg2=im->scan_line(y1+j);
-      pg3=mask->scan_line(masky++);
-      if (masky>=mh)           // wrap the mask around if out of bounds
-    masky=0;
-      for (i=0; i<xl; i++)
-      {
-    if (pg3[maskx+i])          // check to make sure not 0 before putting
-      pg1[x+i]=pg2[x1+i];
-    if (maskx>=ml)            // wrap x around if it goes to far
-      maskx=0;
-      }
-    }
+
+    for (int j = 0; j < span.y; j++)
+    {
+        uint8_t *dst = scan_line(pos.y + j) + pos.x;
+        uint8_t *src = im->scan_line(aa.y + j) + aa.x;
+        uint8_t *pg3 = mask->scan_line(mpos.y) + mpos.x;
+
+        if (++mpos.y >= mask_size.y) // wrap mask y around
+            mpos.y = 0;
+
+        for (int i = 0; i < span.x; i++, dst++, src++, pg3++)
+        {
+            if (mpos.x + i >= mask_size.x) // wrap mask x around
+                pg3 -= mask_size.x;
+
+            if (pg3[mpos.x + i]) // check to make sure not 0 before putting
+                *dst = *src;
+        }
+    }
+
     im->Unlock();
     mask->Unlock();
     Unlock();
-  }
 }
 

abuse/trunk/src/imlib/image.h

@@ -113 +113 @@
     void scroll(int16_t x1, int16_t y1, int16_t x2, int16_t y2,
                 int16_t xd, int16_t yd);
-    void fill_image(image *screen, int16_t x1, int16_t y1,
-                    int16_t x2, int16_t y2, int16_t align = 1);
     void PutImage(image *screen, vec2i pos, int transparent = 0);
-    void PutPart(image *screen, int16_t x, int16_t y, int16_t x1, int16_t y1,
-                 int16_t x2, int16_t y2, char transparent = 0);
-    void PutPartXrev(image *screen, int16_t x, int16_t y,
-                     int16_t x1, int16_t y1, int16_t x2, int16_t y2,
-                     char transparent = 0);
-    void PutPartMasked(image *screen, image *mask, int16_t x, int16_t y,
-                       int16_t maskx, int16_t masky, int16_t x1, int16_t y1,
-                       int16_t x2, int16_t y2);
+    void PutPart(image *screen, vec2i pos, vec2i aa, vec2i bb,
+                 int transparent = 0);
+    void PutPartMasked(image *screen, vec2i pos, image *mask, vec2i mpos,
+                       vec2i aa, vec2i bb);
     image *copy_part_dithered(int16_t x1, int16_t y1, int16_t x2, int16_t y2);
     void Bar(vec2i p1, vec2i p2, uint8_t color);

abuse/trunk/src/imlib/jwindow.cpp

@@ -336 +336 @@
         vec2i m2 = m1 + m_sprite->visual->Size() - vec2i(1, 1);
 
-        m_sprite->save->PutPart(m_surf, 0, 0, m1.x, m1.y, m2.x, m2.y);
+        m_sprite->save->PutPart(m_surf, vec2i(0, 0), m1, m2);
         m_surf->PutImage(m_sprite->visual, m1, 1);
     }
@@ -355 +355 @@
         if (has_mouse())
         {
-            m_sprite->save->PutPart(p->m_surf, 0, 0, m1.x - p->m_pos.x, m1.y - p->m_pos.y,
-                                    m1.x - p->m_pos.x + m_sprite->visual->Size().x - 1,
-                                    m1.y - p->m_pos.y + m_sprite->visual->Size().y - 1);
+            m_sprite->save->PutPart(p->m_surf, vec2i(0, 0), m1 - p->m_pos,
+                                    m1 - p->m_pos + m_sprite->visual->Size() - vec2i(1, 1));
             p->m_surf->PutImage(m_sprite->visual, m1 - p->m_pos, 1);
         }

abuse/trunk/src/imlib/sprite.cpp

@@ -30 +30 @@
 void sprite::get_background()
 { if (x+visual->Size().x>=0 && y+visual->Size().y>=0 && x<=xres && y<=yres)
-   save->PutPart(screen,0,0,x,y,x+save->Size().x-1,y+save->Size().y-1); }
+   save->PutPart(screen,vec2i(0,0), vec2i(x,y), vec2i(x+save->Size().x-1,y+save->Size().y-1)); }
 
 void sprite::draw()

abuse/trunk/src/imlib/video.h

@@ -28 +28 @@
 void set_mode(int mode, int argc=0, char **argv=NULL);
 void close_graphics();
-void fill_image(image *im, int x1, int y1, int x2, int y2);
 void update_window_done();
 

abuse/trunk/src/menu.cpp

@@ -237 +237 @@
       int by2=by1+bh-1;
 
-      save->PutPart(main_screen, 0, 0, mx + 1, by1, mx + mw - 2, by2);
+      save->PutPart(main_screen, vec2i(0, 0), vec2i(mx + 1, by1), vec2i(mx + mw - 2, by2));
       tint_area(mx+1,by1,mx+mw-2,by2,63,63,63,color);