Changeset 662Tweet

Timestamp:

May 15, 2011, 5:31:48 PM (9 years ago)

Author:

Sam Hocevar

Message:

imlib: minor refactoring.

Location:

abuse/trunk

Files:

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

abuse/trunk/TODO

@@ -57 +57 @@
 --------
 - move to vec2i:
-  - PutPart -> changer le 2e arg. de la bbox
   - AddDirty !!
   - update_dirty

abuse/trunk/src/imlib/fonts.cpp

@@ -29 +29 @@
 { if (fntpat)
     screen->PutPartMasked(fntpat, vec2i(x, y), let,
-       vec2i(((int)ch%32)*tl,((int)ch/32)*th), vec2i(0,0), vec2i(tl-1,th-1));
+       vec2i(((int)ch%32)*tl,((int)ch/32)*th), vec2i(0,0), vec2i(tl,th));
   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);
+     vec2i(((int)ch%32)*tl+tl, ((int)ch/32)*th+th), 1);
 }
 
@@ -75 +75 @@
     tmp.clear();
     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);
+                vec2i(((int)ch%32)*tl+tl, ((int)ch/32)*th+th), 1);
     let[ch] = new TransImage(&tmp, "JCfont");
   }

abuse/trunk/src/imlib/image.cpp

@@ -327 +327 @@
     if(m_special)
     {
-        PutPart(im, pos, vec2i(0), im->m_size - vec2i(1), transparent);
+        PutPart(im, pos, vec2i(0), im->m_size, transparent);
         return;
     }
@@ -382 +382 @@
 void image::PutPart(image *im, vec2i pos, vec2i aa, vec2i bb, int transparent)
 {
-    vec2i span;
-    CHECK(aa <= bb);
+    CHECK(aa < bb);
 
     int cx1, cy1, cx2, cy2;
@@ -392 +391 @@
     pos += Min(aa, vec2i(0));
     aa += Min(aa, vec2i(0));
-    bb = Min(bb, im->m_size - vec2i(1));
+    bb = Min(bb, im->m_size);
     // return if it was adjusted so that nothing will be put
-    if (!(aa <= bb))
+    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)
+    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);
+    bb = Min(bb, vec2i(cx2, cy2) - pos + aa);
+    if (!(aa < bb))
+        return;
+
+    vec2i span = bb - aa;
 
     AddDirty(pos.x, pos.y, pos.x + span.x, pos.y + span.y);
@@ -435 +434 @@
                           vec2i aa, vec2i bb)
 {
-    CHECK(aa <= bb);
+    CHECK(aa < bb);
 
     if (m_special)
@@ -442 +441 @@
         m_special->GetClip(cx1, cy1, cx2, cy2);
 
-        if (!(pos < vec2i(cx2, cy2) && pos >= aa - bb))
+        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);
+        bb = Min(bb, vec2i(cx2, cy2) - pos + aa);
     }
     else if (!(pos <= m_size && pos >= -aa))
@@ -454 +453 @@
     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));
+    if (!(pos < m_size && aa < im->m_size && mpos < mask_size && aa < bb))
+        return;
+
+    bb = Min(bb, im->m_size);
+
+    vec2i span = bb - aa;
+    span = Min(span, m_size - pos);
     AddDirty(pos.x, pos.y, pos.x + span.x, pos.y + span.y);
 

abuse/trunk/src/imlib/jwindow.cpp

@@ -334 +334 @@
     {
         m1 = m_pos - m_center;
-        vec2i m2 = m1 + m_sprite->visual->Size() - vec2i(1, 1);
+        vec2i m2 = m1 + m_sprite->visual->Size();
 
         m_sprite->save->PutPart(m_surf, vec2i(0, 0), m1, m2);
@@ -356 +356 @@
         {
             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));
+                                    m1 - p->m_pos + m_sprite->visual->Size());
             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,vec2i(0,0), vec2i(x,y), vec2i(x+save->Size().x-1,y+save->Size().y-1)); }
+   save->PutPart(screen,vec2i(0,0), vec2i(x,y), vec2i(x+save->Size().x,y+save->Size().y)); }
 
 void sprite::draw()

abuse/trunk/src/menu.cpp

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