From f314041b6b37bb9274d9fc79946858341befa0f2 Mon Sep 17 00:00:00 2001
From: Mike Buland <mike@xagasoft.com>
Date: Wed, 8 Apr 2015 08:40:05 -0600
Subject: Added image goo + font support.

---
 src/renderpng.cpp | 251 ++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 160 insertions(+), 91 deletions(-)

(limited to 'src/renderpng.cpp')

diff --git a/src/renderpng.cpp b/src/renderpng.cpp
index 21d35ba..6ff9fbe 100644
--- a/src/renderpng.cpp
+++ b/src/renderpng.cpp
@@ -3,11 +3,15 @@
 #include "map.h"
 #include "cell.h"
 
+#include "image.h"
+#include "palette.h"
+#include "font.h"
+
 #include <math.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <png.h>
+#include <stdio.h>
 
 RenderPng::RenderPng( Map &rMap ) :
     rMap( rMap )
@@ -25,16 +29,18 @@ void RenderPng::render()
     if( iDims > 2 )
         iSize = (int)ceil(sqrt((rMap.getDims()-2)*2));
 
-    int iBufWidth = ((iSize+1)*rMap.getSize( 0 )+1)*5;
-    int iBufHeight = ((iSize+1)*rMap.getSize( 1 )+1)*5;
-    int iBufSize = iBufWidth*iBufHeight;
-    uint8_t *pBuf = new uint8_t[iBufSize];
-    uint8_t **pRows = new uint8_t*[iBufHeight];
-    for( int r = 0; r < iBufHeight; r++ )
-    {
-        pRows[r] = pBuf+(iBufWidth*r);
-    }
-    memset( pBuf, 1, iBufSize );
+    int iCellSize = 11;
+    int iCellMid = iCellSize/2;
+    int iBufWidth = ((iSize+1)*rMap.getSize( 0 )+1)*iCellSize;
+    int iBufHeight = ((iSize+1)*rMap.getSize( 1 )+1)*iCellSize+12;
+    int ox = 0;
+    int oy = 12;
+    Image im( iBufWidth, iBufHeight );
+    Font fnt("ter-u12n.bdf");
+    im.clear( 1 );
+    Palette pal;
+    pal.addColor( 0, 0, 0 );
+    pal.addColor( 255, 255, 255 );
 
     Position p( iDims );
     for(;;)
