Changeset 579 for abuse/trunkTweet

Timestamp:

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

Author:

Sam Hocevar

Message:

imlib: refactor the Filter and ColorFilter? classes.

Location:

abuse/trunk/src

Files:

• clisp.cpp (modified) (2 diffs)
• dev.cpp (modified) (1 diff)
• endgame.cpp (modified) (1 diff)
• gui.cpp (modified) (1 diff)
• imlib/filter.cpp (modified) (3 diffs)
• imlib/filter.h (modified) (1 diff)
• imlib/input.cpp (modified) (2 diffs)
• imlib/input.h (modified) (2 diffs)
• imlib/jwindow.cpp (modified) (1 diff)
• imlib/jwindow.h (modified) (2 diffs)
• imlib/supmorph.cpp (modified) (3 diffs)
• imlib/supmorph.h (modified) (1 diff)
• imlib/tools.cpp (modified) (2 diffs)
• imlib/tools.h (modified) (1 diff)
• imlib/transimage.cpp (modified) (5 diffs)
• imlib/transimage.h (modified) (2 diffs)
• imlib/visobj.h (modified) (3 diffs)
• items.cpp (modified) (1 diff)
• light.cpp (modified) (1 diff)
• loader2.cpp (modified) (1 diff)
• loader2.h (modified) (1 diff)
• menu.cpp (modified) (2 diffs)
• sdlport/mouse.cpp (modified) (2 diffs)

abuse/trunk/src/clisp.cpp

@@ -1592 +1592 @@
     exit(0);
       }
-      return color_table->lookup_color(r>>3,g>>3,b>>3);
+      return color_table->Lookup(r >> 3, g >> 3, b >> 3);
     } break;
     case 173 :
@@ -1735 +1735 @@
     else
     {
-      if (color_table) delete color_table;
-      color_table=new color_filter(se,fp);
+      delete color_table;
+      color_table = new ColorFilter(se, fp);
     }
     delete fp;

abuse/trunk/src/dev.cpp

@@ -106 +106 @@
   public :
   cached_image(int Id) { id=Id; }
