Changeset 708Tweet

Timestamp:

Aug 15, 2013, 9:04:33 PM (9 years ago)

Author:

Sam Hocevar

Message:

imlib: remove a lot of dead code.

Location:

abuse/branches/lol/src

Files:

• clisp.cpp (modified) (1 diff)
• cop.cpp (modified) (1 diff)
• dev.cpp (modified) (1 diff)
• game.cpp (modified) (7 diffs)
• gamma.cpp (modified) (2 diffs)
• imlib/image.cpp (modified) (2 diffs)
• imlib/palette.cpp (modified) (4 diffs)
• imlib/palette.h (modified) (1 diff)
• imlib/supmorph.cpp (modified) (1 diff)
• imlib/video.h (modified) (1 diff)
• sdlport/video.cpp (modified) (1 diff)

abuse/branches/lol/src/clisp.cpp

@@ -1921 +1921 @@
       for (int i = 0; i < 256; i++)
         p->SetColor(i, (u8vec3)clamp((ivec3)p->GetColor(i) + delta, 0, 255));
-      p->load();
+      p->Load();
       delete p;
     } break;

abuse/branches/lol/src/cop.cpp

@@ -794 +794 @@
     for (int i = 0; i < 256; i++)
       p->SetColor(i, (u8vec3)clamp((ivec3)p->GetColor(i) + delta, 0, 255));
-    p->load();
+    p->Load();
     delete p;
   }

abuse/branches/lol/src/dev.cpp

@@ -3511 +3511 @@
   {
     wm->SetMouseShape(cache.img(c_normal)->copy(), ivec2(1, 1));
-    g_palette->load();
+    g_palette->Load();
   }
   else

abuse/branches/lol/src/game.cpp

@@ -406 +406 @@
     state = new_state;
 
-    g_palette->load();    // restore old palette
+    g_palette->Load();    // restore old palette
 
     if(playing_state(state) &&  !(dev & EDIT_MODE))
@@ -1064 +1064 @@
             g_palette->SetColor(j, (u8vec3)((ivec3)tmp_pal->GetColor(j) * v / 256));
 
-        g_palette->load();
+        g_palette->Load();
         wm->flush_screen();
         frame.Wait(duration);
@@ -1073 +1073 @@
         main_screen->clear();
         wm->flush_screen();
-        tmp_pal->load();
+        tmp_pal->Load();
     }
     delete g_palette;
@@ -1146 +1146 @@
 
         main_screen->clear();
-        g_palette->load();
+        g_palette->Load();
 
         int dx = (xres + 1) / 2 - gray->Size().x / 2, dy = (yres + 1) / 2 - gray->Size().y / 2;
@@ -1277 +1277 @@
 
   CreateScreen(argc, argv);
-  g_palette->load();
+  g_palette->Load();
 
   recalc_local_view_space();   // now that we know what size the screen is...
@@ -2348 +2348 @@
         }
 
-        if (lastl)
+        if (Palette::LastLoaded())
         {
             m_palette->Bind();
-            m_palette->SetData(lastl->Data());
+            m_palette->SetData(Palette::LastLoaded()->Data());
         }
 
@@ -2529 +2529 @@
     System::Init(argc, argv);
 
-    Application app("Abuse", ivec2(640, 480), 60.0f);
+    Application app("Abuse", ivec2(800, 600), 60.0f);
     new DebugFps(5, 5);
     new AbuseGame(argc, argv);

abuse/branches/lol/src/gamma.cpp

@@ -100 +100 @@
             gray_pal->SetColor(i, u8vec3(i * 4));
 
-        gray_pal->load();
+        gray_pal->Load();
 
         int wm_bc = wm->bright_color(), wm_mc = wm->medium_color(), wm_dc = wm->dark_color();
@@ -191 +191 @@
     }
 
-    pal->load();
+    pal->Load();
 }

abuse/branches/lol/src/imlib/image.cpp

@@ -904 +904 @@
   if (x2<x1 || y2<y1) return NULL;
   ret=new image(ivec2((x2-x1+8)/8, (y2-y1+1)));
-  if (!last_loaded())
+  if (!Palette::LastLoaded())
     ret->clear();
   else
@@ -917 +917 @@
       for (bo=7, rx=0, x=x1, ditx=x1%4; x<=x2; x++)
       {
-        if (last_loaded()->GetColor(sl2[x]).r > dither_matrix[ditx+dity])
+        if (Palette::LastLoaded()->GetColor(sl2[x]).r > dither_matrix[ditx+dity])
           sl1[rx]|=1<<bo;
         if (bo!=0)

abuse/branches/lol/src/imlib/palette.cpp

@@ -154 +154 @@
     if (m_colors.Count() == 256)
         for (int i = 0; i < m_colors.Count(); i++)
-            m_colors[i] = u8vec3(RED3(i), GREEN3(i), BLUE2(i));
+            m_colors[i] = u8vec3(((i >> 5) & 7) * 255 / 7,
+                                 ((i >> 2) & 7) * 255 / 7,
+                                 (i & 3) * 255 / 7);
     else if (m_colors.Count() == 16)
         for (int i = 0; i < m_colors.Count(); i++)
@@ -189 +191 @@
 }
 
