From c4c096c6473ca6825749307f294a778ade185931 Mon Sep 17 00:00:00 2001
From: Brendan Hansen <brendan.f.hansen@gmail.com>
Date: Wed, 28 Apr 2021 23:14:22 -0500
Subject: [PATCH] proper ui; wall particle

---
 lib/gl/gl_utils.onyx              |   2 +-
 lib/immediate_renderer.onyx       |  32 +++++++-
 lib/shaders/immediate_vertex.glsl |   5 +-
 site/sand_toy.wasm                | Bin 38305 -> 37934 bytes
 src/sand_toy.onyx                 | 110 +++++++++++++++++++------
 src/simulation.onyx               | 130 ++++++++++++++----------------
 6 files changed, 179 insertions(+), 100 deletions(-)

diff --git a/lib/gl/gl_utils.onyx b/lib/gl/gl_utils.onyx
index b306d5a..29b749f 100644
--- a/lib/gl/gl_utils.onyx
+++ b/lib/gl/gl_utils.onyx
@@ -1,4 +1,4 @@
-package imgui.gl
+package imgui.gl_utils
 
 use package core
 #private_file gl :: package gl
diff --git a/lib/immediate_renderer.onyx b/lib/immediate_renderer.onyx
index 5a7c315..98343f8 100644
--- a/lib/immediate_renderer.onyx
+++ b/lib/immediate_renderer.onyx
@@ -3,7 +3,7 @@ package imgui
 #load "lib/gl/gl_utils"
 
 use package core