-  virtual void draw(image *screen, int x, int y, filter *f)
+  virtual void draw(image *screen, int x, int y, Filter *f)
   {
     if (f)
-      f->put_image(screen,cache.img(id),x,y,1);
+      f->PutImage(screen, cache.img(id), vec2i(x, y));
     else
       cache.img(id)->put_image(screen,x,y);

abuse/trunk/src/endgame.cpp

@@ -121 +121 @@
           b3=b1+(b2-b1)*fade256/256;
 
-      uint8_t c=color_table->lookup_color(r3>>3,g3>>3,b3>>3);
+      uint8_t c=color_table->Lookup(r3>>3,g3>>3,b3>>3);
 
       *sl=*(white_light+((*l)/2+28+jrand()%4)*256+c);

abuse/trunk/src/gui.cpp

@@ -110 +110 @@
     int g=80;
     screen->bar(0,0,144,20,0);
-    wm->font()->put_string(screen,0,0,symbol_str(key),color_table->lookup_color(g>>3,g>>3,g>>3));
+    wm->font()->put_string(screen,0,0,symbol_str(key),color_table->Lookup(g>>3,g>>3,g>>3));
   } else if (!active && key[0])
   {

abuse/trunk/src/imlib/filter.cpp

@@ -18 +18 @@
 #include "filter.h"
 
-filter::filter(palette *from, palette *to)   // creates a conversion filter from one palette to another
+Filter::Filter(int colors)
 {
-  nc=from->pal_size() > to->pal_size() ? from->pal_size() : to->pal_size();
-  unsigned char *p=fdat=(unsigned char *)malloc(nc);
-  unsigned char *r,*g,*b;
-  r=g=b=(unsigned char *)from->addr();
-  g++;
-  b+=2;
-
-  int dk=to->darkest(1);
-  for (int i=0; i<nc; i++,p++,r+=3,g+=3,b+=3)
-  {
-    *p=to->find_closest(*r,*g,*b);
-
-    // make sure non-blacks don't get remapped to the transparency
-    if ((*r!=0 || *g!=0 || *b!=0) && (to->red(*p)==0 && to->green(*p)==0 && to->blue(*p)==0))
-      *p=dk;
-  }
-
+    CONDITION(colors >= 0 && colors <= 256, "bad colors value");
+    m_size = colors;
+    m_table = (uint8_t *)malloc(m_size);
+    memset(m_table, 0, m_size * sizeof(*m_table));
 }
 
-void filter::clear()
+// Creates a conversion filter from one palette to another
+Filter::Filter(palette *from, palette *to)
 {
-  int i;
-  for (i=0; i<nc; i++)
-    fdat[i]=i;
+    m_size = Max(from->pal_size(), to->pal_size());
+    m_table = (uint8_t *)malloc(m_size);
+
+    uint8_t *dst = m_table;
+    uint8_t *src = (uint8_t *)from->addr();
+    int dk = to->darkest(1);
+
+    for (int i = 0; i < m_size; i++)
+    {
+       int r = *src++;
+       int g = *src++;
+       int b = *src++;
+       int color = to->find_closest(r, g, b);
+
+       // Make sure non-blacks don't get remapped to the transparency
+       if ((r || g || b) && to->red(color) == 0
+            && to->green(color) == 0 && to->blue(color) == 0)
+           color = dk;
+
+       *dst++ = color;
+    }
 }
 
-void filter::max_threshold(int minv, char blank)
+Filter::~Filter()
 {
-  int i;
-  CONDITION(minv>=0 && minv<nc,"Bad minv");
-  for (i=0; i<minv; i++)
-    fdat[i]=blank;
+    free(m_table);
 }
 
-void filter::min_threshold(int maxv, char blank)
+void Filter::Set(int color_num, int change_to)
 {
-  int i;
-  CONDITION(maxv>=0 && maxv<nc,"bad maxv value in filter::max_thresh");
-  for (i=nc-1; i>=maxv; i--)
-    fdat[i]=(unsigned) blank;
+    CONDITION(color_num >= 0 && color_num < m_size, "Bad colors_num");
+    m_table[color_num] = change_to;
 }
 
-
-void filter::set(int color_num, char change_to)
+void Filter::Apply(image *im)
 {
-  CONDITION(color_num>=0 && color_num<nc,"Bad colors_num");
-  fdat[color_num]=(unsigned) change_to;
+    im->Lock();
+    uint8_t *dst = im->scan_line(0);
+    int npixels = im->Size().x * im->Size().y;
+    while (npixels--)
+    {
+        CONDITION(*dst < m_size, "not enough filter colors");
+        *dst = m_table[*dst];
+        dst++;
+    }
+    im->Unlock();
 }
 
-
-filter::filter(int colors)
-{
-  CONDITION(colors>=0 && colors<=256,"bad colors value");
-  nc=colors;
-  fdat=(unsigned char *)malloc(nc);
-  clear();
-}
-
-void filter::apply(image *im)
-{
-  int x,y;
-  unsigned char *c;
-  CONDITION(im,"null image passed in filter::apply\n");
-  im->Lock();
-  for (y=im->Size().y-1; y>=0; y--)
-  {
-    c=im->scan_line(y);
-    for (x=im->Size().x-1; x>=0; x--)
-    {
-      CONDITION((unsigned) c[x]<nc,"not enough filter colors");
-      c[x]=fdat[(unsigned) c[x]];
-    }
-  }
-  im->Unlock();
-}
-
-
-palette *compare_pal;
-
-int color_compare(void *c1, void *c2)
-{
-  long v1,v2;
-  unsigned char r1,g1,b1,r2,g2,b2;
-  compare_pal->get(  *((unsigned char *)c1),r1,g1,b1);
-  compare_pal->get(  *((unsigned char *)c2),r2,g2,b2);
-  v1=(int)r1*(int)r1+(int)g1*(int)g1+(int)b1*(int)b1;
-  v2=(int)r2*(int)r2+(int)g2*(int)g2+(int)b2*(int)b2;
-  if (v1<v2) return -1;
-  else if (v1>v2) return 1;
-  else return 0;
-}
-
-color_filter::color_filter(palette *pal, int color_bits, void (*stat_fun)(int))
-{
-  color_bits=5;      // hard code 5 for now
-  int r,g,b,rv,gv,bv,
-      c=0,i,max=pal->pal_size(),
-      lshift=8-color_bits;
-  unsigned char *pp;
-
-  long dist_sqr,best;
-  int colors=1<<color_bits;
-  color_table=(unsigned char *)malloc(colors*colors*colors);
-  for (r=0; r<colors; r++)
-  {
-    if (stat_fun) stat_fun(r);
-    rv=r<<lshift;
-    for (g=0; g<colors; g++)
-    {
-      gv=g<<lshift;
-      for (b=0; b<colors; b++)
-      {
-    bv=b<<lshift;
-        best=0x7fffffff;
-        for (i=0,pp=(unsigned char *)pal->addr(); i<max; i++)
-        {
-          register long rd=*(pp++)-rv,
-                        gd=*(pp++)-gv,
-                        bd=*(pp++)-bv;
-
-          dist_sqr=(long)rd*rd+(long)bd*bd+(long)gd*gd;
-          if (dist_sqr<best)
-          { best=dist_sqr;
-            c=i;
-          }
-        }
-        color_table[r*colors*colors+g*colors+b]=c;
-      }
-    }
-  }
-}
-
-color_filter::color_filter(spec_entry *e, bFILE *fp)
-{
-  fp->seek(e->offset,0);
-  fp->read_uint16();
-  int colors=32;
-  color_table=(unsigned char *)malloc(colors*colors*colors);
-  fp->read(color_table,colors*colors*colors);
-}
-
-int color_filter::size()
-{
-  int colors=32;
-  return 2+colors*colors*colors;
-}
-
-int color_filter::write(bFILE *fp)
-{
-  int colors=32;
-  fp->write_uint16(colors);
-  return fp->write(color_table,colors*colors*colors)==colors*colors*colors;
-}
-
-
-void filter::put_image(image *screen, image *im, short x, short y,
-                       char transparent)
+/* This is only ever used in the editor, when showing the toolbar. It
+ * does not look like it's very useful. */
+void Filter::PutImage(image *screen, image *im, vec2i pos)
 {
     int cx1, cy1, cx2, cy2, x1 = 0, y1 = 0,
-          x2 = im->Size().x, y2 = im->Size().y;
+        x2 = im->Size().x, y2 = im->Size().y;
     screen->GetClip(cx1, cy1, cx2, cy2);
 
-    // see if the image gets clipped off the screen
-    if(x >= cx2 || y >= cy2 || x + (x2 - x1) <= cx1 || y + (y2 - y1) <= cy1)
+    // See if the image gets clipped off the screen
+    if(pos.x >= cx2 || pos.y >= cy2 ||
+       pos.x + (x2 - x1) <= cx1 || pos.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 >= cx2)
-        x2 = cx2 - x + x1;
-
-    if(y + y2 - y1 >= cy2)
-        y2 = cy2 - y + y1;
+    x1 += Max(cx1 - pos.x, 0);
+    y1 += Max(cy1 - pos.y, 0);
+    pos.x = Max(pos.x, cx1);
+    pos.y = Max(pos.y, cy1);
+    x2 = Min(x2, cx2 - pos.x + x1);
+    y2 = Min(y2, cy2 - pos.y + y1);
 
     if(x1 >= x2 || y1 >= y2)
@@ -209 +103 @@
     int yl = y2 - y1;
 
-    screen->AddDirty(x, y, x + xl, y + yl);
+    screen->AddDirty(pos.x, pos.y, pos.x + xl, pos.y + yl);
 
     screen->Lock();
     im->Lock();
 
-    uint8_t *pg1 = screen->scan_line(y), *source, *dest;
-    uint8_t *pg2 = im->scan_line(y1);
-    int i;
     for(int j = 0; j < yl; j++)
     {
-        for(i = 0, source = &pg2[x1], dest = &pg1[x];
-            i < xl;
-            i++, source++, dest++)
-        {
-            if (!transparent || *source)
-                *dest=fdat[*source];
-        }
-        pg1 = screen->next_line(y + j, pg1);
-        pg2 = im->next_line(y1 + j, pg2);
+        uint8_t *source = im->scan_line(y1 + j) + x1;
+        uint8_t *dest = screen->scan_line(pos.y + j) + pos.x;
+
+        for(int i = 0; i < xl; i++, source++, dest++)
+            if (*source)
+                *dest = m_table[*source];
     }
 
@@ -234 +122 @@
 }
 
+ColorFilter::ColorFilter(palette *pal, int color_bits)
+{
+    int max = pal->pal_size();
+    int mul = 1 << (8 - color_bits);
+    m_size = 1 << color_bits;
+    m_table = (uint8_t *)malloc(m_size * m_size * m_size);
+
+    /* For each colour in the RGB cube, find the nearest palette element. */
+    for (int r = 0; r < m_size; r++)
+    for (int g = 0; g < m_size; g++)
+    for (int b = 0; b < m_size; b++)
+    {
+        int best = 256 * 256 * 3;
+        int color = 0;
+        uint8_t *pp = (uint8_t *)pal->addr();
+
+        for (int i = 0; i < max; i++)
+        {
+            int rd = *pp++ - r * mul,
+                gd = *pp++ - g * mul,
+                bd = *pp++ - b * mul;
+
+            int dist = rd * rd + bd * bd + gd * gd;
+            if (dist < best)
+            {
+                best = dist;
+                color = i;
+            }
+        }
+        m_table[(r * m_size + g) * m_size + b] = color;
+    }
+}
+
+ColorFilter::ColorFilter(spec_entry *e, bFILE *fp)
+{
+    fp->seek(e->offset, 0);
+    m_size = fp->read_uint16();
+    m_table = (uint8_t *)malloc(m_size * m_size * m_size);
+    fp->read(m_table, m_size * m_size * m_size);
+}
+
+ColorFilter::~ColorFilter()
+{
+    free(m_table);
+}
+
+size_t ColorFilter::DiskUsage()
+{
+    return sizeof(uint16_t) + m_size * m_size * m_size;
+}
+
+int ColorFilter::Write(bFILE *fp)
+{
+    fp->write_uint16(m_size);
+    int bytes = m_size * m_size * m_size;
+    return fp->write(m_table, bytes) == bytes;
+}
+

abuse/trunk/src/imlib/filter.h

@@ -16 +16 @@
 #include "specs.h"
 
-class filter
+class Filter
 {
-  unsigned char *fdat;
-  int nc;
 public :
-  filter(int colors=256);
-  filter(palette *from, palette *to);     // creates a conversion filter from one palette to another
-  void set(int color_num, char change_to);
-  unsigned char get_mapping(int color_num) { return fdat[color_num]; }
-  void apply(image *im);
-  void max_threshold(int minv, char blank=0);
-  void min_threshold(int maxv, char blank=0);
-  void put_image(image *screen, image *im, short x, short y, char transparent=0);
-  void clear();
-  ~filter() { free(fdat); }
-} ;
+    Filter(int colors = 256);
+    Filter(palette *from, palette *to);
+    ~Filter();
 
-class color_filter
+    void Set(int color_num, int change_to);
+    int GetMapping(int color_num) { return m_table[color_num]; }
+    void Apply(image *im);
+    void PutImage(image *screen, image *im, vec2i pos);
+
+private:
+    int m_size;
+    uint8_t *m_table;
+};
+
+class ColorFilter
 {
-  unsigned char *color_table;
 public:
-  int size();
-  int write(bFILE *fp);
-  color_filter(spec_entry *e, bFILE *fp);
-  color_filter(palette *pal, int color_bits=6, void (*stat_fun)(int)=NULL);
-  unsigned char lookup_color(int r, int g, int b)
-   { return color_table[r*32*32+g*32+b]; }
-  unsigned char *table() { return color_table; }
-  int total_colors() { return 32; }
-  unsigned char *get_table() { return color_table; }
-  ~color_filter() { free(color_table); }
-} ;
+    ColorFilter(spec_entry *e, bFILE *fp);
+    ColorFilter(palette *pal, int color_bits);
+    ~ColorFilter();
+
+    size_t DiskUsage();
+    int Write(bFILE *fp);
+    int Lookup(int r, int g, int b)
+    {
+        return m_table[(r * m_size + g) * m_size + b];
+    }
+
+private:
+    int m_size;
+    uint8_t *m_table;
+};
 
 #endif
 