-
-
 void Palette::SetColor(int n, u8vec3 color)
 {
@@ -214 +214 @@
     m_used.Resize(number_colors);
     defaults();
-}
-
-
-
-quant_node::~quant_node()
-{
-/*  if (!is_leaf())
-  { for (i=0; i<8; i++)
-      if (children[i])
-      {    delete children[i];
-    children[i]=NULL;
-      }
-  } */
-}
-
-
-/*void quant_node::prune()
-{
-  int t,r,g,b;
-  ASSERT(!is_leaf(),"Cannot prune a leaf!");
-  total(t,r,g,b);
-  red=r/t;
-  green=g/t;
-  blue=b/t;
-  be_childish();
-} */
-
-void quant_node::total(int &tnodes, int &tr, int &tg, int &tb)
-{
-  int i;
-  if (is_leaf())
-  { tnodes+=tot;
-    tr+=red*tot;
-    tg+=green*tot;
-    tb+=blue*tot;
-  }
-  else
-  { for (i=0; i<8; i++)
-      if (children[i])
-    children[i]->total(tnodes,tr,tg,tb);
-  }
-}
-
-quant_node::quant_node(int level, quant_node *dad,
-    unsigned char r, unsigned char g, unsigned char b)
-{
-    int i;
-    ASSERT(level <= 8, "Tree cannot have more than eight levels");
-
-    if (level == 8)
-        be_childish();
-    else
-        for (i=0; i<8; i++) children[i]=NULL;
-    padre = dad;
-    red = r; green = g; blue = b;
-    tot = 0;
-}
-
-quant_palette::quant_palette(int max_colors)
-{ root=NULL; nc=0; mx=max_colors; }
-
-void quant_palette::re_delete(quant_node *who, int lev)  // removes all children from memory
-{ int x;                                  // and recurses down
-  if (who)
-  {
-    if (!who->is_leaf())
-    { for (x=0; x<8; x++)
-    if (who->children[x])
-    {
-      ASSERT(lev < 8, "Levl > 7");
-      re_delete(who->children[x],lev+1);
-      level[lev].unlink(who->children[x]);
-      delete who->children[x];
-    }
-    }
-  }
-}
-
-void quant_palette::prune()
-{
-  int pruned,lev,x,r,g,b,t;
-  quant_node *p=NULL,*f=NULL;
-  for (pruned=0,lev=8; lev>1 && !pruned; lev--)
-  {
-    p=(quant_node *)level[lev-1].first();
-    if (p)
-    { do
-      {
-    f=p->father();
-    for (x=0; x<8 && !pruned; x++)
-      if (f->children[x])
-        if (f->children[x]->Next()!=p->Next())        // if this son is not me!
-        pruned=1;                   //  I have a brother! stop
-       p=(quant_node *)p->Next();
-      } while (p != level[lev-1].first() && !pruned);
-    }
-  }
-  ASSERT(lev > 0, "could not prune!");
-  t=0; r=0; g=0; b=0;
-  f->total(t,r,g,b);
-  if (t<=1)
-  {
-    t=0; r=0; g=0; b=0;
-    f->total(t,r,g,b);
-  }
-  ASSERT(t > 1, "Should be more colors");
-  printf("%d Pruned at level %d, r=%d, g=%d, b=%d, total nodes off = %d\n",nc,
-    lev,r/t,g/t,b/t,t);
-  f->set(r/t,g/t,b/t);
-  nc-=t;
-  nc++;
-  re_delete(f,lev);
-  f->be_childish();
-}
-
-quant_palette::~quant_palette()
-{
-  if (root)
-  {
-    re_delete(root,1);
-    delete root;
-  }
 }
 
@@ -378 +256 @@
 }
 
