Ignore:
Timestamp:
May 5, 2011, 12:36:33 PM (11 years ago)
Author:
Sam Hocevar
Message:

imlib: refactor the Filter and ColorFilter? classes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • abuse/trunk/src/imlib/transimage.cpp

    r555 r579  
    149149                                 image *blend, vec2i bpos, uint8_t *map,
    150150                                 uint8_t *map2, int amount, int nframes,
    151                                  uint8_t *tint, color_filter *f, palette *pal)
     151                                 uint8_t *tint, ColorFilter *f, palette *pal)
    152152{
    153153    vec2i pos1, pos2;
     
    262262                    uint8_t b = ((((int)p1[2] - p2[2]) * mul) >> 16) + p2[2];
    263263
    264                     *sl++ = f->lookup_color(r >> 3, g >> 3, b >> 3);
     264                    *sl++ = f->Lookup(r >> 3, g >> 3, b >> 3);
    265265                }
    266266            }
     
    296296// Used when eg. the player teleports, or in rocket trails
    297297void TransImage::PutFade(image *screen, vec2i pos, int amount, int nframes,
    298                          color_filter *f, palette *pal)
     298                         ColorFilter *f, palette *pal)
    299299{
    300300    PutImageGeneric<FADE>(screen, pos, 0, NULL, 0, NULL, NULL,
     
    303303
    304304void TransImage::PutFadeTint(image *screen, vec2i pos, int amount, int nframes,
    305                              uint8_t *tint, color_filter *f, palette *pal)
     305                             uint8_t *tint, ColorFilter *f, palette *pal)
    306306{
    307307    PutImageGeneric<FADE_TINT>(screen, pos, 0, NULL, 0, NULL, NULL,
     
    318318// Assumes that the blend image completely covers the transparent image.
    319319void TransImage::PutBlend(image *screen, vec2i pos, image *blend, vec2i bpos,
    320                           int amount, color_filter *f, palette *pal)
     320                          int amount, ColorFilter *f, palette *pal)
    321321{
    322322    PutImageGeneric<BLEND>(screen, pos, 0, blend, bpos, NULL, NULL,
Note: See TracChangeset for help on using the changeset viewer.