-
-
-

abuse/trunk/src/imlib/input.cpp

@@ -19 +19 @@
 #include "input.h"
 
-void button::remap(filter *f)
+void button::remap(Filter *f)
 {
   if (visual)
   {
-    f->apply(visual);
+    f->Apply(visual);
     if (pressed)
-      f->apply(pressed);
+      f->Apply(pressed);
   }
 }
@@ -33 +33 @@
 }
 
-void button_box::remap(filter *f)
+void button_box::remap(Filter *f)
 {
   for (button *b=buttons; b; b=(button *)b->next)

abuse/trunk/src/imlib/input.h

@@ -32 +32 @@
   virtual void handle_event(event &ev, image *screen, InputManager *im);
   void change_visual(image *new_visual);
-  virtual void remap(filter *f);
+  virtual void remap(Filter *f);
   virtual ~button() { if (text) free(text); }
   void push();
@@ -48 +48 @@
   void add_button(button *b);
   void press_button(int id);      // if button box doesn't contain id, nothing happens
-  virtual void remap(filter *f);
+  virtual void remap(Filter *f);
   virtual void move(int newx, int newy);
   virtual void area(int &x1, int &y1, int &x2, int &y2);

abuse/trunk/src/imlib/jwindow.cpp

@@ -725 +725 @@
 }
 
