diff --git a/CMakeLists.txt b/CMakeLists.txt index cfe07f40..f685f636 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -244,7 +244,8 @@ set_property(SOURCE src/main.cpp PROPERTY COMPILE_DEFINITIONS OJ_URL="${PROJECT_HOMEPAGE_URL}"; OJ_BUGREPORT="${OJ_BUGREPORT}") target_link_libraries(OpenJazz - argparse miniz psmplug ${OJ_LIBS_SCALE} ${OJ_LIBS_SDL} ${OJ_LIBS_NET} ${OJ_LIBS_HOST}) + argparse miniz psmplug stb + ${OJ_LIBS_SCALE} ${OJ_LIBS_SDL} ${OJ_LIBS_NET} ${OJ_LIBS_HOST}) # platform stuff diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt index a8b16b05..a4295957 100644 --- a/ext/CMakeLists.txt +++ b/ext/CMakeLists.txt @@ -2,14 +2,14 @@ # argparse add_library(argparse STATIC argparse/argparse.h argparse/argparse.cpp) -target_include_directories(argparse PUBLIC argparse) +target_include_directories(argparse INTERFACE argparse) # miniz add_library(miniz STATIC miniz/miniz.h miniz/miniz.cpp) -target_compile_definitions(miniz PUBLIC MINIZ_NO_ARCHIVE_APIS) +target_compile_definitions(miniz INTERFACE MINIZ_NO_ARCHIVE_APIS) #target_compile_definitions(miniz PRIVATE _LARGEFILE64_SOURCE) -target_include_directories(miniz PUBLIC miniz) +target_include_directories(miniz INTERFACE miniz) # psmplug @@ -27,4 +27,9 @@ add_library(psmplug STATIC psmplug/stdafx.h psmplug/tables.h ) -target_include_directories(psmplug PUBLIC psmplug) +target_include_directories(psmplug INTERFACE psmplug) + +# stb + +add_library(stb STATIC stb/stb_rect_pack.h stb/stb_rect_pack.cpp) +target_include_directories(stb INTERFACE stb) diff --git a/ext/stb/LICENSE b/ext/stb/LICENSE new file mode 100644 index 00000000..a77ae91f --- /dev/null +++ b/ext/stb/LICENSE @@ -0,0 +1,37 @@ +This software is available under 2 licenses -- choose whichever you prefer. +------------------------------------------------------------------------------ +ALTERNATIVE A - MIT License +Copyright (c) 2017 Sean Barrett +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +------------------------------------------------------------------------------ +ALTERNATIVE B - Public Domain (www.unlicense.org) +This is free and unencumbered software released into the public domain. +Anyone is free to copy, modify, publish, use, compile, sell, or distribute this +software, either in source code form or as a compiled binary, for any purpose, +commercial or non-commercial, and by any means. +In jurisdictions that recognize copyright laws, the author or authors of this +software dedicate any and all copyright interest in the software to the public +domain. We make this dedication for the benefit of the public at large and to +the detriment of our heirs and successors. We intend this dedication to be an +overt act of relinquishment in perpetuity of all present and future rights to +this software under copyright law. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/ext/stb/stb_rect_pack.cpp b/ext/stb/stb_rect_pack.cpp new file mode 100644 index 00000000..31c4106b --- /dev/null +++ b/ext/stb/stb_rect_pack.cpp @@ -0,0 +1,2 @@ +#define STB_RECT_PACK_IMPLEMENTATION +#include "stb_rect_pack.h" diff --git a/ext/stb/stb_rect_pack.h b/ext/stb/stb_rect_pack.h new file mode 100644 index 00000000..6a633ce6 --- /dev/null +++ b/ext/stb/stb_rect_pack.h @@ -0,0 +1,623 @@ +// stb_rect_pack.h - v1.01 - public domain - rectangle packing +// Sean Barrett 2014 +// +// Useful for e.g. packing rectangular textures into an atlas. +// Does not do rotation. +// +// Before #including, +// +// #define STB_RECT_PACK_IMPLEMENTATION +// +// in the file that you want to have the implementation. +// +// Not necessarily the awesomest packing method, but better than +// the totally naive one in stb_truetype (which is primarily what +// this is meant to replace). +// +// Has only had a few tests run, may have issues. +// +// More docs to come. +// +// No memory allocations; uses qsort() and assert() from stdlib. +// Can override those by defining STBRP_SORT and STBRP_ASSERT. +// +// This library currently uses the Skyline Bottom-Left algorithm. +// +// Please note: better rectangle packers are welcome! Please +// implement them to the same API, but with a different init +// function. +// +// Credits +// +// Library +// Sean Barrett +// Minor features +// Martins Mozeiko +// github:IntellectualKitty +// +// Bugfixes / warning fixes +// Jeremy Jaussaud +// Fabian Giesen +// +// Version history: +// +// 1.01 (2021-07-11) always use large rect mode, expose STBRP__MAXVAL in public section +// 1.00 (2019-02-25) avoid small space waste; gracefully fail too-wide rectangles +// 0.99 (2019-02-07) warning fixes +// 0.11 (2017-03-03) return packing success/fail result +// 0.10 (2016-10-25) remove cast-away-const to avoid warnings +// 0.09 (2016-08-27) fix compiler warnings +// 0.08 (2015-09-13) really fix bug with empty rects (w=0 or h=0) +// 0.07 (2015-09-13) fix bug with empty rects (w=0 or h=0) +// 0.06 (2015-04-15) added STBRP_SORT to allow replacing qsort +// 0.05: added STBRP_ASSERT to allow replacing assert +// 0.04: fixed minor bug in STBRP_LARGE_RECTS support +// 0.01: initial release +// +// LICENSE +// +// See end of file for license information. + +////////////////////////////////////////////////////////////////////////////// +// +// INCLUDE SECTION +// + +#ifndef STB_INCLUDE_STB_RECT_PACK_H +#define STB_INCLUDE_STB_RECT_PACK_H + +#define STB_RECT_PACK_VERSION 1 + +#ifdef STBRP_STATIC +#define STBRP_DEF static +#else +#define STBRP_DEF extern +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct stbrp_context stbrp_context; +typedef struct stbrp_node stbrp_node; +typedef struct stbrp_rect stbrp_rect; + +typedef int stbrp_coord; + +#define STBRP__MAXVAL 0x7fffffff +// Mostly for internal use, but this is the maximum supported coordinate value. + +STBRP_DEF int stbrp_pack_rects (stbrp_context *context, stbrp_rect *rects, int num_rects); +// Assign packed locations to rectangles. The rectangles are of type +// 'stbrp_rect' defined below, stored in the array 'rects', and there +// are 'num_rects' many of them. +// +// Rectangles which are successfully packed have the 'was_packed' flag +// set to a non-zero value and 'x' and 'y' store the minimum location +// on each axis (i.e. bottom-left in cartesian coordinates, top-left +// if you imagine y increasing downwards). Rectangles which do not fit +// have the 'was_packed' flag set to 0. +// +// You should not try to access the 'rects' array from another thread +// while this function is running, as the function temporarily reorders +// the array while it executes. +// +// To pack into another rectangle, you need to call stbrp_init_target +// again. To continue packing into the same rectangle, you can call +// this function again. Calling this multiple times with multiple rect +// arrays will probably produce worse packing results than calling it +// a single time with the full rectangle array, but the option is +// available. +// +// The function returns 1 if all of the rectangles were successfully +// packed and 0 otherwise. + +struct stbrp_rect +{ + // reserved for your use: + int id; + + // input: + stbrp_coord w, h; + + // output: + stbrp_coord x, y; + int was_packed; // non-zero if valid packing + +}; // 16 bytes, nominally + + +STBRP_DEF void stbrp_init_target (stbrp_context *context, int width, int height, stbrp_node *nodes, int num_nodes); +// Initialize a rectangle packer to: +// pack a rectangle that is 'width' by 'height' in dimensions +// using temporary storage provided by the array 'nodes', which is 'num_nodes' long +// +// You must call this function every time you start packing into a new target. +// +// There is no "shutdown" function. The 'nodes' memory must stay valid for +// the following stbrp_pack_rects() call (or calls), but can be freed after +// the call (or calls) finish. +// +// Note: to guarantee best results, either: +// 1. make sure 'num_nodes' >= 'width' +// or 2. call stbrp_allow_out_of_mem() defined below with 'allow_out_of_mem = 1' +// +// If you don't do either of the above things, widths will be quantized to multiples +// of small integers to guarantee the algorithm doesn't run out of temporary storage. +// +// If you do #2, then the non-quantized algorithm will be used, but the algorithm +// may run out of temporary storage and be unable to pack some rectangles. + +STBRP_DEF void stbrp_setup_allow_out_of_mem (stbrp_context *context, int allow_out_of_mem); +// Optionally call this function after init but before doing any packing to +// change the handling of the out-of-temp-memory scenario, described above. +// If you call init again, this will be reset to the default (false). + + +STBRP_DEF void stbrp_setup_heuristic (stbrp_context *context, int heuristic); +// Optionally select which packing heuristic the library should use. Different +// heuristics will produce better/worse results for different data sets. +// If you call init again, this will be reset to the default. + +enum +{ + STBRP_HEURISTIC_Skyline_default=0, + STBRP_HEURISTIC_Skyline_BL_sortHeight = STBRP_HEURISTIC_Skyline_default, + STBRP_HEURISTIC_Skyline_BF_sortHeight +}; + + +////////////////////////////////////////////////////////////////////////////// +// +// the details of the following structures don't matter to you, but they must +// be visible so you can handle the memory allocations for them + +struct stbrp_node +{ + stbrp_coord x,y; + stbrp_node *next; +}; + +struct stbrp_context +{ + int width; + int height; + int align; + int init_mode; + int heuristic; + int num_nodes; + stbrp_node *active_head; + stbrp_node *free_head; + stbrp_node extra[2]; // we allocate two extra nodes so optimal user-node-count is 'width' not 'width+2' +}; + +#ifdef __cplusplus +} +#endif + +#endif + +////////////////////////////////////////////////////////////////////////////// +// +// IMPLEMENTATION SECTION +// + +#ifdef STB_RECT_PACK_IMPLEMENTATION +#ifndef STBRP_SORT +#include +#define STBRP_SORT qsort +#endif + +#ifndef STBRP_ASSERT +#include +#define STBRP_ASSERT assert +#endif + +#ifdef _MSC_VER +#define STBRP__NOTUSED(v) (void)(v) +#define STBRP__CDECL __cdecl +#else +#define STBRP__NOTUSED(v) (void)sizeof(v) +#define STBRP__CDECL +#endif + +enum +{ + STBRP__INIT_skyline = 1 +}; + +STBRP_DEF void stbrp_setup_heuristic(stbrp_context *context, int heuristic) +{ + switch (context->init_mode) { + case STBRP__INIT_skyline: + STBRP_ASSERT(heuristic == STBRP_HEURISTIC_Skyline_BL_sortHeight || heuristic == STBRP_HEURISTIC_Skyline_BF_sortHeight); + context->heuristic = heuristic; + break; + default: + STBRP_ASSERT(0); + } +} + +STBRP_DEF void stbrp_setup_allow_out_of_mem(stbrp_context *context, int allow_out_of_mem) +{ + if (allow_out_of_mem) + // if it's ok to run out of memory, then don't bother aligning them; + // this gives better packing, but may fail due to OOM (even though + // the rectangles easily fit). @TODO a smarter approach would be to only + // quantize once we've hit OOM, then we could get rid of this parameter. + context->align = 1; + else { + // if it's not ok to run out of memory, then quantize the widths + // so that num_nodes is always enough nodes. + // + // I.e. num_nodes * align >= width + // align >= width / num_nodes + // align = ceil(width/num_nodes) + + context->align = (context->width + context->num_nodes-1) / context->num_nodes; + } +} + +STBRP_DEF void stbrp_init_target(stbrp_context *context, int width, int height, stbrp_node *nodes, int num_nodes) +{ + int i; + + for (i=0; i < num_nodes-1; ++i) + nodes[i].next = &nodes[i+1]; + nodes[i].next = NULL; + context->init_mode = STBRP__INIT_skyline; + context->heuristic = STBRP_HEURISTIC_Skyline_default; + context->free_head = &nodes[0]; + context->active_head = &context->extra[0]; + context->width = width; + context->height = height; + context->num_nodes = num_nodes; + stbrp_setup_allow_out_of_mem(context, 0); + + // node 0 is the full width, node 1 is the sentinel (lets us not store width explicitly) + context->extra[0].x = 0; + context->extra[0].y = 0; + context->extra[0].next = &context->extra[1]; + context->extra[1].x = (stbrp_coord) width; + context->extra[1].y = (1<<30); + context->extra[1].next = NULL; +} + +// find minimum y position if it starts at x1 +static int stbrp__skyline_find_min_y(stbrp_context *c, stbrp_node *first, int x0, int width, int *pwaste) +{ + stbrp_node *node = first; + int x1 = x0 + width; + int min_y, visited_width, waste_area; + + STBRP__NOTUSED(c); + + STBRP_ASSERT(first->x <= x0); + + #if 0 + // skip in case we're past the node + while (node->next->x <= x0) + ++node; + #else + STBRP_ASSERT(node->next->x > x0); // we ended up handling this in the caller for efficiency + #endif + + STBRP_ASSERT(node->x <= x0); + + min_y = 0; + waste_area = 0; + visited_width = 0; + while (node->x < x1) { + if (node->y > min_y) { + // raise min_y higher. + // we've accounted for all waste up to min_y, + // but we'll now add more waste for everything we've visted + waste_area += visited_width * (node->y - min_y); + min_y = node->y; + // the first time through, visited_width might be reduced + if (node->x < x0) + visited_width += node->next->x - x0; + else + visited_width += node->next->x - node->x; + } else { + // add waste area + int under_width = node->next->x - node->x; + if (under_width + visited_width > width) + under_width = width - visited_width; + waste_area += under_width * (min_y - node->y); + visited_width += under_width; + } + node = node->next; + } + + *pwaste = waste_area; + return min_y; +} + +typedef struct +{ + int x,y; + stbrp_node **prev_link; +} stbrp__findresult; + +static stbrp__findresult stbrp__skyline_find_best_pos(stbrp_context *c, int width, int height) +{ + int best_waste = (1<<30), best_x, best_y = (1 << 30); + stbrp__findresult fr; + stbrp_node **prev, *node, *tail, **best = NULL; + + // align to multiple of c->align + width = (width + c->align - 1); + width -= width % c->align; + STBRP_ASSERT(width % c->align == 0); + + // if it can't possibly fit, bail immediately + if (width > c->width || height > c->height) { + fr.prev_link = NULL; + fr.x = fr.y = 0; + return fr; + } + + node = c->active_head; + prev = &c->active_head; + while (node->x + width <= c->width) { + int y,waste; + y = stbrp__skyline_find_min_y(c, node, node->x, width, &waste); + if (c->heuristic == STBRP_HEURISTIC_Skyline_BL_sortHeight) { // actually just want to test BL + // bottom left + if (y < best_y) { + best_y = y; + best = prev; + } + } else { + // best-fit + if (y + height <= c->height) { + // can only use it if it first vertically + if (y < best_y || (y == best_y && waste < best_waste)) { + best_y = y; + best_waste = waste; + best = prev; + } + } + } + prev = &node->next; + node = node->next; + } + + best_x = (best == NULL) ? 0 : (*best)->x; + + // if doing best-fit (BF), we also have to try aligning right edge to each node position + // + // e.g, if fitting + // + // ____________________ + // |____________________| + // + // into + // + // | | + // | ____________| + // |____________| + // + // then right-aligned reduces waste, but bottom-left BL is always chooses left-aligned + // + // This makes BF take about 2x the time + + if (c->heuristic == STBRP_HEURISTIC_Skyline_BF_sortHeight) { + tail = c->active_head; + node = c->active_head; + prev = &c->active_head; + // find first node that's admissible + while (tail->x < width) + tail = tail->next; + while (tail) { + int xpos = tail->x - width; + int y,waste; + STBRP_ASSERT(xpos >= 0); + // find the left position that matches this + while (node->next->x <= xpos) { + prev = &node->next; + node = node->next; + } + STBRP_ASSERT(node->next->x > xpos && node->x <= xpos); + y = stbrp__skyline_find_min_y(c, node, xpos, width, &waste); + if (y + height <= c->height) { + if (y <= best_y) { + if (y < best_y || waste < best_waste || (waste==best_waste && xpos < best_x)) { + best_x = xpos; + STBRP_ASSERT(y <= best_y); + best_y = y; + best_waste = waste; + best = prev; + } + } + } + tail = tail->next; + } + } + + fr.prev_link = best; + fr.x = best_x; + fr.y = best_y; + return fr; +} + +static stbrp__findresult stbrp__skyline_pack_rectangle(stbrp_context *context, int width, int height) +{ + // find best position according to heuristic + stbrp__findresult res = stbrp__skyline_find_best_pos(context, width, height); + stbrp_node *node, *cur; + + // bail if: + // 1. it failed + // 2. the best node doesn't fit (we don't always check this) + // 3. we're out of memory + if (res.prev_link == NULL || res.y + height > context->height || context->free_head == NULL) { + res.prev_link = NULL; + return res; + } + + // on success, create new node + node = context->free_head; + node->x = (stbrp_coord) res.x; + node->y = (stbrp_coord) (res.y + height); + + context->free_head = node->next; + + // insert the new node into the right starting point, and + // let 'cur' point to the remaining nodes needing to be + // stiched back in + + cur = *res.prev_link; + if (cur->x < res.x) { + // preserve the existing one, so start testing with the next one + stbrp_node *next = cur->next; + cur->next = node; + cur = next; + } else { + *res.prev_link = node; + } + + // from here, traverse cur and free the nodes, until we get to one + // that shouldn't be freed + while (cur->next && cur->next->x <= res.x + width) { + stbrp_node *next = cur->next; + // move the current node to the free list + cur->next = context->free_head; + context->free_head = cur; + cur = next; + } + + // stitch the list back in + node->next = cur; + + if (cur->x < res.x + width) + cur->x = (stbrp_coord) (res.x + width); + +#ifdef _DEBUG + cur = context->active_head; + while (cur->x < context->width) { + STBRP_ASSERT(cur->x < cur->next->x); + cur = cur->next; + } + STBRP_ASSERT(cur->next == NULL); + + { + int count=0; + cur = context->active_head; + while (cur) { + cur = cur->next; + ++count; + } + cur = context->free_head; + while (cur) { + cur = cur->next; + ++count; + } + STBRP_ASSERT(count == context->num_nodes+2); + } +#endif + + return res; +} + +static int STBRP__CDECL rect_height_compare(const void *a, const void *b) +{ + const stbrp_rect *p = (const stbrp_rect *) a; + const stbrp_rect *q = (const stbrp_rect *) b; + if (p->h > q->h) + return -1; + if (p->h < q->h) + return 1; + return (p->w > q->w) ? -1 : (p->w < q->w); +} + +static int STBRP__CDECL rect_original_order(const void *a, const void *b) +{ + const stbrp_rect *p = (const stbrp_rect *) a; + const stbrp_rect *q = (const stbrp_rect *) b; + return (p->was_packed < q->was_packed) ? -1 : (p->was_packed > q->was_packed); +} + +STBRP_DEF int stbrp_pack_rects(stbrp_context *context, stbrp_rect *rects, int num_rects) +{ + int i, all_rects_packed = 1; + + // we use the 'was_packed' field internally to allow sorting/unsorting + for (i=0; i < num_rects; ++i) { + rects[i].was_packed = i; + } + + // sort according to heuristic + STBRP_SORT(rects, num_rects, sizeof(rects[0]), rect_height_compare); + + for (i=0; i < num_rects; ++i) { + if (rects[i].w == 0 || rects[i].h == 0) { + rects[i].x = rects[i].y = 0; // empty rect needs no space + } else { + stbrp__findresult fr = stbrp__skyline_pack_rectangle(context, rects[i].w, rects[i].h); + if (fr.prev_link) { + rects[i].x = (stbrp_coord) fr.x; + rects[i].y = (stbrp_coord) fr.y; + } else { + rects[i].x = rects[i].y = STBRP__MAXVAL; + } + } + } + + // unsort + STBRP_SORT(rects, num_rects, sizeof(rects[0]), rect_original_order); + + // set was_packed flags and all_rects_packed status + for (i=0; i < num_rects; ++i) { + rects[i].was_packed = !(rects[i].x == STBRP__MAXVAL && rects[i].y == STBRP__MAXVAL); + if (!rects[i].was_packed) + all_rects_packed = 0; + } + + // return the all_rects_packed status + return all_rects_packed; +} +#endif + +/* +------------------------------------------------------------------------------ +This software is available under 2 licenses -- choose whichever you prefer. +------------------------------------------------------------------------------ +ALTERNATIVE A - MIT License +Copyright (c) 2017 Sean Barrett +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +------------------------------------------------------------------------------ +ALTERNATIVE B - Public Domain (www.unlicense.org) +This is free and unencumbered software released into the public domain. +Anyone is free to copy, modify, publish, use, compile, sell, or distribute this +software, either in source code form or as a compiled binary, for any purpose, +commercial or non-commercial, and by any means. +In jurisdictions that recognize copyright laws, the author or authors of this +software dedicate any and all copyright interest in the software to the public +domain. We make this dedication for the benefit of the public at large and to +the detriment of our heirs and successors. We intend this dedication to be an +overt act of relinquishment in perpetuity of all present and future rights to +this software under copyright law. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +------------------------------------------------------------------------------ +*/ diff --git a/licenses.txt b/licenses.txt index 2d443e11..750b4268 100644 --- a/licenses.txt +++ b/licenses.txt @@ -119,3 +119,31 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + + +================================================================================ + stb_rect_pack +================================================================================ + +Copyright (c) 2017 Sean Barrett + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + + diff --git a/src/io/gfx/font.cpp b/src/io/gfx/font.cpp index 8390f8c4..69367b32 100644 --- a/src/io/gfx/font.cpp +++ b/src/io/gfx/font.cpp @@ -20,13 +20,37 @@ * */ - -#include "../file.h" +#include "io/file.h" #include "font.h" #include "video.h" +#include "io/log.h" +#include #include +namespace { + constexpr unsigned int INVALID_FONT_CHAR = -1; + + constexpr int normalPadding = 2; + constexpr int sceneStringPadding = 1; +} + +void Font::commonSetup() { + isOk = false; + lineHeight = 0; + spaceWidth = 0; + nCharacters = MAX_FONT_CHARS; + memset(atlasRects, 0, sizeof(atlasRects)); + memset(map, INVALID_FONT_CHAR, sizeof(map)); +} + +void Font::cleanMapping() { + // remove empty + for (int i = 0; i < MAX_FONT_CHARS; i++) { + if (map[i] >= static_cast(nCharacters)) + map[i] = INVALID_FONT_CHAR; + } +} /** * Load a font from the given .0FN file. @@ -34,118 +58,124 @@ * @param fileName Name of an .0FN file */ Font::Font (const char* fileName) { - - File* file; - unsigned char* pixels; - unsigned char* blank; - int fileSize; - int count, width, height; + commonSetup(); // Load font from a font file - - try { - - file = new File(fileName, PATH_TYPE_GAME); - - } catch (int e) { - - throw; - + File* file = new File(fileName, PATH_TYPE_GAME); + int fileSize = file->getSize(); + + // Checking font file + unsigned char *identifier1 = file->loadBlock(18); + char identifier2 = file->loadChar(); + if (memcmp(identifier1, "Digital Dimensions", 18) != 0 || identifier2 != 0x1A) { + LOG_ERROR("Font not valid!"); + delete[] identifier1; + return; } + delete[] identifier1; - fileSize = file->getSize(); - - nCharacters = 128; - - - file->seek(20, true); - lineHeight = file->loadChar() << 1; - - - // Create blank character data - - blank = new unsigned char[3]; - memset(blank, 0, 3); + spaceWidth = file->loadChar(); + lineHeight = file->loadChar(); + LOG_MAX("spaceWidth: %d, lineHeight: %d", spaceWidth, lineHeight); + // temporary character data + SDL_Surface *chars[MAX_FONT_CHARS]; + stbrp_rect rects[MAX_FONT_CHARS]; // Load characters - - for (count = 0; count < 128; count++) { - + for (int i = 0; i < MAX_FONT_CHARS; i++) { if (file->tell() >= fileSize) { - - nCharacters = count; + nCharacters = i; + LOG_TRACE("Loaded %d characters from font.", nCharacters); break; - } int size = file->loadShort(); + int w = 0; + int h = 0; if (size > 4) { + unsigned char* pixels = file->loadRLE(size); - pixels = file->loadRLE(size); + int width = pixels[0]|pixels[1] << 8; + int height = pixels[2]|pixels[3] << 8; - width = pixels[0]; - width += pixels[1] << 8; - height = pixels[2]; - height += pixels[3] << 8; + if (size - 4 >= width * height) { + chars[i] = createSurface(pixels + 4, width, height); - if (size - 4 >= width * height) - characters[count] = createSurface(pixels + 4, width, height); - else - characters[count] = createSurface(blank, 3, 1); + w = width; + h = height; + } delete[] pixels; + } - } else characters[count] = createSurface(blank, 3, 1); - - enableColorKey(characters[count], 0); + // setup sizes for packing + rects[i] = { i, w, h, 0, 0, 0 }; + // save size + atlasRects[i] = { -1, -1, w, h }; } - delete[] blank; - delete file; + // Pack all characters in a 128x128 pixels surface + int aW = 128; + int aH = 128; + characterAtlas = createSurface(nullptr, aW, aH); + enableColorKey(characterAtlas, 0); + + stbrp_context ctx; + stbrp_node nodes[aW]; + stbrp_init_target(&ctx, aW, aH, nodes, aW); + + bool res = stbrp_pack_rects(&ctx, rects, nCharacters); + if(res) { + for (int i = 0; i < nCharacters; i++) { + // save position + atlasRects[i].x = rects[i].x; + atlasRects[i].y = rects[i].y; + + // copy char to atlas + if (rects[i].w > 0 && rects[i].h > 0) + SDL_BlitSurface(chars[i], nullptr, characterAtlas, &atlasRects[i]); + } + } else + LOG_WARN("Could not pack font atlas!"); - // Create ASCII->font map + // Delete single char surfaces + for (int i = 0; i < nCharacters; i++) { + if(rects[i].w > 0 && rects[i].h > 0) + SDL_FreeSurface(chars[i]); + } - for (count = 0; count < 33; count++) map[count] = 0; + // Create ASCII->font map map[33] = 107; // ! map[34] = 116; // " - map[35] = 0; // # - map[36] = 63; // $ - map[37] = 0; // % - map[38] = 0; // & + map[36] = 63; // $ map[39] = 115; // ' map[40] = 111; // ( map[41] = 112; // ) - map[42] = 0; // * map[43] = 105; // + map[44] = 101; // , map[45] = 104; // - map[46] = 102; // . map[47] = 108; // / - for (count = 48; count < 58; count++) map[count] = count + 5; // Numbers + for (int i = 48; i < 58; i++) + map[i] = i + 5; // Numbers map[58] = 114; // : map[59] = 113; // ; - map[60] = 0; // < map[61] = 106; // = - map[62] = 0; // > map[63] = 103; // ? - map[64] = 0; // @ - for (count = 65; count < 91; count++) map[count] = count - 38; // Upper-case letters - for (; count < 97; count++) map[count] = 0; - for (; count < 123; count++) map[count] = count - 96; // Lower-case letters - for (; count < 128; count++) map[count] = 0; + for (int i = 65; i < 91; i++) + map[i] = i - 38; // Upper-case letters + for (int i = 97; i < 123; i++) + map[i] = i - 96; // Lower-case letters - for (count = 0; count < 128; count++) { - - if (map[count] >= nCharacters) map[count] = 0; - - } + cleanMapping(); + isOk = res; } @@ -156,60 +186,98 @@ Font::Font (const char* fileName) { * @param big Whether to use the small or the big font */ Font::Font (unsigned char* pixels, bool big) { + commonSetup(); - unsigned char* chrPixels; - int count, y; + int charWidth = 8; + spaceWidth = 5; + if (big) { + nCharacters = 40; + lineHeight = 8; + } else { + nCharacters = 13; + lineHeight = 7; + } - if (big) lineHeight = 8; - else lineHeight = 7; + // temporary character data + SDL_Surface *chars[nCharacters]; + stbrp_rect rects[MAX_FONT_CHARS]; - chrPixels = new unsigned char[8 * lineHeight]; + unsigned char* chrPixels = new unsigned char[charWidth * lineHeight]; - for (count = 0; count < 40; count++) { + for (int i = 0; i < nCharacters; i++) { + // copy to atlas + for (int y = 0; y < lineHeight; y++) { + memcpy(chrPixels + (y * charWidth), + pixels + (i * charWidth) + (y * SW), charWidth); + } + chars[i] = createSurface(chrPixels, charWidth, lineHeight); - for (y = 0; y < lineHeight; y++) - memcpy(chrPixels + (y * 8), pixels + (count * 8) + (y * SW), 8); + // setup sizes for packing + rects[i] = { i, charWidth, lineHeight, 0, 0, 0 }; - characters[count] = createSurface(chrPixels, 8, lineHeight); + // save size + atlasRects[i] = { -1, -1, charWidth, lineHeight }; + } - if (big) enableColorKey(characters[count], 31); + delete[] chrPixels; + // Pack all characters in a surface + int aW, aH; + if(big) { + // 56x48 + aW = 7 * charWidth; + aH = 6 * lineHeight; + } else { + // 32x28 + aW = 4 * charWidth; + aH = 4 * lineHeight; } - nCharacters= 40; - - delete[] chrPixels; + characterAtlas = createSurface(nullptr, aW, aH); + stbrp_context ctx; + stbrp_node nodes[aW]; + stbrp_init_target(&ctx, aW, aH, nodes, aW); - // Create ASCII->font map + bool res = stbrp_pack_rects(&ctx, rects, nCharacters); + if(res) { + for (int i = 0; i < nCharacters; i++) { + // save position + atlasRects[i].x = rects[i].x; + atlasRects[i].y = rects[i].y; - if (big) { + // copy char to atlas + SDL_BlitSurface(chars[i], nullptr, characterAtlas, &atlasRects[i]); + } + } else + LOG_WARN("Could not pack font atlas!"); - // Goes " 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-:." + // Delete single char surfaces + for (int i = 0; i < nCharacters; i++) + SDL_FreeSurface(chars[i]); - for (count = 0; count < 45; count++) map[count] = 0; - map[count++] = 37; - map[count++] = 39; - for (; count < 48; count++) map[count] = 0; - for (; count < 58; count++) map[count] = count - 47; // Numbers - map[count++] = 38; - for (; count < 65; count++) map[count] = 0; - for (; count < 91; count++) map[count] = count - 54; // Upper-case letters - for (; count < 97; count++) map[count] = 0; - for (; count < 123; count++) map[count] = count - 86; // Lower-case letters - for (; count < 128; count++) map[count] = 0; + if (big) enableColorKey(characterAtlas, 31); + // Create ASCII->font map + if (big) { + // Goes " 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-:." + map[45] = 37; // - + map[46] = 39; // . + map[58] = 38; // : + for (int i = 47; i < 58; i++) + map[i] = i - 47; // Numbers + for (int i = 64; i < 91; i++) { + map[i] = i - 54; // Upper-case letters + map[i+32] = map[i]; // Lower-case letters (copy) + } } else { - // Goes " 0123456789oo" (where oo = infinity) // Use :; to represent the infinity symbol - - for (count = 0; count < 48; count++) map[count] = 0; - for (; count < 60; count++) map[count] = count - 47; // Numbers and :; - for (; count < 128; count++) map[count] = 0; - + for (int i = 47; i < 60; i++) + map[i] = i - 47; // Numbers and :; } + isOk = res; } @@ -219,128 +287,117 @@ Font::Font (unsigned char* pixels, bool big) { * @param bonus whether to use FONTS.000 or BONUS.000 */ Font::Font (bool bonus) { - - File* file; - unsigned char* pixels; - int fileSize; - int count; + commonSetup(); // Load font from FONTS.000 or BONUS.000 + File* file = new File(bonus? "BONUS.000": "FONTS.000", PATH_TYPE_GAME); - try { - - file = new File(bonus? "BONUS.000": "FONTS.000", PATH_TYPE_GAME); - - } catch (int e) { - - throw; - - } - - - fileSize = file->getSize(); - + int fileSize = file->getSize(); nCharacters = file->loadShort(256); if (bonus) { - - count = file->loadShort(); - nCharacters -= count; + int nSprites = file->loadShort(); + nCharacters -= nSprites; // Skip sprites - - for (; count > 0; count--) { - + for (int i = 0; i < nSprites; i++) { file->seek(4, false); int width = file->loadShort(); if (width == 0xFFFF) width = 0; file->seek((width << 2) + file->loadShort(), false); - } - } - // Load characters - - for (count = 0; count < nCharacters; count++) { + // temporary character data + SDL_Surface *chars[MAX_FONT_CHARS]; + stbrp_rect rects[MAX_FONT_CHARS]; + // Load characters + for (int i = 0; i < nCharacters; i++) { if (file->tell() >= fileSize) { - - nCharacters = count; + nCharacters = i; + LOG_TRACE("Loaded %d characters from font.", nCharacters); break; - } int width = file->loadShort(SW); int height = file->loadShort(SH); + // adjust if (bonus) width = (width + 3) & ~3; else width <<= 2; file->seek(4, false); - pixels = file->loadPixels(width * height); + unsigned char *pixels = file->loadPixels(width * height); - characters[count] = createSurface(pixels, width, height); - enableColorKey(characters[count], 254); + chars[i] = createSurface(pixels, width, height); delete[] pixels; + // setup sizes for packing + rects[i] = { i, width, height, 0, 0, 0 }; + + // save size + atlasRects[i] = { -1, -1, width, height }; } delete file; - lineHeight = characters[0]->h; - - - // Create blank character data - - pixels = new unsigned char[3]; - memset(pixels, 254, 3); - characters[nCharacters] = createSurface(pixels, 3, 1); - enableColorKey(characters[nCharacters], 254); - delete[] pixels; + spaceWidth = 5; + // use "A" as reference + lineHeight = atlasRects[0].h; + LOG_MAX("spaceWidth: %d, lineHeight: %d", spaceWidth, lineHeight); + + // Pack all characters in a 160x160 pixels surface + int aW = 160; + int aH = 160; + characterAtlas = createSurface(nullptr, aW, aH); + enableColorKey(characterAtlas, 254); + + stbrp_context ctx; + stbrp_node nodes[aW]; + stbrp_init_target(&ctx, aW, aH, nodes, aW); + + bool res = stbrp_pack_rects(&ctx, rects, nCharacters); + if(res) { + for (int i = 0; i < nCharacters; i++) { + // save position + atlasRects[i].x = rects[i].x; + atlasRects[i].y = rects[i].y; + + // copy char to atlas + SDL_BlitSurface(chars[i], nullptr, characterAtlas, &atlasRects[i]); + } + } else + LOG_WARN("Could not pack font atlas!"); + // Delete single char surfaces + for (int i = 0; i < nCharacters; i++) + SDL_FreeSurface(chars[i]); // Create ASCII->font map - - count = 0; - if (bonus) { - - for (; count < 42; count++) map[count] = nCharacters; - map[count++] = 37; // * - for (; count < 46; count++) map[count] = nCharacters; - map[count++] = 39; // . - map[count++] = 38; // / - for (; count < 59; count++) map[count] = count - 22; // Numbers and : - + map[42] = 37; // * + map[46] = 39; // . + map[47] = 38; // / + map[58] = 36; // : } else { - - for (; count < 37; count++) map[count] = nCharacters; - map[count++] = 36; // % - for (; count < 48; count++) map[count] = nCharacters; - for (; count < 58; count++) map[count] = count - 22; // Numbers - + map[37] = 36; // % } - - for (; count < 65; count++) map[count] = nCharacters; - for (; count < 91; count++) map[count] = count - 65; // Upper-case letters - for (; count < 97; count++) map[count] = nCharacters; - for (; count < 123; count++) map[count] = count - 97; // Lower-case letters - for (; count < 128; count++) map[count] = nCharacters; - - nCharacters++; - - for (count = 0; count < 128; count++) { - - if (map[count] >= nCharacters) map[count] = 0; - + for (int i = 48; i < 58; i++) + map[i] = i - 22; // Numbers + for (int i = 65; i < 91; i++) { + map[i] = i - 65; // Upper-case letters + map[i+32] = map[i]; // Lower-case letters (copy) } + cleanMapping(); + + isOk = res; } @@ -348,9 +405,7 @@ Font::Font (bool bonus) { * Delete the font. */ Font::~Font () { - - for (int i = 0; i < nCharacters; i++) SDL_FreeSurface(characters[i]); - + SDL_FreeSurface(characterAtlas); } @@ -364,44 +419,42 @@ Font::~Font () { * @return The x-coordinate of the end of the string */ int Font::showString (const char* string, int x, int y) { - - SDL_Surface* surface; - SDL_Rect dst; - unsigned int count; - int xOffset, yOffset; + if (!isOk) return x; // Determine the position at which to draw the first character - xOffset = x; - yOffset = y; + int xOffset = x; + int yOffset = y; // Go through each character of the string - for (count = 0; string[count]; count++) { - - if (string[count] == '\n') { - + for (int i = 0; string[i]; i++) { + if (string[i] == '\n') { + // reset after line break xOffset = x; yOffset += lineHeight; - } else { + unsigned int c = map[int(string[i])]; + + // skip spaces and invalid + if(c == INVALID_FONT_CHAR) { + xOffset += spaceWidth; + #if DEBUG_FONTS + if (string[i] != ' ') // log invalid + LOG_MAX("Skipping char %d in %s at index %d", string[i], string, i); + #endif + continue; + } // Determine the character's position on the screen - dst.y = yOffset; - dst.x = xOffset; - - // Determine the character's surface - surface = characters[int(map[int(string[count])])]; + SDL_Rect dst = { xOffset, yOffset, 0, 0 }; // Draw the character to the screen - SDL_BlitSurface(surface, NULL, canvas, &dst); - - xOffset += surface->w + 2; + SDL_BlitSurface(characterAtlas, &atlasRects[c], canvas, &dst); + xOffset += atlasRects[c].w + normalPadding; } - } return xOffset; - } @@ -415,35 +468,32 @@ int Font::showString (const char* string, int x, int y) { * @return The x-coordinate of the end of the string */ int Font::showSceneString (const unsigned char* string, int x, int y) { - - SDL_Surface* surface; - SDL_Rect dst; - unsigned int count; - int offset; + if (!isOk) return x; // Determine the position at which to draw the first character - offset = x; + int offset = x; // Go through each character of the string - for (count = 0; string[count]; count++) { + for (int i = 0; string[i]; i++) { // Determine the character's position on the screen - dst.y = y; - dst.x = offset; + SDL_Rect dst = { offset, y, 0, 0 }; - // Determine the character's surface - if (string[count] < nCharacters) surface = characters[int(string[count])]; - else surface = characters[0]; + // use space for invalid characters + if (string[i] >= nCharacters) { + offset += spaceWidth; + continue; + } - // Draw the character to the screen - SDL_BlitSurface(surface, NULL, canvas, &dst); + int c = string[i]; - offset += surface->w + 1; + // Draw the character to the screen + SDL_BlitSurface(characterAtlas, &atlasRects[c], canvas, &dst); + offset += atlasRects[c].w + sceneStringPadding; } return offset; - } @@ -457,69 +507,59 @@ int Font::showSceneString (const unsigned char* string, int x, int y) { * @return The x-coordinate of the end of the number */ void Font::showNumber (int n, int x, int y) { + if (!isOk) return; - SDL_Surface *surface; SDL_Rect dst; - int count, offset; // n being 0 is a special case. It must not be considered to be a trailing // zero, as these are not displayed. if (!n) { - - // Determine 0's surface - surface = characters[int(map[int('0')])]; + unsigned int c = map[int('0')]; // Determine 0's position on the screen dst.y = y; - dst.x = x - surface->w; + dst.x = x - atlasRects[c].w; // Draw 0 to the screen - SDL_BlitSurface(surface, NULL, canvas, &dst); + SDL_BlitSurface(characterAtlas, &atlasRects[c], canvas, &dst); return; - } // Determine the length of the number to be drawn + int count; if (n > 0) count = n; else count = -n; // Determine the position at which to draw the lowest digit - offset = x; + int offset = x; while (count) { + unsigned int c = map[int('0' + (count % 10))]; - // Determine the digit's surface - surface = characters[int(map['0' + (count % 10)])]; - - offset -= surface->w; + offset -= atlasRects[c].w; // Determine the digit's position on the screen dst.y = y; dst.x = offset; // Draw the digit to the screen - SDL_BlitSurface(surface, NULL, canvas, &dst); + SDL_BlitSurface(characterAtlas, &atlasRects[c], canvas, &dst); count /= 10; - } // If needed, draw the negative sign if (n < 0) { - - // Determine the negative sign's surface - surface = characters[int(map[int('-')])]; + unsigned int c = map[int('-')]; // Determine the negative sign's position on the screen dst.y = y; - dst.x = offset - surface->w; + dst.x = offset - atlasRects[c].w; // Draw the negative sign to the screen - SDL_BlitSurface(surface, NULL, canvas, &dst); - + SDL_BlitSurface(characterAtlas, &atlasRects[c], canvas, &dst); } - } @@ -532,17 +572,15 @@ void Font::showNumber (int n, int x, int y) { * @param newLength Span of new range */ void Font::mapPalette (int start, int length, int newStart, int newLength) { + if (!isOk) return; SDL_Color palette[MAX_PALETTE_COLORS]; - int count; - - for (count = 0; count < length; count++) - palette[count].r = palette[count].g = palette[count].b = - (count * newLength / length) + newStart; - for (count = 0; count < nCharacters; count++) - setLogicalPalette(characters[count], palette, start, length); + for (int i = 0; i < length; i++) { + palette[i].r = palette[i].g = palette[i].b = (i * newLength / length) + newStart; + } + setLogicalPalette(characterAtlas, palette, start, length); } @@ -550,12 +588,9 @@ void Font::mapPalette (int start, int length, int newStart, int newLength) { * Restore a palette to its original state. */ void Font::restorePalette () { + if (!isOk) return; - int count; - - for (count = 0; count < nCharacters; count++) - video.restoreSurfacePalette(characters[count]); - + video.restoreSurfacePalette(characterAtlas); } @@ -571,6 +606,18 @@ int Font::getHeight () { } +/** + * Get the width of a space. + * + * @return The width + */ +int Font::getSpaceWidth () { + + return spaceWidth; + +} + + /** * Get the width of a single line of a given string. * @@ -579,22 +626,27 @@ int Font::getHeight () { * @return The width */ int Font::getStringWidth (const char *string) { + if (!isOk) return 0; - int count; int stringWidth = 0; // Go through each character of the string - for (count = 0; string[count]; count++) { - + for (int i = 0; string[i]; i++) { // Only get the width of the first line - if (string[count] == '\n') return stringWidth; + if (string[i] == '\n') return stringWidth; - stringWidth += characters[int(map[int(string[count])])]->w + 2; + unsigned int c = map[int(string[i])]; + // skip spaces + if(c == INVALID_FONT_CHAR) { + stringWidth += spaceWidth; + continue; + } + + stringWidth += atlasRects[c].w + normalPadding; } return stringWidth; - } @@ -606,18 +658,40 @@ int Font::getStringWidth (const char *string) { * @return The width */ int Font::getSceneStringWidth (const unsigned char *string) { + if (!isOk) return 0; - int count; int stringWidth = 0; // Go through each character of the string - for (count = 0; string[count]; count++) { + for (int i = 0; string[i]; i++) { - if (string[count] < nCharacters) stringWidth += characters[int(string[count])]->w + 1; - else stringWidth += characters[0]->w + 1; + // use space for invalid characters + if (string[i] >= nCharacters) { + stringWidth += spaceWidth; + continue; + } + stringWidth += atlasRects[string[i]].w + sceneStringPadding; } return stringWidth; +} + +#ifdef DEBUG_FONTS +/** + * Save the generated font atlas to a BMP image. + * + * @param fileName File to save to + */ +void Font::saveAtlasAsBMP(const char *fileName) { + if (!isOk) { + LOG_WARN("Not saving empty font atlas!"); + return; + } + + video.restoreSurfacePalette(characterAtlas); + SDL_SaveBMP(characterAtlas, fileName); } + +#endif diff --git a/src/io/gfx/font.h b/src/io/gfx/font.h index d87ba61d..5c48d00e 100644 --- a/src/io/gfx/font.h +++ b/src/io/gfx/font.h @@ -17,15 +17,14 @@ * */ - #ifndef _FONT_H #define _FONT_H - #include "OpenJazz.h" #include +#define MAX_FONT_CHARS 128 // Classes @@ -35,10 +34,15 @@ class File; class Font { private: - SDL_Surface *characters[128]; ///< Symbol images + void commonSetup(); + void cleanMapping(); + SDL_Surface *characterAtlas; ///< Symbol images + SDL_Rect atlasRects[MAX_FONT_CHARS]; ///< Symbol positions + bool isOk; ///< Font is loaded and usable int nCharacters; ///< Number of symbols + unsigned char spaceWidth; ///< Horizontal spacing of displayed characters unsigned char lineHeight; ///< Vertical spacing of displayed characters - char map[128]; ///< Maps ASCII values to symbol indices + unsigned int map[MAX_FONT_CHARS]; ///< Maps ASCII values to symbol indices public: explicit Font(const char *fileName); @@ -52,8 +56,12 @@ class Font { void mapPalette (int start, int length, int newStart, int newLength); void restorePalette (); int getHeight (); + int getSpaceWidth (); int getStringWidth (const char *string); int getSceneStringWidth (const unsigned char *string); +#ifdef DEBUG_FONTS + void saveAtlasAsBMP (const char *fileName); +#endif }; @@ -69,4 +77,3 @@ EXTERN Font *panelBigFont; /** Found in PANEL.000 */ EXTERN Font *panelSmallFont; /** Found in PANEL.000 */ #endif - diff --git a/src/jj1/bonuslevel/jj1bonuslevel.cpp b/src/jj1/bonuslevel/jj1bonuslevel.cpp index 37fd580c..860cef69 100644 --- a/src/jj1/bonuslevel/jj1bonuslevel.cpp +++ b/src/jj1/bonuslevel/jj1bonuslevel.cpp @@ -213,6 +213,9 @@ JJ1BonusLevel::JJ1BonusLevel (Game* owner, char * fileName, bool multi) : Level( throw; } + #if DEBUG_FONTS + font->saveAtlasAsBMP("bonusfont.bmp"); + #endif try { diff --git a/src/jj1/level/jj1levelload.cpp b/src/jj1/level/jj1levelload.cpp index 6db6cc4e..eced0d88 100644 --- a/src/jj1/level/jj1levelload.cpp +++ b/src/jj1/level/jj1levelload.cpp @@ -418,7 +418,9 @@ int JJ1Level::load (char* fileName, bool checkpoint) { return e; } - + #if DEBUG_FONTS + font->saveAtlasAsBMP("levelfont.bmp"); + #endif // Load panel diff --git a/src/jj1/scene/jj1scene.cpp b/src/jj1/scene/jj1scene.cpp index 59a1254d..064aeea4 100644 --- a/src/jj1/scene/jj1scene.cpp +++ b/src/jj1/scene/jj1scene.cpp @@ -617,7 +617,7 @@ int JJ1Scene::play () { // Text itself font->showSceneString(text->text, xOffset, yOffset); - y += extraLineHeight + font->getHeight() / 2; + y += extraLineHeight + font->getHeight(); } diff --git a/src/main.cpp b/src/main.cpp index 6066663f..f0098fc4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -280,12 +280,12 @@ void startUp (const char *argv0, int pathCount, char *paths[]) { delete file; - panelBigFont = NULL; - panelSmallFont = NULL; - font2 = NULL; - fontbig = NULL; - fontiny = NULL; - fontmn1 = NULL; + panelBigFont = nullptr; + panelSmallFont = nullptr; + font2 = nullptr; + fontbig = nullptr; + fontiny = nullptr; + fontmn1 = nullptr; try { @@ -313,10 +313,17 @@ void startUp (const char *argv0, int pathCount, char *paths[]) { throw; } + #if DEBUG_FONTS + panelBigFont->saveAtlasAsBMP("panelbigfont.bmp"); + panelSmallFont->saveAtlasAsBMP("panelsmallfont.bmp"); + font2->saveAtlasAsBMP("font2.bmp"); + fontbig->saveAtlasAsBMP("fontbig.bmp"); + fontiny->saveAtlasAsBMP("fontiny.bmp"); + fontmn1->saveAtlasAsBMP("fontmn1.bmp"); + #endif delete[] pixels; - // Establish arbitrary timing globalTicks = SDL_GetTicks() - 20;