From: Brendan Hansen <brendan.f.hansen@gmail.com>
Date: Tue, 6 Oct 2020 22:02:41 +0000 (-0500)
Subject: fixed random lines drawn in text
X-Git-Url: https://git.brendanfh.com/?a=commitdiff_plain;h=ac0d7bed638bf775b856cc3b535eb8c222806300;p=onyx-game.git

fixed random lines drawn in text
---

diff --git a/res/tilemap.data b/res/tilemap.data
index 3c0ea7a..35b10f9 100644
Binary files a/res/tilemap.data and b/res/tilemap.data differ
diff --git a/res/tilemap.png b/res/tilemap.png
index 351e18d..b59b360 100644
Binary files a/res/tilemap.png and b/res/tilemap.png differ
diff --git a/src/main.onyx b/src/main.onyx
index af6df41..f8ec46d 100644
--- a/src/main.onyx
+++ b/src/main.onyx
@@ -203,14 +203,13 @@ draw :: proc () {
     render_context_transformation(^renderer);
 
     // UI Rendering
-    renderer.color = Color4f32.{ 0.0f, 0.0f, 0.0f, 1.0f };
-    draw_rect(^renderer, ~~input_state.mouse.x, ~~input_state.mouse.y, 10f, 10f);
-
     renderer.color = Color4f32.{ 1.0f, 1.0f, 1.0f, 1.0f };
-    draw_rect(^renderer, 10.0f, 10.0f, 500.0f, 50.0f);
+    draw_rect(^renderer, 10.0f, 10.0f, 1000.0f, 50.0f);
 
     renderer.color = Color4f32.{ 0.0f, 0.0f, 0.0f, 1.0f };
-    draw_text(^renderer, "Hello. Test(12486),$!  0AaQq:", V2f.{ 10.0f, 10.0f }, 1.0f);
+    draw_text(^renderer, "Hello. Test(12486),$!  0AaQq:", V2f.{ 10.0f, 10.0f }, 2.0f);
+
+    draw_rect(^renderer, ~~input_state.mouse.x, ~~input_state.mouse.y, 10f, 10f);
     render_context_ui(^renderer);
 }
 
@@ -237,6 +236,9 @@ loop :: proc () #export {
 main :: proc (args: [] cstring) {
     println("Setting up WebGL2 canvas...");
 
+    time_now :: proc () -> u32 #foreign "time" "now" ---;
+    random_seed(time_now());
+
     if !gl.init("gamecanvas") {
         print("Failed to initialize GL canvas.");
         return;
diff --git a/src/shaders/quad.frag b/src/shaders/quad.frag
index 2ab7cd2..e69cbc6 100644
--- a/src/shaders/quad.frag
+++ b/src/shaders/quad.frag
@@ -10,12 +10,15 @@ in vec4 v_col;
 out vec4 fragColor;
 
 void main() {
-    if (v_tex_pos.x < 0.0) {
+    if (v_tex_pos.x <= -1.0 && v_tex_pos.y <= -1.0) {
         fragColor = v_col;
+
     } else {
     	vec4 t_col = texture(tex, v_tex_pos);
+
     	if (t_col == vec4(1.0, 0.0, 1.0, 1.0)) {
     		fragColor = vec4(0.0, 0.0, 0.0, 0.0);	
+            
     	} else {
 	        fragColor = v_col * texture(tex, v_tex_pos);
 	    }
diff --git a/src/shaders/quad.vert b/src/shaders/quad.vert
index cb6575f..624c5de 100644
--- a/src/shaders/quad.vert
+++ b/src/shaders/quad.vert
@@ -20,7 +20,7 @@ void main() {
 	gl_Position = u_proj * u_world * vec4(a_vert_pos * a_size + a_pos, 0, 1);
     v_col = a_col;
 
-    if (a_tex_pos.x < 0.0) {
+    if (a_tex_pos.x < 0.0 && a_tex_pos.y < 0.0) {
         v_tex_pos = vec2(-1.0, -1.0);
     } else {
         v_tex_pos = a_tex_pos + a_vert_pos * a_tex_size;