Changeset 541 for abuseTweet

Timestamp:

Apr 24, 2011, 10:33:40 AM (12 years ago)

Author:

Sam Hocevar

Message:

imlib: rename TImage to TransImage? for readability.

Location:

abuse/trunk/src

Files:

• cache.h (modified) (1 diff)
• game.cpp (modified) (1 diff)
• game.h (modified) (1 diff)
• go.cpp (modified) (1 diff)
• imlib/Makefile.am (modified) (2 diffs)
• imlib/fonts.cpp (modified) (1 diff)
• imlib/fonts.h (modified) (2 diffs)
• imlib/supmorph.cpp (modified) (3 diffs)
• imlib/supmorph.h (modified) (2 diffs)
• imlib/transimage.cpp (moved) (moved from abuse/trunk/src/imlib/timage.cpp) (16 diffs, 1 prop)
• imlib/transimage.h (moved) (moved from abuse/trunk/src/imlib/timage.h) (4 diffs)
• items.cpp (modified) (3 diffs)
• items.h (modified) (3 diffs)
• morpher.cpp (modified) (1 diff)
• objects.cpp (modified) (7 diffs)
• objects.h (modified) (1 diff)
• scene.cpp (modified) (1 diff)
• seq.h (modified) (2 diffs)

abuse/trunk/src/cache.h

@@ -62 +62 @@
  *  - sound
  *  - image
- *  - TImage
+ *  - TransImage
  */
 

abuse/trunk/src/game.cpp

@@ -564 +564 @@
 }
 
-void Game::put_block_fg(int x, int y, TImage *im)
+void Game::put_block_fg(int x, int y, TransImage *im)
 {
   for(view *f = first_view; f; f = f->next)

abuse/trunk/src/game.h

@@ -128 +128 @@
   void draw_map(view *v, int interpolate=0);
   void dev_scroll();
-  void put_block_fg(int x, int y, TImage *im);
+  void put_block_fg(int x, int y, TransImage *im);
   void put_block_bg(int x, int y, image *im);
 

abuse/trunk/src/go.cpp

@@ -104 +104 @@
     sy1=max(the_game->viewy1,sy1);
     sy2=min(the_game->viewy2,sy2);
-    TImage *p=picture();
+    TransImage *p=picture();
 
     for (i=sy1; i<=sy2; i++)

abuse/trunk/src/imlib/Makefile.am

@@ -5 +5 @@
     filter.cpp filter.h \
     image.cpp image.h \
+    transimage.cpp transimage.h \
     linked.cpp linked.h \
     input.cpp input.h \
@@ -13 +14 @@
     supmorph.cpp supmorph.h \
     pcxread.cpp pcxread.h \
-    timage.cpp timage.h \
     jrand.cpp jrand.h \
     keys.cpp keys.h \

abuse/trunk/src/imlib/fonts.cpp

@@ -74 +74 @@
     letters->put_part(&tmp,0,0,((int)ch%32)*tl,((int)ch/32)*th,
               ((int)ch%32)*tl+tl-1,((int)ch/32)*th+th-1,1);
-    let[ch]=new TImage(&tmp,"JCfont");
+    let[ch]=new TransImage(&tmp,"JCfont");
   }
 }

abuse/trunk/src/imlib/fonts.h

@@ -12 +12 @@
 #define __FONTS_HPP_
 #include "image.h"
-#include "timage.h"
+#include "transimage.h"
 
 
@@ -35 +35 @@
 {
   int tl,th;
-  TImage *let[256];
+  TransImage *let[256];
 public:
   JCFont(image *letters);

abuse/trunk/src/imlib/supmorph.cpp

@@ -15 +15 @@
 #include "supmorph.h"
 #include "specs.h"
-#include "timage.h"
+#include "transimage.h"
 #include "timing.h"
 #include "filter.h"
@@ -25 +25 @@
                              ((int)(y1)-(int)y2)*((int)(y1)-(int)y2))
 