@@ -50,86 +56,138 @@ void RenderPng::render()
                 if( (iRow == 0 || iRow == iSize+1) &&
                     (iCol == 0 || iCol == iSize+1) )
                 {
-                    pRows[(y+iRow)*5+2][(x+iCol)*5+2] = 0;
+                    im.set(
+                        ox+(x+iCol)*iCellSize+iCellMid,
+                        oy+(y+iRow)*iCellSize+iCellMid,
+                        0
+                        );
                     if( iRow == 0 && iCol == 0 )
                     {
                         if( (iWalls&(1<<2)) == 0 )
                         {
-                            for( int i = 0; i < 3; i++ )
-                                pRows[(y+iRow)*5+2][(x+iCol)*5+i+3] = 0;
+                            for( int i = 0; i < iCellMid+1; i++ )
+                                im.set(
+                                    ox+(x+iCol)*iCellSize+i+iCellMid+1,
+                                    oy+(y+iRow)*iCellSize+iCellMid,
+                                    0
+                                    );
                         }
                         if( (iWalls&(1<<0)) == 0 )
                         {
-                            for( int i = 0; i < 3; i++ )
-                                pRows[(y+iRow)*5+i+3][(x+iCol)*5+2] = 0;
+                            for( int i = 0; i < iCellMid+1; i++ )
+                                im.set(
+                                    ox+(x+iCol)*iCellSize+iCellMid,
+                                    oy+(y+iRow)*iCellSize+i+iCellMid+1,
+                                    0
+                                    );
                         }
                     }
                     else if( iRow == 0 && iCol == iSize+1 )
                     {
                         if( (iWalls&(1<<2)) == 0 )
                         {
-                            for( int i = 0; i < 3; i++ )
-                                pRows[(y+iRow)*5+2][(x+iCol)*5+i] = 0;
+                            for( int i = 0; i < iCellMid+1; i++ )
+                                im.set(
+                                    ox+(x+iCol)*iCellSize+i,
+                                    oy+(y+iRow)*iCellSize+iCellMid,
+                                    0
+                                    );
                         }
                         if( (iWalls&(1<<1)) == 0 )
                         {
-                            for( int i = 0; i < 3; i++ )
-                                pRows[(y+iRow)*5+i+3][(x+iCol)*5+2] = 0;
+                            for( int i = 0; i < iCellMid+1; i++ )
+                                im.set(
+                                    ox+(x+iCol)*iCellSize+iCellMid,
+                                    oy+(y+iRow)*iCellSize+i+iCellMid+1,
+                                    0
+                                    );
                         }
                     }
                     else if( iRow == iSize+1 && iCol == 0 )
                     {
                         if( (iWalls&(1<<3)) == 0 )
                         {
-                            for( int i = 0; i < 3; i++ )
-                                pRows[(y+iRow)*5+2][(x+iCol)*5+i+3] = 0;
+                            for( int i = 0; i < iCellMid+1; i++ )
+                                im.set(
+                                    ox+(x+iCol)*iCellSize+i+iCellMid+1,
+                                    oy+(y+iRow)*iCellSize+iCellMid,
+                                    0
+                                    );
                         }
                         if( (iWalls&(1<<0)) == 0 )
                         {
-                            for( int i = 0; i < 3; i++ )
-                                pRows[(y+iRow)*5+i][(x+iCol)*5+2] = 0;
+                            for( int i = 0; i < iCellMid+1; i++ )
+                                im.set(
+                                    ox+(x+iCol)*iCellSize+iCellMid,
+                                    oy+(y+iRow)*iCellSize+i,
+                                    0
+                                    );
                         }
                     }
                     else if( iRow == iSize+1 && iCol == iSize+1 )
                     {
                         if( (iWalls&(1<<3)) == 0 )
                         {
-                            for( int i = 0; i < 3; i++ )
-                                pRows[(y+iRow)*5+2][(x+iCol)*5+i] = 0;
+                            for( int i = 0; i < iCellMid+1; i++ )
+                                im.set(
+                                    ox+(x+iCol)*iCellSize+i,
+                                    oy+(y+iRow)*iCellSize+iCellMid,
+                                    0
+                                    );
                         }
                         if( (iWalls&(1<<1)) == 0 )
                         {
-                            for( int i = 0; i < 3; i++ )
-                                pRows[(y+iRow)*5+i][(x+iCol)*5+2] = 0;
+                            for( int i = 0; i < iCellMid+1; i++ )
+                                im.set(
+                                    ox+(x+iCol)*iCellSize+iCellMid,
+                                    oy+(y+iRow)*iCellSize+i,
+                                    0
+                                    );
                         }
                     }
                 }
                 else if( iRow == 0 && (iWalls&(1<<2)) == 0 )
                 {
-                    for( int i = 0; i < 5; i++ )
+                    for( int i = 0; i < iCellSize; i++ )
                     {
-                        pRows[(y+iRow)*5+2][(x+iCol)*5+i] = 0;
+                        im.set(
+                            ox+(x+iCol)*iCellSize+i,
+                            oy+(y+iRow)*iCellSize+iCellMid,
+                            0
+                            );
                     }
                 }
                 else if( iRow == iSize+1 && (iWalls&(1<<3)) == 0 )
                 {
-                    for( int i = 0; i < 5; i++ )
+                    for( int i = 0; i < iCellSize; i++ )
                     {
-                        pRows[(y+iRow)*5+2][(x+iCol)*5+i] = 0;
+                        im.set(
+                            ox+(x+iCol)*iCellSize+i,
+                            oy+(y+iRow)*iCellSize+iCellMid,
+                            0
+                            );
                     }
                 }
                 else if( iCol == 0 && (iWalls&(1<<0)) == 0 )
                 {
-                    for( int i = 0; i < 5; i++ )
+                    for( int i = 0; i < iCellSize; i++ )
                     {
-                        pRows[(y+iRow)*5+i][(x+iCol)*5+2] = 0;
+                        im.set(
+                            ox+(x+iCol)*iCellSize+iCellMid,
+                            oy+(y+iRow)*iCellSize+i,
+                            0
+                            );
                     }
                 }
                 else if( iCol == iSize+1 && (iWalls&(1<<1)) == 0 )
                 {
-                    for( int i = 0; i < 5; i++ )
+                    for( int i = 0; i < iCellSize; i++ )
                     {
-                        pRows[(y+iRow)*5+i][(x+iCol)*5+2] = 0;
+                        im.set(
+                            ox+(x+iCol)*iCellSize+iCellMid,
+                            oy+(y+iRow)*iCellSize+i,
+                            0
+                            );
                     }
                 }
             }
