YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Trying to optimize memory.

Browse Source
This commit is contained in:
Dominic Masters
2021-10-16 15:52:16 -07:00
parent af514847d8
commit 97a8d936b5
15 changed files with 127 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -25,5 +25,5 @@ target_compile_definitions(game PRIVATE
SETTING_GAME_POKER=1
SETTING_GAME_DAWN=2
SETTING_GAME_SANDBOX=3
SETTING_GAME=1
SETTING_GAME=3
)

0
src/config.h
View File

78
src/display/font.c
View File

@ -48,36 +48,31 @@ float fontGetScale(float fontSize) {
return fontSize / FONT_SIZE_DEFAULT * FONT_GLOBAL_SCALE;
}
void fontTextBuffer(font_t *font, primitive_t *primitive, fonttextinfo_t *info){
stbtt_aligned_quad *quad;
int32_t i;
bool _fontTextBufferAddLine(fonttextinfo_t *info, int32_t start, int32_t len) {
info->lineCount++;
for(i = 0; i < info->realLength; i++) {
quad = info->quads + i;
quadBuffer(primitive, 0,
quad->x0, quad->y0, quad->s0, quad->t0,
quad->x1, quad->y1, quad->s1, quad->t1,
i * QUAD_VERTICE_COUNT, i * QUAD_INDICE_COUNT
);
if(info->lineCount >= FONT_TEXT_INFO_LINES_MAX) {
return false;
}
info->lines[info->lineCount].start = start;
info->lines[info->lineCount].length = len;
return true;
}
void fontTextInit(font_t *font, primitive_t *primitive, fonttextinfo_t *info) {
primitiveInit(primitive,
QUAD_VERTICE_COUNT * info->realLength,
QUAD_INDICE_COUNT * info->realLength
);
fontTextBuffer(font, primitive, info);
}
void fontTextClamp(font_t *font, fonttextinfo_t *info, char *text,
void fontTextBuffer(
font_t *font, primitive_t *primitive, fonttextinfo_t *info, char *text,
float maxWidth, float fontSize
) {
int32_t i, j;
int32_t i, j, wordStart;
char c;
float x, y, wordX, scale;
stbtt_aligned_quad *quads;
stbtt_aligned_quad *quad;
// Make some space
quads = malloc(sizeof(stbtt_aligned_quad) * strlen(text));
// Get the font scale
scale = fontGetScale(fontSize);
@ -85,7 +80,7 @@ void fontTextClamp(font_t *font, fonttextinfo_t *info, char *text,
maxWidth = maxWidth == -1 ? 9999999 : maxWidth * (1 / scale);
/** Which index in the original text var is the current word from */
int32_t wordStart = 0;
wordStart = 0;
// Setup Scales
info->length = 0;
@ -105,6 +100,7 @@ void fontTextClamp(font_t *font, fonttextinfo_t *info, char *text,
y = FONT_INITIAL_LINE;
wordX = 0;
while(c = text[i++]) {
if(info->lineCount >= FONT_TEXT_INFO_LINES_MAX) break;
info->length++;
// When space, start of new word about to begin
@ -113,10 +109,7 @@ void fontTextClamp(font_t *font, fonttextinfo_t *info, char *text,
// Did this space cause a newline?
if(x > maxWidth) {
info->lineCount++;
info->lines[info->lineCount].start = info->realLength;
info->lines[info->lineCount].length = 0;
_fontTextBufferAddLine(info, info->realLength, 0);
y += FONT_LINE_HEIGHT;
x = 0;
}
@ -127,10 +120,7 @@ void fontTextClamp(font_t *font, fonttextinfo_t *info, char *text,
// New line.
if(c == FONT_NEWLINE) {
info->lineCount++;
info->lines[info->lineCount].start = info->realLength;
info->lines[info->lineCount].length = 0;
_fontTextBufferAddLine(info, info->realLength, 0);
wordStart = info->realLength;
y += FONT_LINE_HEIGHT;
x = 0;
@ -138,19 +128,18 @@ void fontTextClamp(font_t *font, fonttextinfo_t *info, char *text,
}
// Generate the quad.
quad = info->quads + info->realLength;
quad = quads + info->realLength;
stbtt_GetBakedQuad(font->characterData,
FONT_TEXTURE_WIDTH, FONT_TEXTURE_HEIGHT,
((int32_t)c)-FONT_FIRST_CHAR, &x, &y, quad, FONT_FILL_MODE
);
// Now measure the width of the line (take the right side of that quad)
// if(x > maxWidth) {
if(quad->x1 > maxWidth) {
// We've exceeded the edge, go back to the start of the word and newline.
x = quad->x1 - wordX;
for(j = wordStart; j <= info->realLength; j++) {
quad = info->quads + j;
quad = quads + j;
quad->x0 -= wordX;
quad->x1 -= wordX;
quad->y0 += FONT_LINE_HEIGHT;
@ -161,11 +150,10 @@ void fontTextClamp(font_t *font, fonttextinfo_t *info, char *text,
info->lines[info->lineCount].length -= info->realLength - wordStart;
// Next line begins with this word
info->lineCount++;
info->lines[info->lineCount].start = wordStart;
info->lines[info->lineCount].length = info->realLength - wordStart;
y += FONT_LINE_HEIGHT;
if(!_fontTextBufferAddLine(info, wordStart, info->realLength-wordStart)) {
continue;
}
wordX = 0;
}
@ -175,8 +163,14 @@ void fontTextClamp(font_t *font, fonttextinfo_t *info, char *text,
info->lineCount++;
// Initialize primitive
primitiveInit(primitive,
QUAD_VERTICE_COUNT * info->realLength,
QUAD_INDICE_COUNT * info->realLength
);
for(j = 0; j < info->realLength; j++) {
quad = info->quads + j;
quad = quads + j;
// Scale the Quad
if(scale != 1.0) {
@ -189,7 +183,17 @@ void fontTextClamp(font_t *font, fonttextinfo_t *info, char *text,
// Update the dimensions.
info->width = mathMax(info->width, quad->x1);
info->height = mathMax(info->height, quad->y1);
// Buffer the quad.
quadBuffer(primitive, 0,
quad->x0, quad->y0, quad->s0, quad->t0,
quad->x1, quad->y1, quad->s1, quad->t1,
j * QUAD_VERTICE_COUNT, j * QUAD_INDICE_COUNT
);
}
// Free up
free(quads);
}
int32_t fontGetLineCharCount(fonttextinfo_t *info,int32_t start,int32_t count) {

41
src/display/font.h
View File

@ -46,11 +46,8 @@
#define FONT_INITIAL_LINE FONT_LINE_HEIGHT * 0.75f
#define FONT_SPACE_SIZE FONT_TEXTURE_SIZE * 0.45f
/** Maximum number of characters a font text info can hold. */
#define FONT_TEXT_INFO_CHARS_MAX 1024
/** Maximum number of newlines that a font text info can hold. */
#define FONT_TEXT_INFO_LINES_MAX FONT_TEXT_INFO_CHARS_MAX/50
#define FONT_TEXT_INFO_LINES_MAX 16
/** Representation of a font that can be used to render text */
typedef struct {
@ -80,9 +77,6 @@ typedef struct {
/** Dimensions of the string */
float width, height;
/** Array of precalculated quads */
stbtt_aligned_quad quads[FONT_TEXT_INFO_CHARS_MAX];
} fonttextinfo_t;
/**
@ -98,25 +92,6 @@ void fontInit(font_t *font, char *data);
*/
void fontDispose(font_t *Font);
/**
* Buffers the vertices of a font text onto a primitive. Requires some info
* about how the font is meant to render from the text info section.
*
* @param font Font to render.
* @param primitive Primitive to render into.
* @param info The precalculated text info.
*/
void fontTextBuffer(font_t *font, primitive_t *primitive, fonttextinfo_t *info);
/**
* Initializes an uninitialized primitive for rendering.
*
* @param font Font to render.
* @param primitive Primitive to render into.
* @param info Text Info to use while rendering.
*/
void fontTextInit(font_t *font, primitive_t *primitive, fonttextinfo_t *info);
/**
* Convert a Font's Size into a Font Scale. The scale is based on the font's
* default size for the given texture size (Refer to FONT_SIZE_DEFAULT).
@ -126,16 +101,28 @@ void fontTextInit(font_t *font, primitive_t *primitive, fonttextinfo_t *info);
*/
float fontGetScale(float fontSize);
/**
* Internal method that adds a line to the text buffer process.
*
* @param info Info to add to.
* @param start Start character index for the next line.
* @param len Length of the next line.
* @return True if added a line successfully, otherwise false.
*/
bool _fontTextBufferAddLine(fonttextinfo_t *info, int32_t start, int32_t len);
/**
* Clamps text to a max width, inserting newlines where possible.
*
* @param font Font to use
* @param primitive Primitive to buffer the text to.
* @param info Font text info to clamp into.
* @param text Text to clamp.
* @param maxWidth Max width (pixels) to clamp the text to, -1 for no max width.
* @param fontSize Font Size of the text.
*/
void fontTextClamp(font_t *font, fonttextinfo_t *info, char *text,
void fontTextBuffer(
font_t *font, primitive_t *primitive, fonttextinfo_t *info, char *text,
float maxWidth, float fontSize
);

12
src/file/gui.c Normal file
View File

@ -0,0 +1,12 @@
/**
* Copyright (c) 2021 Dominic Masters
*
* This software is released under the MIT License.
* https://opensource.org/licenses/MIT
*/
#include "gui.h"
void guiLoad() {
}

14
src/file/gui.h Normal file
View File

@ -0,0 +1,14 @@
/**
* Copyright (c) 2021 Dominic Masters
*
* This software is released under the MIT License.
* https://opensource.org/licenses/MIT
*/
#pragma once
#include "../libs.h"
#include "asset.h"
#include "csv.h"
#include "xml.h"
void guiLoad();

3
src/game/game.h
View File

@ -8,6 +8,9 @@
#include "../engine/engine.h"
#include "../locale/language.h"
#define SETTING_GAME_SANDBOX 3
#define SETTING_GAME SETTING_GAME_SANDBOX
/** Describes the current game */
#if SETTING_GAME == SETTING_GAME_POKER
#include "poker/game.h"

35
src/game/sandbox/sandboxscene.c
View File

@ -8,29 +8,30 @@
#include "sandboxscene.h"
bool sandboxSceneInit(sandboxscene_t *game) {
// Init Scripter
scripterInit(&game->scripter, &game->engine);
game->scripter.user = game;
// Add APIs
scriptsApiIo(&game->scripter);
scriptsApiDisplay(&game->scripter);
scriptsApiAsset(&game->scripter);
scriptsApiEpoch(&game->scripter);
// Load main script
assetScripterAppend(&game->scripter, "scripts/main.js");
// Invoke initialization.
scripterInvokeMethodSimple(&game->scripter, "init");
// Init Assets
assetShaderLoad(&game->shader,
"shared/shaders/textured.vert",
"shared/shaders/textured.frag"
);
assetFontLoad(&game->font, "shared/fonts/opensans/OpenSans-Regular.ttf");
assetTextureLoad(&game->texture, "shared/test_texture.png");
return true;
}
void sandboxSceneUpdate(sandboxscene_t *game) {
scripterInvokeMethodSimple(&game->scripter, "update");
camera_t camera;
shaderUse(&game->shader);
cameraOrtho(&camera,
0, game->engine.render.width,
game->engine.render.height, 0,
0.01f, 1000.0f
);
cameraLookAt(&camera, 0,0,10, 0,0,0);
shaderUseCamera(&game->shader, &camera);
}
void sandboxSceneDispose(sandboxscene_t *game) {
scripterInvokeMethodSimple(&game->scripter, "dispose");
// shaderDispose(&game->shader);
}

27
src/game/sandbox/sandboxscene.h
View File

@ -8,32 +8,17 @@
#pragma once
#include "../../libs.h"
#include "../../display/camera.h"
#include "../../display/shader.h"
#include "../../display/font.h"
#include "../../display/primitive.h"
#include "../../display/primitives/quad.h"
#include "../../display/primitives/cube.h"
#include "../../display/renderlist.h"
#include "../../display/texture.h"
#include "../../display/shader.h"
#include "../../file/asset.h"
#include "../../file/xml.h"
#include "../../file/asset.h"
#include "../../ui/grid.h"
#include "../../ui/menu.h"
#include "../../ui/textmenu.h"
#include "../../ui/image.h"
#include "../../ui/framedtextmenu.h"
#include "../../script/scripter.h"
#include "../../script/api/io.h"
#include "../../script/api/display.h"
#include "../../script/api/asset.h"
#include "../../script/api/epoch.h"
#include "../../ui/label.h"
#include "../../ui/breakpoint.h"
typedef struct {
engine_t engine;
scripter_t scripter;
shader_t shader;
texture_t texture;
font_t font;
} sandboxscene_t;
/**

7
src/ui/frame.c
View File

@ -8,19 +8,19 @@
#include "frame.h"
void frameInit(frame_t *frame) {
frame->texture = NULL;
primitiveInit(
&frame->primitive,
QUAD_VERTICE_COUNT * FRAME_PRIMITIVE_COUNT,
QUAD_INDICE_COUNT * FRAME_PRIMITIVE_COUNT
);
frameSetInnerSize(frame, FRAME_BORDER_SIZE*3, FRAME_BORDER_SIZE*3);
frameSetInnerSize(frame, FRAME_BORDER_SIZE, FRAME_BORDER_SIZE);
}
void frameSetSize(frame_t *frame, float width, float height) {
frameSetInnerSize(frame,
width - (FRAME_BORDER_SIZE * 2),
height - (FRAME_BORDER_SIZE * 2)
width - FRAME_BORDER_SIZE_FULL, height - FRAME_BORDER_SIZE_FULL
);
}
@ -101,6 +101,7 @@ void frameSetInnerSize(frame_t *frame, float width, float height) {
}
void frameRender(frame_t *frame, shader_t *shader, float x, float y) {
if(frame->texture == NULL) return;
shaderUsePosition(shader, x, y, 0, 0, 0, 0);
shaderUseTexture(shader, frame->texture);
primitiveDraw(&frame->primitive, 0, -1);

6
src/ui/label.c
View File

@ -21,8 +21,10 @@ void labelSetText(label_t *label, font_t *font, char *text) {
}
label->font = font;
fontTextClamp(font, &label->info, text, label->maxWidth, label->fontSize);
fontTextInit(font, &label->primitive, &label->info);
fontTextBuffer(
font, &label->primitive, &label->info, text,
label->maxWidth, label->fontSize
);
}
void labelRender(label_t *label, shader_t *shader, float x, float y) {

5
src/ui/menu.c
View File

@ -84,13 +84,14 @@ void menuUpdate(menu_t *menu, engine_t *engine) {
}
menuitem_t * menuAdd(menu_t *menu) {
menuitem_t *item = menu->items + menu->itemCount;
menuitem_t *item;
if(menu->itemCount >= MENU_ITEMS_MAX) return NULL;
item = menu->items + menu->itemCount++;
item->x = 0;
item->y = 0;
item->width = 1;
item->height = 1;
menu->itemCount++;
return item;
}

6
src/vn/ui/vntextbox.c
View File

@ -41,10 +41,10 @@ void vnTextBoxRebuffer(vntextbox_t *box) {
box->width = box->widthMax;
// Rebuffer the text.
fontTextClamp(
box->font, &box->textInfo, box->text, textMaxWidth, VN_TEXTBOX_FONT_SIZE
fontTextBuffer(
box->font, &box->primitive, &box->textInfo, box->text,
textMaxWidth, VN_TEXTBOX_FONT_SIZE
);
fontTextInit(box->font, &box->primitive, &box->textInfo);
// Resize the frame
box->height = FONT_LINE_HEIGHT * box->linesMax;