david/mazemaker
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Add color options, bump minor version

Browse Source
This commit is contained in:
David Baer
2021-05-09 18:20:46 -04:00
parent d5475ba2de
commit e05724ea53
8 changed files with 121 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/CMakeLists.txt
View File

@@ -1,7 +1,7 @@
project(mazemaker_lib)
cmake_minimum_required (VERSION 2.8.12)
set (mazemaker_SOVERSION_CURRENT 0)
set (mazemaker_SOVERSION_REVISION 1)
set (mazemaker_SOVERSION_REVISION 2)
set (mazemaker_SOVERSION_AGE 0)
math (EXPR mazemaker_SOVERSION_MAJOR "${mazemaker_SOVERSION_CURRENT} - ${mazemaker_SOVERSION_AGE}")
math (EXPR mazemaker_SOVERSION_MINOR "${mazemaker_SOVERSION_AGE} + ${mazemaker_SOVERSION_REVISION}")

39
lib/image.c
View File

@@ -6,6 +6,7 @@
#include <string.h>
#include <mazemaker.h>
#include "grid.h"
#include "options.h"
#define LINE_THICKNESS 3
#define BLOCK_SIZE 32
@@ -43,7 +44,7 @@ static img_data_t* gridToImageData(mazegrid_t const* g) {
result->data = malloc(result->w * result->h);
//fprintf(stderr, "Box dimensions: %d x %d\n", result->w, result->h);
// white background
// set background
memset(result->data, 0, result->w * result->h);
// draw basic outline
@@ -71,16 +72,20 @@ static img_data_t* gridToImageData(mazegrid_t const* g) {
return result;
}
static void writeImageData(img_data_t const* img, png_structp png_ptr) {
static void writeImageData(img_data_t const* img, png_structp png_ptr, mazeoptions_t const* options) {
for (int i = 0; i < img->h; i++) {
png_byte row[3 * img->w];
for (int j = 0; j < img->w; j++) {
if (img->data[i * img->w + j]) {
// black
row[3 * j] = row[3 * j + 1] = row[3 * j + 2] = 0;
// wall color
row[3 * j] = options->wall_color[0];
row[3 * j + 1] = options->wall_color[1];
row[3 * j + 2] = options->wall_color[2];
} else {
// white
row[3 * j] = row[3 * j + 1] = row[3 * j + 2] = 255;
// background
row[3 * j] = options->background_color[0];
row[3 * j + 1] = options->background_color[1];
row[3 * j + 2] = options->background_color[2];
}
}
png_write_row(png_ptr, row);
@@ -92,7 +97,7 @@ static void freeImageData(img_data_t* img) {
free(img);
}
int mazemaker_maze_to_png(mazegrid_t const* g, char const* filename) {
int mazemaker_maze_to_png_opt(mazegrid_t const* g, char const* filename, mazeoptions_t const* options) {
int code = 1;
img_data_t* img = gridToImageData(g);
FILE *f = NULL;
@@ -139,7 +144,7 @@ int mazemaker_maze_to_png(mazegrid_t const* g, char const* filename) {
png_write_info(png_ptr, info_ptr);
writeImageData(img, png_ptr);
writeImageData(img, png_ptr, options);
png_write_end(png_ptr, NULL);
@@ -156,6 +161,13 @@ exit:
return code;
}
int mazemaker_maze_to_png(mazegrid_t const* g, char const* filename) {
mazeoptions_t* options = mazemaker_options_new(); // use default options
int result = mazemaker_maze_to_png_opt(g, filename, options);
mazemaker_options_free(options);
return result;
}
static void append_png_data(png_structp png_ptr, png_bytep data, png_size_t length) {
struct mem_encode* p = (struct mem_encode*)png_get_io_ptr(png_ptr);
size_t nsize = p->size + length;
@@ -173,7 +185,7 @@ static void png_no_flush(png_structp png_ptr) {
/* noop */
}
int mazemaker_maze_to_png_mem(mazegrid_t const* g, size_t* len, uint8_t** buf) {
int mazemaker_maze_to_png_mem_opt(mazegrid_t const* g, size_t* len, uint8_t** buf, mazeoptions_t const* options) {
int code = 1;
img_data_t* img = gridToImageData(g);
png_structp png_ptr = NULL;
@@ -209,7 +221,7 @@ int mazemaker_maze_to_png_mem(mazegrid_t const* g, size_t* len, uint8_t** buf) {
png_write_info(png_ptr, info_ptr);
writeImageData(img, png_ptr);
writeImageData(img, png_ptr, options);
png_write_end(png_ptr, NULL);
@@ -228,3 +240,10 @@ exit:
if (img != NULL) freeImageData(img);
return code;
}
int mazemaker_maze_to_png_mem(mazegrid_t const* g, size_t* len, uint8_t** buf) {
mazeoptions_t* options = mazemaker_options_new(); // use default options
int result = mazemaker_maze_to_png_mem_opt(g, len, buf, options);
mazemaker_options_free(options);
return result;
}

55
lib/options.c Normal file
View File

@@ -0,0 +1,55 @@
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "options.h"
mazeoptions_t* mazemaker_options_new() {
mazeoptions_t* result = malloc(sizeof(mazeoptions_t));
// set defaults
memset(result->wall_color, 0, 3);
memset(result->background_color, 0xff, 3);
return result;
}
void mazemaker_options_free(mazeoptions_t* options) {
free(options);
}
static int stringToColor(char const* color_desc, rgb_color_t dst) {
if (color_desc[0] != '#') return -1; // bad format
size_t l;
for (l = 1; color_desc[l] != '\0'; l++) if (!isxdigit(color_desc[l])) return -1; // bad format
if ((l != 4) && (l != 7)) return -1; // bad format
char x2[3] = { 0, 0, 0};
if (l == 4) {
x2[0] = x2[1] = color_desc[1];
sscanf(x2, "%hhx", &dst[0]);
x2[0] = x2[1] = color_desc[2];
sscanf(x2, "%hhx", &dst[1]);
x2[0] = x2[1] = color_desc[3];
sscanf(x2, "%hhx", &dst[2]);
} else {
strncpy(x2, color_desc + 1, 2);
sscanf(x2, "%hhx", &dst[0]);
strncpy(x2, color_desc + 3, 2);
sscanf(x2, "%hhx", &dst[1]);
strncpy(x2, color_desc + 5, 2);
sscanf(x2, "%hhx", &dst[2]);
}
return 0;
}
int mazemaker_options_set_wall_color(mazeoptions_t* options, char const* color_desc) {
return stringToColor(color_desc, options->wall_color);
}
int mazemaker_options_set_background_color(mazeoptions_t* options, char const* color_desc) {
return stringToColor(color_desc, options->background_color);
}

13
lib/options.h Normal file
View File

@@ -0,0 +1,13 @@
#ifndef _OPTIONS_H
#define _OPTIONS_H 1
#include <stdint.h>
typedef uint8_t rgb_color_t[3];
typedef struct mazeoptions {
rgb_color_t wall_color;
rgb_color_t background_color;
} mazeoptions_t;
#endif // !def(_OPTIONS_H)