@@ -142,43 +200,73 @@ void RenderPng::render()
                 int d = j*2+side;
                 if( iWalls&(1<<d) )
                 {
-                    int iSubX = (x+1+((d-4)%iSize))*5;
-                    int iSubY = (y+1+((d-4)/iSize))*5;
-//
-//                    char &c = buf[x+1+iSubX+(y+1+iSubY)*iBufWidth];
-//                    c = cPassages[d];
+                    int iSubX = (x+1+((d-4)%iSize))*iCellSize;
+                    int iSubY = (y+1+((d-4)/iSize))*iCellSize;
+
                     switch( d )
                     {
                         case 4:
-                            pRows[iSubY+1][iSubX+2] = 0;
-                            pRows[iSubY+2][iSubX+1] = 0;
-                            pRows[iSubY+2][iSubX+3] = 0;
-                            pRows[iSubY+3][iSubX+0] = 0;
-                            pRows[iSubY+3][iSubX+4] = 0;
+                            im.set( ox+iSubX+iCellMid, oy+iSubY+1, 0 );
+                            for( int m = 0; m < iCellMid; m++ )
+                            {
+                                im.set( ox+iSubX+m, oy+iSubY+iCellMid-m+1, 0 );
+                                im.set( ox+iSubX+iCellMid+m+1, oy+iSubY+m+2, 0 );
+                            }
+                            /*
+                            im.set( iSubX+2, iSubY+1, 0 );
+                            im.set( iSubX+1, iSubY+2, 0 );
+                            im.set( iSubX+3, iSubY+2, 0 );
+                            im.set( iSubX+0, iSubY+3, 0 );
+                            im.set( iSubX+4, iSubY+3, 0 );
+                            */
                             break;
 
                         case 5:
-                            pRows[iSubY+3][iSubX+2] = 0;
-                            pRows[iSubY+2][iSubX+1] = 0;
-                            pRows[iSubY+2][iSubX+3] = 0;
-                            pRows[iSubY+1][iSubX+0] = 0;
-                            pRows[iSubY+1][iSubX+4] = 0;
+                            im.set( ox+iSubX+iCellMid, oy+iSubY+iCellSize-2, 0 );
+                            for( int m = 0; m < iCellMid; m++ )
+                            {
+                                im.set( ox+iSubX+m, oy+iSubY+iCellMid+m-1, 0 );
+                                im.set( ox+iSubX+iCellMid+m+1, oy+iSubY+iCellSize-m-3, 0 );
+                            }
+                            /*
+                            im.set( iSubX+2, iSubY+3, 0 );
+                            im.set( iSubX+1, iSubY+2, 0 );
+                            im.set( iSubX+3, iSubY+2, 0 );
+                            im.set( iSubX+0, iSubY+1, 0 );
+                            im.set( iSubX+4, iSubY+1, 0 );
+                            */
                             break;
 
                         case 6:
-                            pRows[iSubY+2][iSubX+1] = 0;
-                            pRows[iSubY+1][iSubX+2] = 0;
-                            pRows[iSubY+3][iSubX+2] = 0;
-                            pRows[iSubY+0][iSubX+3] = 0;
-                            pRows[iSubY+4][iSubX+3] = 0;
+                            im.set( ox+iSubX+1, oy+iSubY+iCellMid, 0 );
+                            for( int m = 0; m < iCellMid; m++ )
+                            {
+                                im.set( ox+iSubX+iCellMid-m+1, oy+iSubY+m, 0 );
+                                im.set( ox+iSubX+m+2, oy+iSubY+iCellMid+m+1, 0 );
+                            }
+                            /*
+                            im.set( iSubX+1, iSubY+2, 0 );
+                            im.set( iSubX+2, iSubY+1, 0 );
+                            im.set( iSubX+2, iSubY+3, 0 );
+                            im.set( iSubX+3, iSubY+0, 0 );
+                            im.set( iSubX+3, iSubY+4, 0 );
+                            */
                             break;
 
                         case 7:
-                            pRows[iSubY+2][iSubX+3] = 0;
-                            pRows[iSubY+1][iSubX+2] = 0;
-                            pRows[iSubY+3][iSubX+2] = 0;
-                            pRows[iSubY+0][iSubX+1] = 0;
-                            pRows[iSubY+4][iSubX+1] = 0;
+                            im.set( ox+iSubX+iCellSize-2, oy+iSubY+iCellMid, 0 );
+                            for( int m = 0; m < iCellMid; m++ )
+                            {
+                                im.set( ox+iSubX+iCellMid+m-1, oy+iSubY+m, 0 );
+                                im.set( ox+iSubX+iCellSize-m-3, oy+iSubY+iCellMid+m+1, 0 );
+                            }
+                            /*
+                            im.set( iSubX+3, iSubY+2, 0 );
+                            im.set( iSubX+2, iSubY+1, 0 );
+                            im.set( iSubX+2, iSubY+3, 0 );
+                            im.set( iSubX+1, iSubY+0, 0 );
+                            im.set( iSubX+1, iSubY+4, 0 );
+                            */
                             break;
                     }
                 }
