commit 0da906ef71863c3a044355b9bfc1a46e9519d9f3
parent f17dbf95f93d1f73b79c4629d82ca889c6db6bdf
Author: rexim <reximkut@gmail.com>
Date: Wed, 7 Jul 2021 16:55:41 +0700
Remove `font` translation unit
Diffstat:
5 files changed, 10 insertions(+), 85 deletions(-)
diff --git a/build.sh b/build.sh
@@ -6,7 +6,7 @@ CC="${CXX:-cc}"
PKGS="sdl2 glew"
CFLAGS="-Wall -Wextra -std=c11 -pedantic -ggdb"
LIBS=-lm
-SRC="src/main.c src/la.c src/editor.c src/font.c src/sdl_extra.c src/file.c src/gl_extra.c"
+SRC="src/main.c src/la.c src/editor.c src/sdl_extra.c src/file.c src/gl_extra.c"
if [ `uname` = "Darwin" ]; then
CFLAGS+=" -framework OpenGL"
diff --git a/build_msvc.bat b/build_msvc.bat
@@ -9,4 +9,4 @@ set LIBS=dependencies\SDL2\lib\x64\SDL2.lib ^
dependencies\GLEW\lib\glew32s.lib ^
opengl32.lib User32.lib Gdi32.lib Shell32.lib
-cl.exe %CFLAGS% %INCLUDES% /Feded src\main.c src\la.c src\editor.c src\font.c src\sdl_extra.c src\file.c src\gl_extra.c /link %LIBS% -SUBSYSTEM:windows
+cl.exe %CFLAGS% %INCLUDES% /Feded src\main.c src\la.c src\editor.c src\sdl_extra.c src\file.c src\gl_extra.c /link %LIBS% -SUBSYSTEM:windows
diff --git a/src/font.c b/src/font.c
@@ -1,54 +0,0 @@
-#include "./font.h"
-#include "./sdl_extra.h"
-
-Font font_load_from_file(SDL_Renderer *renderer, const char *file_path)
-{
- Font font = {0};
-
- SDL_Surface *font_surface = surface_from_file(file_path);
- scc(SDL_SetColorKey(font_surface, SDL_TRUE, 0xFF000000));
- font.spritesheet = scp(SDL_CreateTextureFromSurface(renderer, font_surface));
- SDL_FreeSurface(font_surface);
-
- for (size_t ascii = ASCII_DISPLAY_LOW; ascii <= ASCII_DISPLAY_HIGH; ++ascii) {
- const size_t index = ascii - ASCII_DISPLAY_LOW;
- const size_t col = index % FONT_COLS;
- const size_t row = index / FONT_COLS;
- font.glyph_table[index] = (SDL_Rect) {
- .x = (int) col * FONT_CHAR_WIDTH,
- .y = (int) row * FONT_CHAR_HEIGHT,
- .w = FONT_CHAR_WIDTH,
- .h = FONT_CHAR_HEIGHT,
- };
- }
-
- return font;
-}
-
-void render_char(SDL_Renderer *renderer, const Font *font, char c, Vec2f pos, float scale)
-{
- const SDL_Rect dst = {
- .x = (int) floorf(pos.x),
- .y = (int) floorf(pos.y),
- .w = (int) floorf(FONT_CHAR_WIDTH * scale),
- .h = (int) floorf(FONT_CHAR_HEIGHT * scale),
- };
-
- size_t index = '?' - ASCII_DISPLAY_LOW;
- if (ASCII_DISPLAY_LOW <= c && c <= ASCII_DISPLAY_HIGH) {
- index = c - ASCII_DISPLAY_LOW;
- }
-
- scc(SDL_RenderCopy(renderer, font->spritesheet, &font->glyph_table[index], &dst));
-}
-
-void render_text_sized(SDL_Renderer *renderer, Font *font, const char *text, size_t text_size, Vec2f pos, Uint32 color, float scale)
-{
- set_texture_color(font->spritesheet, color);
-
- Vec2f pen = pos;
- for (size_t i = 0; i < text_size; ++i) {
- render_char(renderer, font, text[i], pen, scale);
- pen.x += FONT_CHAR_WIDTH * scale;
- }
-}
diff --git a/src/font.h b/src/font.h
@@ -1,28 +0,0 @@
-#ifndef FONT_H_
-#define FONT_H_
-
-#include <SDL2/SDL.h>
-
-#include "./la.h"
-
-#define FONT_WIDTH 128
-#define FONT_HEIGHT 64
-#define FONT_COLS 18
-#define FONT_ROWS 7
-#define FONT_CHAR_WIDTH (FONT_WIDTH / FONT_COLS)
-#define FONT_CHAR_HEIGHT (FONT_HEIGHT / FONT_ROWS)
-#define FONT_SCALE 5
-
-#define ASCII_DISPLAY_LOW 32
-#define ASCII_DISPLAY_HIGH 126
-
-typedef struct {
- SDL_Texture *spritesheet;
- SDL_Rect glyph_table[ASCII_DISPLAY_HIGH - ASCII_DISPLAY_LOW + 1];
-} Font;
-
-Font font_load_from_file(SDL_Renderer *renderer, const char *file_path);
-void render_char(SDL_Renderer *renderer, const Font *font, char c, Vec2f pos, float scale);
-void render_text_sized(SDL_Renderer *renderer, Font *font, const char *text, size_t text_size, Vec2f pos, Uint32 color, float scale);
-
-#endif // FONT_H_
diff --git a/src/main.c b/src/main.c
@@ -18,13 +18,20 @@
#include "./la.h"
#include "./sdl_extra.h"
#include "./gl_extra.h"
-#include "./font.h"
#define SCREEN_WIDTH 800
#define SCREEN_HEIGHT 600
#define FPS 60
#define DELTA_TIME (1.0f / FPS)
+#define FONT_SCALE 5
+#define FONT_WIDTH 128
+#define FONT_HEIGHT 64
+#define FONT_COLS 18
+#define FONT_ROWS 7
+#define FONT_CHAR_WIDTH (FONT_WIDTH / FONT_COLS)
+#define FONT_CHAR_HEIGHT (FONT_HEIGHT / FONT_ROWS)
+
Editor editor = {0};
Vec2f camera_pos = {0};
Vec2f camera_vel = {0};
