Changeset 579 for abuse/trunk/src/imlib/transimage.cppTweet

Timestamp:

May 5, 2011, 12:36:33 PM (11 years ago)

Author:

Sam Hocevar

Message:

imlib: refactor the Filter and ColorFilter? classes.

File:

• abuse/trunk/src/imlib/transimage.cpp (modified) (5 diffs)

abuse/trunk/src/imlib/transimage.cpp

@@ -149 +149 @@
                                  image *blend, vec2i bpos, uint8_t *map,
                                  uint8_t *map2, int amount, int nframes,
-                                 uint8_t *tint, color_filter *f, palette *pal)
+                                 uint8_t *tint, ColorFilter *f, palette *pal)
 {
     vec2i pos1, pos2;
@@ -262 +262 @@
                     uint8_t b = ((((int)p1[2] - p2[2]) * mul) >> 16) + p2[2];
 
-                    *sl++ = f->lookup_color(r >> 3, g >> 3, b >> 3);
+                    *sl++ = f->Lookup(r >> 3, g >> 3, b >> 3);
                 }
             }
@@ -296 +296 @@
 // Used when eg. the player teleports, or in rocket trails
 void TransImage::PutFade(image *screen, vec2i pos, int amount, int nframes,
-                         color_filter *f, palette *pal)
+                         ColorFilter *f, palette *pal)
 {
     PutImageGeneric<FADE>(screen, pos, 0, NULL, 0, NULL, NULL,
@@ -303 +303 @@
 
 void TransImage::PutFadeTint(image *screen, vec2i pos, int amount, int nframes,
-                             uint8_t *tint, color_filter *f, palette *pal)
+                             uint8_t *tint, ColorFilter *f, palette *pal)
 {
     PutImageGeneric<FADE_TINT>(screen, pos, 0, NULL, 0, NULL, NULL,
@@ -318 +318 @@
 // Assumes that the blend image completely covers the transparent image.
 void TransImage::PutBlend(image *screen, vec2i pos, image *blend, vec2i bpos,
-                          int amount, color_filter *f, palette *pal)
+                          int amount, ColorFilter *f, palette *pal)
 {
     PutImageGeneric<BLEND>(screen, pos, 0, blend, bpos, NULL, NULL,