-use package imgui.gl
+use package imgui.gl_utils
 #private_file gl :: package gl
 
 Vector2 :: struct {
@@ -40,6 +40,9 @@ Immediate_Renderer :: struct {
     texture_uniform     : gl.GLUniformLocation;
     use_texture_uniform : gl.GLUniformLocation;
 
+    view_uniform        : gl.GLUniformLocation;
+    world_uniform       : gl.GLUniformLocation;
+
     // Needs to be a multiple of 3!!
     Default_Max_Verticies :: 1023;
 
@@ -58,6 +61,8 @@ Immediate_Renderer :: struct {
 
         texture_uniform     = gl.getUniformLocation(shader.program, "u_texture");
         use_texture_uniform = gl.getUniformLocation(shader.program, "u_use_texture");
+        view_uniform        = gl.getUniformLocation(shader.program, "u_view");
+        world_uniform       = gl.getUniformLocation(shader.program, "u_world");
 
         verticies = memory.make_slice(Immediate_Vertex, max_verticies);
         memory.set(verticies.data, 0, verticies.count * sizeof Immediate_Vertex);
@@ -83,6 +88,14 @@ Immediate_Renderer :: struct {
         gl.vertexAttribPointer(2, 2, gl.FLOAT, false, sizeof Immediate_Vertex, 6 * sizeof f32);
 
         gl.bindBuffer(gl.ARRAY_BUFFER, -1);
+
+
+
+        // TEMPORARY
+        gl.uniformMatrix4(world_uniform, false, f32.[ 1, 0, 0, 0,
+                                                      0, 1, 0, 0,
+                                                      0, 0, 1, 0,
+                                                      0, 0, 0, 1 ]);
     }
 
     free :: (use ir: ^Immediate_Renderer) {
@@ -112,7 +125,7 @@ Immediate_Renderer :: struct {
     push_vertex :: proc {
         // If a color is not provided, the previous color is used.
         (use ir: ^Immediate_Renderer, position: Vector2) {
-            push_vertex(ir, position, texture = .{ 0, 0 }, color = verticies[vertex_count - 1].color);
+            push_vertex(ir, position, color = verticies[vertex_count - 1].color);
         },
 
         (use ir: ^Immediate_Renderer, position: Vector2, color: Color4, texture: Vector2 = .{0,0}) {
@@ -154,6 +167,17 @@ Immediate_Renderer :: struct {
         gl.uniform1i(texture_uniform, math.max(texture_id, 0));
         gl.uniform1i(use_texture_uniform, cast(i32) (texture_id >= 0));
     }
+
+    use_ortho_projection :: (use ir: ^Immediate_Renderer, left: f32, right: f32, top: f32, bottom: f32) {
+        projection_matrix := f32.[
+            2 / (right - left), 0, 0, -(right + left) / (right - left),
+            0, 2 / (top - bottom), 0, -(top + bottom) / (top - bottom),
+            0, 0, -2, -1,
+            0, 0, 0, 1
+        ];
+
+        gl.uniformMatrix4(view_uniform, true, projection_matrix);
+    }
 }
 
 
@@ -192,3 +216,7 @@ immediate_textured_quad :: (position: Vector2, size: Vector2, texture_position:
 immediate_flush :: () do immediate_renderer->flush();
 
 immediate_set_texture :: (texture_id: i32 = -1) do immediate_renderer->set_texture(texture_id);
+
+use_ortho_projection :: (left: f32, right: f32, top: f32, bottom: f32) {
+    immediate_renderer->use_ortho_projection(left, right, top, bottom);
+}
diff --git a/lib/shaders/immediate_vertex.glsl b/lib/shaders/immediate_vertex.glsl
index cf95128..d3fdcab 100644
--- a/lib/shaders/immediate_vertex.glsl
+++ b/lib/shaders/immediate_vertex.glsl
@@ -4,11 +4,14 @@ layout(location = 0) in vec2 a_vertex;
 layout(location = 1) in vec4 a_color;
 layout(location = 2) in vec2 a_texture;
 
+uniform mat4 u_view;
+uniform mat4 u_world;
+
 out vec4 v_color;
 out vec2 v_texture;
 
 void main() {
-    gl_Position = vec4(a_vertex, 0, 1);
+    gl_Position = u_view * u_world * vec4(a_vertex, 0, 1);
 
     v_color = a_color;
     v_texture = a_texture;
diff --git a/site/sand_toy.wasm b/site/sand_toy.wasm
index 98b2ec3f07e8393aec3c0de6da2efe904818a548..49bc6f47d2957d2ef9e05b45fad247eaa12d20a2 100644
GIT binary patch
delta 13171
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
Rsb46<nq*)HOGw->{vRFro#+4n

delta 13391
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
AnE(I)

diff --git a/src/sand_toy.onyx b/src/sand_toy.onyx
index 3455a50..7d717de 100644
--- a/src/sand_toy.onyx
+++ b/src/sand_toy.onyx
@@ -3,12 +3,19 @@ use package core
 #private_file events :: package js_events
 #private_file gl     :: package gl
 
+BAR_HEIGHT :: 32.0f
+
 particle_board: ParticleBoard;
 
 world_texture : gl.GLTexture
 world_texture_data : [] u8
-world_width := 512
-world_height := 512
+world_width := 256
+world_height := 256
+
+window_width  := 0
+window_height := 0
+
+selected_particle := Particle.Type.Empty
 
 init :: () {
     events.init();
@@ -31,9 +38,6 @@ init :: () {
     particle_board = create_board(world_width, world_height);
 }
 
-window_width  := 0
-window_height := 0
-
 poll_events :: () {
     for event: events.consume() do switch event.kind {
         case .Resize {
@@ -47,37 +51,59 @@ poll_events :: () {
         }
 
         case .MouseDown {
+            if event.mouse.pos_y < ~~BAR_HEIGHT {
+                handle_ui_mouse(^event.mouse);
+                return;
+            }
+
             if event.mouse.button == .Left {
                 mx := (cast(f32) event.mouse.pos_x / cast(f32) window_width) * ~~world_width;
-                my := (cast(f32) event.mouse.pos_y / cast(f32) window_height) * ~~world_height;
+                my := ((~~event.mouse.pos_y - BAR_HEIGHT) / cast(f32) window_height) * ~~world_height;
 
-                radius := 10.0f;
-                for i: 100 {
-                    rx := random.float(-1, 1);
-                    ry := random.float(-1, 1);
+                spawn_particles(~~mx, ~~my, 20, selected_particle);
+            }
+
+            if event.mouse.button == .Right {
+                mx := (cast(f32) event.mouse.pos_x / cast(f32) window_width) * ~~world_width;
+                my := ((~~event.mouse.pos_y - BAR_HEIGHT) / cast(f32) window_height) * ~~world_height;
 
-                    particle_set(^particle_board,
-                        get_index(^particle_board, ~~(mx + rx * radius), ~~(my + ry * radius)),
-                        .{ .Water });
-                }
+                remove_particles(~~mx, ~~my, 10);
             }
         }
     }
 }
 
-update :: () {
-    if random.between(0, 10) > 1 {
-        radius := 10.0f;
-        for i: 100 {
-            rx := random.float(-1, 1);
-            ry := random.float(-1, 1);
+handle_ui_mouse :: (event: ^events.MouseEvent) {
+    if event.button == .Left {
+        selected_particle = Particle.types[cast(u32) math.floor(~~event.pos_x / BAR_HEIGHT)];
+    }
+}
+
+spawn_particles :: (x: i32, y: i32, radius: i32, type: Particle.Type, count := 100) {
+    for i: count {
+        r := random.float(0, ~~radius);
+        a := random.float(0, 2 * math.PI);
+
+        dx := r * math.cos(a);
+        dy := r * math.sin(a);
+
+        particle_set(^particle_board,
+            get_index(^particle_board, ~~(~~x + dx), ~~(~~y + dy)),
+            .{ type });
+    }
+}
 
+remove_particles :: (x: i32, y: i32, radius: i32) {
+    for yy: y - radius .. y + radius {
+        for xx: x - radius .. x + radius {
             particle_set(^particle_board,
-                get_index(^particle_board, ~~(200 + rx * radius), ~~(100 + ry * radius)),
-                .{ .Sand });
+                get_index(^particle_board, ~~xx, ~~yy),
+                .{ .Empty });
         }
     }
+}
 
+update :: () {
     update_particles(^particle_board);
 }
 
@@ -98,21 +124,53 @@ prepare_world_texture :: () {
 }
 
 draw :: () {
+    use imgui;
+
     prepare_world_texture();
+    use_ortho_projection(0, ~~window_width, 0, ~~window_height);
 
     gl.clearColor(0, 0, 0, 1);
     gl.clear(gl.COLOR_BUFFER_BIT);
 
-    use imgui { immediate_set_texture, immediate_textured_quad, immediate_flush };
-
-    gl.bindTexture(gl.TEXTURE_2D, world_texture);
+    draw_selection_bar();
     
+    gl.bindTexture(gl.TEXTURE_2D, world_texture);
+
     immediate_set_texture(0);
-    immediate_textured_quad(.{ -1, 1 }, .{ 2, -2 }, .{ 0, 0 }, .{ 1, 1 }, color=.{ 1, 1, 1 });
+    immediate_textured_quad(.{ 0, BAR_HEIGHT }, .{ ~~window_width, ~~window_height - BAR_HEIGHT }, .{ 0, 0 }, .{ 1, 1 }, color=.{ 1, 1, 1 });
+    immediate_set_texture();
 
     immediate_flush();
 
     gl.bindTexture(gl.TEXTURE_2D, -1);
+
+
+    draw_selection_bar :: () {
+        use imgui;
+
+        immediate_quad(.{ 0, 0 }, .{ ~~window_width, BAR_HEIGHT }, color=.{.2,.2,.2});
+
+        x_off := 4.0f;
+        for type: Particle.types {
+            if type == selected_particle {
+                immediate_quad(.{ x_off - 4, 0 }, .{ BAR_HEIGHT, BAR_HEIGHT }, color=.{1,1,0});
+            }
+
+            color := particle_type_to_color(type) |> convert_color();
+            immediate_quad(.{ x_off, 4 }, .{ BAR_HEIGHT - 8,  BAR_HEIGHT - 8 }, color=color);
+
+            x_off += BAR_HEIGHT;
+        }
+    }
+
+
+    convert_color :: (use c: Color) -> imgui.Color4 {
+        return .{
+            ~~cast(i32) r / 255.0f,
+            ~~cast(i32) g / 255.0f,
+            ~~cast(i32) b / 255.0f,
+        };
+    }
 }
 
 #export "loop" () {
diff --git a/src/simulation.onyx b/src/simulation.onyx
index d5c68fe..93a12fa 100644
--- a/src/simulation.onyx
+++ b/src/simulation.onyx
@@ -4,12 +4,13 @@ Color :: struct {
     Empty :: Color.{  22,  22,  22 };
     Sand  :: Color.{ 226, 214, 173 };
     Water :: Color.{ 100, 100, 255 };
+    Wall  :: Color.{  60,  60,  30 };
 
     r, g, b: u8;
 }
 
 Vec2 :: struct {
-    zero  :: Vec2.{ 0, 0 };
+    zero  :: Vec2.{  0,  0 };
     up    :: Vec2.{  0, -1 };
     down  :: Vec2.{  0,  1 };
     left  :: Vec2.{ -1,  0 };
@@ -32,7 +33,10 @@ Particle :: struct {
         Empty;
         Sand;
         Water;
+        Wall;
     }
+    
+    types :: Type.[ .Sand, .Water, .Wall ];
 
     type: Type = .Empty;
     life: f32 = 0;
@@ -43,6 +47,7 @@ particle_type_to_color :: (t: Particle.Type) -> Color {
     switch t {
         case .Sand    do return .Sand;
         case .Water   do return .Water;
+        case .Wall    do return .Wall;
         case #default do return .Empty;
     }
 }
@@ -96,6 +101,7 @@ update_particles :: (use board: ^ParticleBoard) {
             switch particle_type {
                 case .Sand  do update_sand(board, x, y);
                 case .Water do update_water(board, x, y);
+                case .Wall  --- // Walls do not need updating
                 case .Empty ---
             }
         }
@@ -108,12 +114,43 @@ particle_set :: (use board: ^ParticleBoard, index: i32, particle: Particle) {
     particles[index] = particle;
 }
 
+particle_switch :: (use board: ^ParticleBoard, a_index: i32, b_index: i32) {
+    if a_index < 0 || b_index < 0 do return;
+
+    particles[a_index], particles[b_index] = particles[b_index], particles[a_index];
+}
+
 // This should get inlined by Onyx, when inlining is a thing.
 get_index :: (use board: ^ParticleBoard, x: i32, y: i32) -> i32 {
     if x < 0 || y < 0 || x >= width || y >= height do return -1;
     return y * width + x;
 }
 
+#private_file
+particle_is_liquid :: (type: Particle.Type) -> bool {
+    switch type {
+        case .Water   do return true;
+        case #default do return false;
+    }
+}
+
+#private_file
+first_empty :: (use board: ^ParticleBoard, indicies: ..i32) -> i32 {
+    for index: indicies {
+        if index < 0 do continue;
+
+        if particles[index].type == .Empty {
+            return index;
+        }
+    }
+
+    return -1;
+}
+
+#private_file
+can_sink :: (use board: ^ParticleBoard, below_index: i32) -> bool {
+    return particle_is_liquid(particles[below_index].type);
+}
 
 #private_file
 update_sand :: (use board: ^ParticleBoard, x: i32, y: i32) {
@@ -123,34 +160,21 @@ update_sand :: (use board: ^ParticleBoard, x: i32, y: i32) {
     bl_index := get_index(board, x - 1, y + 1);
     br_index := get_index(board, x + 1, y + 1);
 
-    // NOTE: These do NOT short circuit so we are accessing memory that is not
-    // technically in our control on the second part of the condition!! This
-    // does not affect too many things as the accessing does not modify or damage
-    // the data.
-    if b_index > 0 && particles[b_index].type == .Empty {
-        particle_set(board, b_index, particles[index]);
+    move_to_index := -1;
+    if time % 2 == 0 {
+        move_to_index = first_empty(board, b_index, bl_index, br_index); 
+    } else {
+        move_to_index = first_empty(board, b_index, br_index, bl_index); 
+    }
+
+    if move_to_index != -1 {
+        particle_set(board, move_to_index, particles[index]);
         particle_set(board, index, .{ .Empty });
+        return;
     }
-    else {
-        if time % 2 == 0 {
-            if bl_index > 0 && particles[bl_index].type == .Empty {
-                particle_set(board, bl_index, particles[index]);
-                particle_set(board, index, .{ .Empty });
-            }
-            elseif br_index > 0 && particles[br_index].type == .Empty {
-                particle_set(board, br_index, particles[index]);
-                particle_set(board, index, .{ .Empty });
-            }
-        } else {
-            if br_index > 0 && particles[br_index].type == .Empty {
-                particle_set(board, br_index, particles[index]);
-                particle_set(board, index, .{ .Empty });
-            }
-            elseif bl_index > 0 && particles[bl_index].type == .Empty {
-                particle_set(board, bl_index, particles[index]);
-                particle_set(board, index, .{ .Empty });
-            }
-        }
+
+    if can_sink(board, b_index) {
+        particle_switch(board, index, b_index);
     }
 }
 
@@ -164,49 +188,15 @@ update_water :: (use board: ^ParticleBoard, x: i32, y: i32) {
     l_index  := get_index(board, x - 1, y);
     r_index  := get_index(board, x + 1, y);
 
-    // NOTE: These do NOT short circuit so we are accessing memory that is not
-    // technically in our control on the second part of the condition!! This
-    // does not affect too many things as the accessing does not modify or damage
-    // the data.
-    if b_index > 0 && particles[b_index].type == .Empty {
-        particle_set(board, b_index, particles[index]);
-        particle_set(board, index, .{ .Empty });
+    move_to_index := -1;
+    if time % 2 == 1 {
+        move_to_index = first_empty(board, b_index, bl_index, br_index, l_index, r_index);
+    } else {
+        move_to_index = first_empty(board, b_index, br_index, bl_index, r_index, l_index);
     }
-    else {
-        if time % 2 == 1 {
-            if bl_index > 0 && particles[bl_index].type == .Empty {
-                particle_set(board, bl_index, particles[index]);
-                particle_set(board, index, .{ .Empty });
-            }
-            elseif br_index > 0 && particles[br_index].type == .Empty {
-                particle_set(board, br_index, particles[index]);
-                particle_set(board, index, .{ .Empty });
-            }
-            elseif l_index > 0 && particles[l_index].type == .Empty {
-                particle_set(board, l_index, particles[index]);
-                particle_set(board, index, .{ .Empty });
-            }
-            elseif r_index > 0 && particles[r_index].type == .Empty {
-                particle_set(board, r_index, particles[index]);
-                particle_set(board, index, .{ .Empty });
-            }
-        } else {
-            if br_index > 0 && particles[br_index].type == .Empty {
-                particle_set(board, br_index, particles[index]);
-                particle_set(board, index, .{ .Empty });
-            }
-            elseif bl_index > 0 && particles[bl_index].type == .Empty {
-                particle_set(board, bl_index, particles[index]);
-                particle_set(board, index, .{ .Empty });
-            }
-            elseif r_index > 0 && particles[r_index].type == .Empty {
-                particle_set(board, r_index, particles[index]);
-                particle_set(board, index, .{ .Empty });
-            }
-            elseif l_index > 0 && particles[l_index].type == .Empty {
-                particle_set(board, l_index, particles[index]);
-                particle_set(board, index, .{ .Empty });
-            }
-        }
+
+    if move_to_index != -1 {
+        particle_set(board, move_to_index, particles[index]);
+        particle_set(board, index, .{ .Empty });
     }
 }
-- 
2.25.1