-void InputManager::remap(filter *f)
+void InputManager::remap(Filter *f)
 {
   for (ifield *i=first; i; i=i->next)

abuse/trunk/src/imlib/jwindow.h

@@ -46 +46 @@
   void redraw();
   void add(ifield *i);
-  void remap(filter *f);
+  void remap(Filter *f);
   ifield *unlink(int id);     // unlinks ID from fields list and return the pointer to it
   void clear_current();
@@ -76 +76 @@
     virtual void handle_event(event &ev, image *screen, InputManager *im) = 0;
     virtual int selectable() { return 1; }
-    virtual void remap(filter *f) { ; }
+    virtual void remap(Filter *f) { ; }
     virtual char *read() = 0;
     virtual ifield *find(int search_id) { if (id==search_id) return this; else return NULL; }

abuse/trunk/src/imlib/supmorph.cpp

@@ -259 +259 @@
 
 
-int smorph_player::show(image *screen, int x, int y, color_filter *fil, palette *pal,
+int smorph_player::show(image *screen, int x, int y, ColorFilter *fil, palette *pal,
             int blur_threshold)
 {
@@ -279 +279 @@
       if (px>=x1 && px < x2 && py>=y1 && py < y2)
       {
-        hole[ix+iy*w]=*(screen->scan_line(py)+px)=fil->lookup_color(ss->r>>(19),
+        hole[ix+iy*w]=*(screen->scan_line(py)+px)=fil->Lookup(ss->r>>(19),
                                     ss->g>>(19),
                                     ss->b>>(19));
@@ -323 +323 @@
           dist+=((int)(*pa)-b)*((int)(*pa)-b);
           if (dist>blur_threshold)
-            *(tl)=*(screen->scan_line(y+iy)+x+ix)=fil->lookup_color(r>>3,g>>3,b>>3);
+            *(tl)=*(screen->scan_line(y+iy)+x+ix)=fil->Lookup(r>>3,g>>3,b>>3);
         } else *(tl)=*(screen->scan_line(y+iy)+x+ix)=0; // kill single pixels
       }
       else if (t>=3)
-        *(tl)=*(screen->scan_line(y+iy)+x+ix)=fil->lookup_color((r/t)>>3,(g/t)>>3,(b/t)>>3);
+        *(tl)=*(screen->scan_line(y+iy)+x+ix)=fil->Lookup((r/t)>>3,(g/t)>>3,(b/t)>>3);
     }
       }

abuse/trunk/src/imlib/supmorph.h

@@ -37 +37 @@
   int w,h,f_left,t;
   smorph_player(super_morph *m, palette *pal, image *i1, image *i2, int frames, int dir);
-  int show(image *screen, int x, int y, color_filter *fil, palette *pal, int blur_threshold);
+  int show(image *screen, int x, int y, ColorFilter *fil, palette *pal, int blur_threshold);
   ~smorph_player() { free(hole); free(steps);  }
 } ;