-super_morph::super_morph(TImage *hint1, TImage *hint2,
+super_morph::super_morph(TransImage *hint1, TransImage *hint2,
              int aneal_steps, void (*stat_fun)(int))
 {
@@ -356 +356 @@
   int steps=atoi(argv[1]);
   if (steps<2) steps=50;
-  TImage *hh1=new TImage(h1,"hint1"),*hh2=new TImage(h2,"hint2");
+  TransImage *hh1=new TransImage(h1,"hint1"),*hh2=new TransImage(h2,"hint2");
 
   time_marker time1;

abuse/trunk/src/imlib/supmorph.h

@@ -12 +12 @@
 #define __SUPER_MORPH_HPP__
 
-#include "timage.h"
+#include "transimage.h"
 
 class super_morph
@@ -20 +20 @@
   unsigned char *movers;
   int w,h;
-  super_morph(TImage *h1, TImage *h2, int aneal_steps, void (*stat_fun)(int));
+  super_morph(TransImage *h1, TransImage *h2, int aneal_steps, void (*stat_fun)(int));
   ~super_morph() { if (t) free(movers); }
 } ;

abuse/trunk/src/imlib/transimage.cpp

@@ -16 +16 @@
 #include "common.h"
 
-#include "timage.h"
-
-TImage::TImage(image *im, char const *name)
+#include "transimage.h"
+
+TransImage::TransImage(image *im, char const *name)
 {
     m_size = im->Size();
@@ -53 +53 @@
     if (!parser)
     {
-        printf("size = %d %d (%d bytes)\n", m_size.x, m_size.y, bytes);
-        CONDITION(parser, "malloc error for TImage::m_data");
+        printf("size = %d %d (%ld bytes)\n", m_size.x, m_size.y, (long)bytes);
+        CONDITION(parser, "malloc error for TransImage::m_data");
     }
 
@@ -91 +91 @@
 }
 
-TImage::~TImage()
+TransImage::~TransImage()
 {
     free(m_data);
 }
 
-image *TImage::ToImage()
+image *TransImage::ToImage()
 {
     image *im = new image(m_size);
@@ -109 +109 @@
 }
 
-uint8_t *TImage::ClipToLine(image *screen, vec2i pos1, vec2i pos2,
-                            vec2i &pos, int &ysteps)
+uint8_t *TransImage::ClipToLine(image *screen, vec2i pos1, vec2i pos2,
+                                vec2i &pos, int &ysteps)
 {
     // check to see if it is totally clipped out first
@@ -144 +144 @@
 
 template<int N>
-void TImage::PutImageGeneric(image *screen, vec2i pos, uint8_t color,
-                             image *blend, vec2i bpos, uint8_t *map,
-                             uint8_t *map2, int amount, int total_frames,
-                             uint8_t *tint, color_filter *f, palette *pal)
+void TransImage::PutImageGeneric(image *screen, vec2i pos, uint8_t color,
+                                 image *blend, vec2i bpos, uint8_t *map,
+                                 uint8_t *map2, int amount, int nframes,
+                                 uint8_t *tint, color_filter *f, palette *pal)
 {
     vec2i pos1, pos2;
@@ -169 +169 @@
     CONDITION(N == BLEND && pos.y >= bpos.y
                          && pos.y + ysteps < bpos.y + blend->Size().y + 1,
-              "Blend doesn't fit on TImage");
+              "Blend doesn't fit on TransImage");
 
     if (N == FADE || N == FADE_TINT || N == BLEND)
@@ -175 +175 @@
 
     if (N == FADE || N == FADE_TINT)
-        mul = (amount << 16) / total_frames;
+        mul = (amount << 16) / nframes;
     else if (N == BLEND)
         mul = ((16 - amount) << 16 / 16);
@@ -273 +273 @@
 }
 
-void TImage::PutImage(image *screen, vec2i pos)
+void TransImage::PutImage(image *screen, vec2i pos)
 {
     PutImageGeneric<NORMAL>(screen, pos, 0, NULL, 0, NULL, NULL,
@@ -279 +279 @@
 }
 
-void TImage::PutRemap(image *screen, vec2i pos, uint8_t *map)
+void TransImage::PutRemap(image *screen, vec2i pos, uint8_t *map)
 {
     PutImageGeneric<REMAP>(screen, pos, 0, NULL, 0, map, NULL,
@@ -285 +285 @@
 }
 
-void TImage::PutDoubleRemap(image *screen, vec2i pos,
+void TransImage::PutDoubleRemap(image *screen, vec2i pos,
                             uint8_t *map, uint8_t *map2)
 {
@@ -293 +293 @@
 
 // Used when eg. the player teleports, or in rocket trails
-void TImage::PutFade(image *screen, vec2i pos, int amount, int total_frames,
-                     color_filter *f, palette *pal)
+void TransImage::PutFade(image *screen, vec2i pos, int amount, int nframes,
+                         color_filter *f, palette *pal)
 {
     PutImageGeneric<FADE>(screen, pos, 0, NULL, 0, NULL, NULL,
-                          amount, total_frames, NULL, f, pal);
-}
-
-void TImage::PutFadeTint(image *screen, vec2i pos, int amount, int total_frames,
-                         uint8_t *tint, color_filter *f, palette *pal)
+                          amount, nframes, NULL, f, pal);
+}
+
+void TransImage::PutFadeTint(image *screen, vec2i pos, int amount, int nframes,
+                             uint8_t *tint, color_filter *f, palette *pal)
 {
     PutImageGeneric<FADE_TINT>(screen, pos, 0, NULL, 0, NULL, NULL,
-                               amount, total_frames, tint, f, pal);
-}
-
-void TImage::PutColor(image *screen, vec2i pos, uint8_t color)
+                               amount, nframes, tint, f, pal);
+}
+
+void TransImage::PutColor(image *screen, vec2i pos, uint8_t color)
 {
     PutImageGeneric<COLOR>(screen, pos, color, NULL, 0, NULL, NULL,
@@ -315 +315 @@
 // This method is unused but is believed to work.
 // Assumes that the blend image completely covers the transparent image.
-void TImage::PutBlend(image *screen, vec2i pos, image *blend, vec2i bpos,
-                      int amount, color_filter *f, palette *pal)
+void TransImage::PutBlend(image *screen, vec2i pos, image *blend, vec2i bpos,
+                          int amount, color_filter *f, palette *pal)
 {
     PutImageGeneric<BLEND>(screen, pos, 0, blend, bpos, NULL, NULL,
@@ -322 +322 @@
 }
 
-void TImage::PutFilled(image *screen, vec2i pos, uint8_t color)
+void TransImage::PutFilled(image *screen, vec2i pos, uint8_t color)
 {
     PutImageGeneric<FILLED>(screen, pos, color, NULL, 0, NULL, NULL,
@@ -328 +328 @@
 }
 
-void TImage::PutPredator(image *screen, vec2i pos)
+void TransImage::PutPredator(image *screen, vec2i pos)
 {
     PutImageGeneric<PREDATOR>(screen, pos, 0, NULL, 0, NULL, NULL,
@@ -334 +334 @@
 }
 
-void TImage::PutScanLine(image *screen, vec2i pos, int line)
+void TransImage::PutScanLine(image *screen, vec2i pos, int line)
 {
     PutImageGeneric<SCANLINE>(screen, pos, 0, NULL, 0, NULL, NULL,
@@ -340 +340 @@
 }
 
-size_t TImage::MemUsage()
+size_t TransImage::DiskUsage()
 {
     uint8_t *d = m_data;

abuse/trunk/src/imlib/transimage.h

@@ -25 +25 @@
  */
 
-class TImage // transparent image
+class TransImage
 {
 public:
-    TImage(image *im, char const *name);
-    ~TImage();
+    TransImage(image *im, char const *name);
+    ~TransImage();
 
     inline vec2i Size() { return m_size; }
@@ -39 +39 @@
     void PutRemap(image *screen, vec2i pos, uint8_t *map);
     void PutDoubleRemap(image *screen, vec2i pos, uint8_t *map, uint8_t *map2);
-    void PutFade(image *screen, vec2i pos, int amount, int total_frames,
+    void PutFade(image *screen, vec2i pos, int amount, int nframes,
                  color_filter *f, palette *pal);
-    void PutFadeTint(image *screen, vec2i pos, int amount, int total_frames,
+    void PutFadeTint(image *screen, vec2i pos, int amount, int nframes,
                      uint8_t *tint, color_filter *f, palette *pal);
     void PutColor(image *screen, vec2i pos, uint8_t color);
@@ -50 +50 @@
     void PutScanLine(image *screen, vec2i pos, int line);
 
-    size_t MemUsage();
+    size_t DiskUsage();
 
 private:
@@ -62 +62 @@
                          image *blend, vec2i bpos,
                          uint8_t *map1, uint8_t *map2, int amount,
-                         int total_frames, uint8_t *tint,
+                         int nframes, uint8_t *tint,
                          color_filter *f, palette *pal);
 

abuse/trunk/src/items.cpp

@@ -261 +261 @@
 
 
-  im=new TImage(img,"foretile");
+  im=new TransImage(img,"foretile");
   delete img;
 
@@ -275 +275 @@
 size_t figure::MemUsage()
 {
-    return forward->MemUsage() + backward->MemUsage() + hit->size()
+    return forward->DiskUsage() + backward->DiskUsage() + hit->size()
             + f_damage->size() + b_damage->size() + sizeof(figure);
 }
@@ -283 +283 @@
 {
   image *im=load_image(fp);
-  forward=new TImage(im,"figure data");
+  forward=new TransImage(im,"figure data");
   im->FlipX();
-  backward=new TImage(im,"figure backward data");
+  backward=new TransImage(im,"figure backward data");
   delete im;
 

abuse/trunk/src/items.h

@@ -12 +12 @@
 #define __ITEMS_HPP__
 #include "image.h"
+#include "transimage.h"
 #include "specs.h"
 #include "points.h"
-#include "timage.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -44 +44 @@
 {
 public :
-  TImage *im;
+  TransImage *im;
   uint16_t next;
   uint8_t damage;
@@ -61 +61 @@
 {
 public :
-  TImage *forward,*backward;
+  TransImage *forward,*backward;
   uint8_t hit_damage,xcfg;
   int8_t advance;

abuse/trunk/src/morpher.cpp

@@ -58 +58 @@
 
     fleft=frames;
-    TImage *h1=new TImage(cache.img(t1->morph_mask),"morph tmp"),
-                *h2=new TImage(cache.img(t2->morph_mask),"morph tmp");
+    TransImage *h1=new TransImage(cache.img(t1->morph_mask),"morph tmp"),
+                *h2=new TransImage(cache.img(t2->morph_mask),"morph tmp");
     super_morph *sm=new super_morph(h1,h2,anneal,stat_fun);
     if (sm->t)

abuse/trunk/src/objects.cpp

@@ -13 +13 @@
 #include "common.h"
 
-#include "timage.h"
+#include "transimage.h"
 #include "objects.h"
 #include "chars.h"
@@ -388 +388 @@
     sy1 = Max(v->cy1, sy1);
     sy2 = Min(v->cy2, sy2);
-    TImage *p=picture();
+    TransImage *p=picture();
 
     for (i=sy1; i<=sy2; i++)
@@ -669 +669 @@
 void game_object::draw_trans(int count, int max)
 {
-  TImage *cpict=picture();
+  TransImage *cpict=picture();
   cpict->PutFade(screen,
           vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
@@ -680 +680 @@
 void game_object::draw_tint(int tint_id)
 {
-  TImage *cpict=picture();
+  TransImage *cpict=picture();
   if (fade_count())
     cpict->PutFadeTint(screen,
@@ -700 +700 @@
 void game_object::draw_double_tint(int tint_id, int tint2)
 {
-  TImage *cpict=picture();
+  TransImage *cpict=picture();
   if (fade_count())
     cpict->PutFadeTint(screen,
@@ -722 +722 @@
 void game_object::draw_predator()
 {
-  TImage *cpict=picture();
+  TransImage *cpict=picture();
   cpict->PutPredator(screen,
              vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
@@ -745 +745 @@
     else
     {
-      TImage *cpict=picture();
+      TransImage *cpict=picture();
       cpict->PutImage(screen,
                vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,

abuse/trunk/src/objects.h

@@ -107 +107 @@
   game_object *bmove(int &whit, game_object *exclude);  // ballestic move, return hit object,
                                                         // or NULL (whit is 1 if hit wall)
-  TImage *picture() { return current_sequence()->get_frame(current_frame,direction); }
+  TransImage *picture() { return current_sequence()->get_frame(current_frame,direction); }
 
   int next_picture();

abuse/trunk/src/scene.cpp

@@ -18 +18 @@
 
 #include "specs.h"
-#include "timage.h"
 #include "jwindow.h"
 #include "fonts.h"

abuse/trunk/src/seq.h

@@ -13 +13 @@
 
 #include "image.h"
+#include "transimage.h"
 #include "items.h"
-#include "timage.h"
 #include "cache.h"
+
 #include <stdarg.h>
 
@@ -30 +31 @@
   int next_frame(short &current) { current++; if (current>=total) { current=0; return 0; } return 1; }
   int last_frame(short &current) { current--; if (current<0) { current=total-1; return 0; } return 1; }
-  TImage  *get_frame(short current, int direction)
+  TransImage  *get_frame(short current, int direction)
    { if (direction>0) return cache.fig(seq[current])->forward;
                  else return cache.fig(seq[current])->backward; }