From 0f4c255339289f258de454d69c121e42648c29f7 Mon Sep 17 00:00:00 2001 From: Brendan Hansen Date: Mon, 7 Mar 2022 22:34:50 -0600 Subject: [PATCH] Improved CRT effect --- run_tree/assets/shaders/crt.glsl | 2 +- src/build.onyx | 2 +- src/main.onyx | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/run_tree/assets/shaders/crt.glsl b/run_tree/assets/shaders/crt.glsl index c23942f..7bf64f1 100644 --- a/run_tree/assets/shaders/crt.glsl +++ b/run_tree/assets/shaders/crt.glsl @@ -65,7 +65,7 @@ uniform vec2 u_output_size; #define outputGamma 2.2 // Macros. -#define TEX2D(c) pow(texture(u_texture, (c)), vec4(inputGamma)) +#define TEX2D(c) ((((c).x < 0.0f) || ((c).y < 0.0f) || ((c).x > 1.0f) || ((c).y) > 1.0f) ? vec4(0, 0, 0, 1) : pow(texture(u_texture, (c)), vec4(inputGamma))) #define PI 3.141592653589 // Apply radial distortion to the given coordinate. diff --git a/src/build.onyx b/src/build.onyx index 429f03f..8906ca4 100644 --- a/src/build.onyx +++ b/src/build.onyx @@ -4,7 +4,7 @@ package runtime.vars MAJOR_VERSION :: 0 MINOR_VERSION :: 1 -// DEBUG :: true +DEBUG :: true #load_path ONYX_PATH diff --git a/src/main.onyx b/src/main.onyx index 6dcc89f..dd1bb06 100644 --- a/src/main.onyx +++ b/src/main.onyx @@ -66,11 +66,12 @@ draw :: () { immediate_flush(); #if DEBUG { - font_set_color(.{1,0,0}); + font_set_color(.{1,1,0}); font_print(debug_font, 0, 16, "FPS: {}", game_fps); font_print(debug_font, 0, 32, "HEAP: {b16}", alloc.heap.get_watermark()); font_print(debug_font, 0, 48, "FREE: {}KB", alloc.heap.get_freed_size() / 1024); + version_buf : [32] u8; version_str := conv.format(version_buf, "Version: {}.{}", runtime.vars.MAJOR_VERSION, runtime.vars.MINOR_VERSION); font_print(debug_font, ~~window_width - font_get_width(debug_font, version_str), 16, version_str); @@ -147,7 +148,7 @@ create_window :: () => { main :: (args) => { random.set_seed(os.time()); - debug_set_level(.Debug); + debug_set_level(.Info); if !glfwInit() { debug_log(.Critical, "Failed to initialize GLFW!"); os.exit(1); -- 2.25.1