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

Timestamp:

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

Author:

Sam Hocevar

Message:

imlib: rename TImage to TransImage? for readability.

File:

• abuse/trunk/src/imlib/transimage.cpp (moved) (moved from abuse/trunk/src/imlib/timage.cpp) (16 diffs, 1 prop)

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;