diff tools/auval.c @ 1327:59e9ad13b50e

Move common functions to libgutil.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 22 Aug 2017 13:18:21 +0300
parents 2260ed90ab6b
children
line wrap: on
line diff
--- a/tools/auval.c	Tue Aug 22 02:05:40 2017 +0300
+++ b/tools/auval.c	Tue Aug 22 13:18:21 2017 +0300
@@ -1,9 +1,11 @@
 #include "dmlib.h"
+#include "libgutil.h"
 #include "dmargs.h"
 #include "dmeval.h"
 #include "dmtext.h"
 #include <math.h>
 
+
 #define AUVAL_NAME           "AuVal"
 #define AUVAL_VERSION        "0.6"
 #define AUVAL_TMPBUF_SIZE    (4096)
@@ -318,112 +320,6 @@
 }
 
 
-void dmFillRect(SDL_Surface *screen, int x0, int y0, int x1, int y1, Uint32 col)
-{
-    SDL_Rect rc;
-    rc.x = x0;
-    rc.y = y0;
-    rc.w = x1 - x0 + 1;
-    rc.h = y1 - y0 + 1;
-    SDL_FillRect(screen, &rc, col);
-}
-
-
-void dmDrawHLine(SDL_Surface *screen, int x0, int x1, int yc, const Uint32 col)
-{
-    const int bpp = screen->format->BytesPerPixel,
-              cx0 = screen->clip_rect.x, cy0 = screen->clip_rect.y,
-              cx1 = screen->clip_rect.x + screen->clip_rect.w - 1,
-              cy1 = screen->clip_rect.y + screen->clip_rect.h - 1;
-
-    DM_SWAP(int, x0, x1);
-    if (yc < cy0|| yc > cy1 || x1 < cx0 || x0 > cx1) return;
-    if (x0 < cx0) x0 = cx0;
-    if (x1 > cx1) x1 = cx1;
-
-    int x = x1 - x0 + 1;
-    Uint8 *pix = ((Uint8 *) screen->pixels) + yc * screen->pitch + (x0 * bpp);
-    switch (screen->format->BitsPerPixel)
-    {
-        case 8:
-            while (x--)
-                *pix++ = col;
-            break;
-
-        case 32:
-            {
-                Uint32 *p = (Uint32 *) pix;
-                while (x--)
-                    *p++ = col;
-            }
-            break;
-    }
-}
-
-
-void dmDrawVLine(SDL_Surface *screen, int y0, int y1, int xc, const Uint32 col)
-{
-    const int bpp = screen->format->BytesPerPixel,
-              pitch = screen->pitch / bpp,
-              cx0 = screen->clip_rect.x, cy0 = screen->clip_rect.y,
-              cx1 = screen->clip_rect.x + screen->clip_rect.w - 1,
-              cy1 = screen->clip_rect.y + screen->clip_rect.h - 1;
-
-    DM_SWAP(int, y0, y1);
-    if (xc < cx0 || xc > cx1 || y1 < cy0 || y0 > cy1) return;
-    if (y0 < cy0) y0 = cy0;
-    if (y1 > cy1) y1 = cy1;
-
-    int y = y1 - y0 + 1;
-    Uint8 *pix = ((Uint8 *) screen->pixels) + y0 * screen->pitch + (xc * bpp);
-    switch (screen->format->BitsPerPixel)
-    {
-        case 8:
-            while (y--)
-            {
-                *pix = col;
-                pix += pitch;
-            }
-            break;
-
-        case 32:
-            {
-                Uint32 *p = (Uint32 *) pix;
-                while (y--)
-                {
-                    *p = col;
-                    p += pitch;
-                }
-            }
-            break;
-    }
-}
-
-
-void dmDrawBox3D(SDL_Surface *screen, int x0, int y0, int x1, int y1, Uint32 ucol, Uint32 dcol)
-{
-    dmDrawHLine(screen, x0    , x1 - 1, y0, ucol);
-    dmDrawHLine(screen, x0 + 1, x1    , y1, dcol);
-
-    dmDrawVLine(screen, y0    , y1 - 1, x0, ucol);
-    dmDrawVLine(screen, y0 + 1, y1    , x1, dcol);
-}
-
-
-void dmFillBox3D(SDL_Surface *screen, int x0, int y0, int x1, int y1, Uint32 bgcol, Uint32 ucol, Uint32 dcol)
-{
-    SDL_Rect rc;
-
-    rc.x = x0 + 1;
-    rc.y = y0 + 1;
-    rc.w = x1 - x0 - 1;
-    rc.h = y1 - y0 - 1;
-    SDL_FillRect(screen, &rc, bgcol);
-
-    dmDrawBox3D(screen, x0, y0, x1, y1, ucol, dcol);
-}
-
-
 BOOL au_init_video(SDL_Surface **screen)
 {
     *screen = SDL_SetVideoMode(optScrWidth, optScrHeight, optScrDepth, optVFlags | SDL_RESIZABLE);