-Palette *last_loaded()
+void Palette::Load()
+{
+    // Force to only 256 colours.
+    // Shouldn't be needed, but best to be safe.
+    if (m_colors.Count() > 256)
+        m_colors.Resize(256);
+
+    delete lastl;
+    lastl = Copy();
+}
+
+Palette *Palette::LastLoaded()
 {
     return lastl;

abuse/branches/lol/src/imlib/palette.h

@@ -14 +14 @@
 #include "linked.h"
 #include "specs.h"
-#define COLOR_BITS 6    // On PC-6, most others -8
-#define COLOR_SHIFT (8-COLOR_BITS)
-#define MAX_COLOR ((1<<COLOR_BITS)-1)
-#define RED3(x)  (unsigned char) ((((int)x&(7<<5))>>5)*(int)255/(int)7)
-#define GREEN3(x) (unsigned char) (((x&(7<<2))>>2)*(int)255/(int)7)
-#define BLUE2(x) (unsigned char) ((x&3)*(int)255/(int)3)
-
 
 class Palette : public linked_node
 {
 public:
-  Palette(int number_colors=256);
-  Palette(SpecEntry *e, bFILE *fp);
-  Palette(bFILE *fp);
+    Palette(int number_colors=256);
+    Palette(SpecEntry *e, bFILE *fp);
+    Palette(bFILE *fp);
 
-  Palette *Copy() const;
+    /* FIXME: this should actually be "Active()" or "SetActive()" */
+    void Load();
+    static Palette *LastLoaded();
 
-  int Count() const { return m_colors.Count(); }
-  u8vec3 *Data() { return m_colors.Data(); }
-  u8vec3 const *Data() const { return m_colors.Data(); }
+    Palette *Copy() const;
 
-  u8vec3 GetColor(int x) const;
-  uint8_t GetGray(int x) const;
-  void SetColor(int x, u8vec3 color);
+    int Count() const { return m_colors.Count(); }
+    u8vec3 *Data() { return m_colors.Data(); }
+    u8vec3 const *Data() const { return m_colors.Data(); }
 
-  int FindColor(u8vec3 color) const;
-  int FindClosest(u8vec3 color) const;
-  int FindBrightest(int all = 0) const;
-  int FindDarkest(int all = 0, int noblack = 1) const;
+    u8vec3 GetColor(int x) const;
+    uint8_t GetGray(int x) const;
+    void SetColor(int x, u8vec3 color);
 
-  void FadeTo(int total_fades, int fade_on, u8vec3 dest);
+    int FindColor(u8vec3 color) const;
+    int FindClosest(u8vec3 color) const;
+    int FindBrightest(int all = 0) const;
+    int FindDarkest(int all = 0, int noblack = 1) const;
+
+    void FadeTo(int total_fades, int fade_on, u8vec3 dest);
 
 private:
-  Array<u8vec3> m_colors;
-  Array<uint8_t> m_used;
-  int bg;
+    Array<u8vec3> m_colors;
+    Array<uint8_t> m_used;
+    int bg;
 
 public :
-  uint32_t getquad(int x);
-  void shift(int amount);
-  void load();
+    uint32_t getquad(int x);
+    void shift(int amount);
 
-  void defaults();
-  void set_rgbs();
-  void make_black_white();
-  void black_white();
+    void defaults();
+    void set_rgbs();
+    void make_black_white();
+    void black_white();
 
-  int used(int color_num);
-  void set_all_used();
-  void set_all_unused();
-  int write(bFILE *fp);
-  int size();
+    int used(int color_num);
+    void set_all_used();
+    void set_all_unused();
+    int write(bFILE *fp);
+    int size();
 };
 
-class quant_node : public linked_node
-{
-  quant_node *padre;
-public :
-  unsigned tot;
-  quant_node *children[8];
-  int is_leaf() { return children[0]==this; }
-  void be_childish() { children[0]=this; }
-  quant_node *father() { return padre; }
-  quant_node(int level, quant_node *dad,
-    unsigned char r=0, unsigned char g=0, unsigned char b=0);
-  void total(int &tnodes, int &tr, int &tg, int &tb);
-//  void prune();
-  void set(int r,int g,int b) { red=r; green=g; blue=b; }
-  unsigned char red,green,blue;
-  ~quant_node();
-} ;
-
-
-class quant_palette
-{
-  linked_list level[8];
-  quant_node *root;
-  int nc,mx;
-  void prune();
-  void re_delete(quant_node *who, int lev);
-public :
-  quant_palette(int max_colors=256);
-  ~quant_palette();
-} ;
-
-Palette *last_loaded();
 #endif
 

abuse/branches/lol/src/imlib/supmorph.cpp

@@ -348 +348 @@
 
   CreateScreen(argc,argv);
-  pal->load();
+  pal->Load();
   i1->put_image(screen,30,30);
   update_dirty(screen);

abuse/branches/lol/src/imlib/video.h

@@ -30 +30 @@
 extern int xoff,yoff;
 extern image *main_screen;
-extern Palette *lastl;
 
 void CreateScreen(int argc, char **argv);

abuse/branches/lol/src/sdlport/video.cpp

@@ -144 +144 @@
 }
 
-//
-// load()
-// Set the palette
-//
-void Palette::load()
-{
-    // Force to only 256 colours.
-    // Shouldn't be needed, but best to be safe.
-    if (m_colors.Count() > 256)
-        m_colors.Resize(256);
-
-    if (lastl)
-        delete lastl;
-    lastl = Copy();
-
-    // Now redraw the surface
-    UpdateScreen();
-}
-
 // ---- support functions ----