abuse/trunk/src/imlib/tools.cpp

@@ -29 +29 @@
 {
   delete map;
-  map=new filter(old_pal,pal);
+  map=new Filter(old_pal,pal);
   draw_first(screen);
 }
@@ -47 +47 @@
     if (icons[i]->height()>ih) ih=icons[i]->height();
   }
-  map=new filter(icon_palette,pal);
+  map=new Filter(icon_palette,pal);
   old_pal=icon_palette->copy();
   reconfigure();

abuse/trunk/src/imlib/tools.h

@@ -20 +20 @@
 class tool_picker : public spicker
 {
-  filter *map;
+  Filter *map;
   visual_object **icons;
   int *ids;

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,

abuse/trunk/src/imlib/transimage.h

@@ -40 +40 @@
     void PutDoubleRemap(image *screen, vec2i pos, uint8_t *map, uint8_t *map2);
     void PutFade(image *screen, vec2i pos, int amount, int nframes,
-                 color_filter *f, palette *pal);
+                 ColorFilter *f, palette *pal);
     void PutFadeTint(image *screen, vec2i pos, int amount, int nframes,
-                     uint8_t *tint, color_filter *f, palette *pal);
+                     uint8_t *tint, ColorFilter *f, palette *pal);
     void PutColor(image *screen, vec2i pos, uint8_t color);
     void PutFilled(image *screen, vec2i pos, uint8_t color);
     void PutPredator(image *screen, vec2i pos);
     void PutBlend(image *screen, vec2i pos, image *blend, vec2i bpos,
-                  int blend_amount, color_filter *f, palette *pal);
+                  int blend_amount, ColorFilter *f, palette *pal);
     void PutScanLine(image *screen, vec2i pos, int line);
 