@@ -187,6 +275,7 @@ void RenderPng::render()
 
         int iDim;
         char fname[1024];
+        char title[1024];
         for( iDim = 0; iDim < iDims; iDim++ )
         {
             if( ++p[iDim] < rMap.getSize( iDim ) )
@@ -200,43 +289,25 @@ void RenderPng::render()
                     char buf[1024];
                     sprintf( buf, "-%d", rMap.getSize(2)-p[2] );
                     strcat( fname, buf );
+                    sprintf( buf, "Floor: %d", rMap.getSize(2)-p[2] );
+                    strcpy( title, buf );
                     for( int j = 3; j < iDims; j++ )
                     {
                         sprintf( buf, "-%d", rMap.getSize(j)-p[j] );
                         strcat( fname, buf );
+                        sprintf( buf, ", %d", rMap.getSize(j)-p[j] );
+                        strcat( title, buf );
                     }
                 }
+                else
+                    title[0] = '\0';
+                im.drawText( fnt, ox, oy-2, 0, title );
                 strcat( fname, ".png");
                 printf("Output: %s\n", fname );
-    
-                png_structp png_ptr = png_create_write_struct(
-                    PNG_LIBPNG_VER_STRING, NULL, NULL, NULL
-                    );
-                png_infop info_ptr = png_create_info_struct(png_ptr);
-                png_set_IHDR(png_ptr, info_ptr, iBufWidth, iBufHeight,
-                    8, PNG_COLOR_TYPE_PALETTE, PNG_INTERLACE_NONE,
-                    PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT
-                    );
-                png_color col[2];
-                col[0].red = col[0].green = col[0].blue = 0;
-                col[1].red = col[1].green = col[1].blue = 255;
-                png_set_PLTE( png_ptr, info_ptr, col, 2);
-
-                png_set_rows( png_ptr, info_ptr, pRows );
-
-                FILE *fp = fopen(fname, "wb");
-                if( fp == NULL )
-                {
-                    printf("Error opening file!\n");
-                    exit( 1 );
-                }
-                
-                png_init_io( png_ptr, fp );
-                png_write_png( png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL );
-                png_destroy_write_struct( &png_ptr, &info_ptr );
-                fclose( fp );
+   
+                im.save( fname, pal );
 
-                memset( pBuf, 1, iBufSize );
+                im.clear( 1 );
             }
         }
         if( iDim == iDims )
@@ -260,7 +331,5 @@ void RenderPng::render()
     }
 //                printf(buf);
 
-    delete[] pBuf;
-    delete[] pRows;
 }
 
-- 
cgit v1.2.3