@@ -63 +63 @@
                          uint8_t *map1, uint8_t *map2, int amount,
                          int nframes, uint8_t *tint,
-                         color_filter *f, palette *pal);
+                         ColorFilter *f, palette *pal);
 
     vec2i m_size;

abuse/trunk/src/imlib/visobj.h

@@ -18 +18 @@
 {
   public :
-  virtual void draw(image *screen, int x, int y, filter *f) = 0;
+  virtual void draw(image *screen, int x, int y, Filter *f) = 0;
   virtual int width() = 0;
   virtual int height() = 0;
@@ -32 +32 @@
 
   image_visual(image *img) { im=img; }
-  virtual void draw(image *screen, int x, int y, filter *f);
+  virtual void draw(image *screen, int x, int y, Filter *f);
   virtual int width() { return im->Size().x; }
   virtual int height() { return im->Size().y; }
@@ -45 +45 @@
   public :
   string_visual(char *string, int Color);
-  virtual void draw(image *screen, int x, int y, filter *f);
+  virtual void draw(image *screen, int x, int y, Filter *f);
   virtual int width();
   virtual int height();

abuse/trunk/src/items.cpp

@@ -258 +258 @@
   for (l=0; l<AUTOTILE_WIDTH*AUTOTILE_HEIGHT; l++)
     micro_image->PutPixel(vec2i(l % AUTOTILE_WIDTH, l / AUTOTILE_WIDTH),
-       color_table->lookup_color((r[l]/(t[l]*4/5))>>3,
+       color_table->Lookup((r[l]/(t[l]*4/5))>>3,
                  (g[l]/(t[l]*4/5))>>3,
                  (b[l]/(t[l]*4/5))>>3));

abuse/trunk/src/light.cpp

@@ -198 +198 @@
     bs+=ba; if (bs>255) bs=255; else if (bs<0) bs=0;
   }
-  filter f(pal,&npal);
-  filter f2(&npal,pal);
+  Filter f(pal,&npal);
+  Filter f2(&npal,pal);
 
   for (i=0; i<256; i++,tint++)
-    *tint=f2.get_mapping(f.get_mapping(i));
+    *tint=f2.GetMapping(f.GetMapping(i));
 }
 

abuse/trunk/src/loader2.cpp

@@ -57 +57 @@
 int title_screen;
 
-color_filter *color_table;
+ColorFilter *color_table;
 
 

abuse/trunk/src/loader2.h

@@ -65 +65 @@
 /******************************** COLOR *****************************************/
 extern palette *pal;
-extern color_filter *color_table;
+extern ColorFilter *color_table;
 extern int light_connection_color;
 

abuse/trunk/src/menu.cpp

@@ -71 +71 @@
       uint8_t g=((*(paddr++))-g_to)*percent/256+g_to;
       uint8_t b=((*(paddr++))-b_to)*percent/256+b_to;
-      *sl=color_table->lookup_color((r)>>3,(g)>>3,(b)>>3);
+      *sl=color_table->Lookup((r)>>3,(g)>>3,(b)>>3);
     }
   }
@@ -99 +99 @@
       uint8_t g=(*(paddr++))*amount/256;
       uint8_t b=(*(paddr++))*amount/256;
-      *sl=color_table->lookup_color((r)>>3,(g)>>3,(b)>>3);
+      *sl=color_table->Lookup((r)>>3,(g)>>3,(b)>>3);
     }
   }

abuse/trunk/src/sdlport/mouse.cpp

@@ -54 +54 @@
     image *im;
     int br, dr;
-    filter f;
+    Filter f;
     but = 0;
     cx = cy = 0;
@@ -63 +63 @@
     br = pal->brightest( 1 );
     dr = pal->darkest( 1 );
-    f.set( 1, br );
-    f.set( 2, dr );
+    f.Set( 1, br );
+    f.Set( 2, dr );
     im = new image(vec2i(8, 10), def_mouse);
-    f.apply( im );
+    f.Apply( im );
     sp = new sprite(Screen, im, 100, 100);
     mx = Screen->Size().x / 2;