From 15c9c8add8a3871ad830ad9cbe912ee01324d9e0 Mon Sep 17 00:00:00 2001
From: Brendan Hansen <brendan.f.hansen@gmail.com>
Date: Sun, 9 May 2021 12:17:58 -0500
Subject: [PATCH] switch 'quad' to 'rect'. windows build.bat

---
 build.bat          |  10 ++++++++++
 site/sand_toy.wasm | Bin 24373 -> 25538 bytes
 src/sand_toy.onyx  |   8 ++++----
 3 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 build.bat

diff --git a/build.bat b/build.bat
new file mode 100644
index 0000000..ce6c778
--- /dev/null
+++ b/build.bat
@@ -0,0 +1,10 @@
+@echo off
+
+set TARGET=site\sand_toy.wasm
+set ONYX_INSTALLATION_FOLDER=\dev\onyx
+
+copy "%ONYX_INSTALLATION_FOLDER%\bin\onyx-loader.js" .\site\js\onyx-loader.js  >NUL
+copy "%ONYX_INSTALLATION_FOLDER%\modules\webgl2\webgl2.js" .\site\js\webgl2.js >NUL
+copy "%ONYX_INSTALLATION_FOLDER%\modules\js_events\js_events.js" .\site\js\js_events.js >NUL
+
+\dev\onyx\onyx -r js --use-post-mvp-features -V -o %TARGET% src\build.onyx -I %ONYX_INSTALLATION_FOLDER%
diff --git a/site/sand_toy.wasm b/site/sand_toy.wasm
index 802890f470ee5701c6974cbf94f3321399b1b306..7f687fa774da28392268b1ce6af3df59e022786c 100644
GIT binary patch
delta 3610
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
K{B<P`)%+9m9=mb?

delta 2486
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
L6T67z1OxaVNFzM*

diff --git a/src/sand_toy.onyx b/src/sand_toy.onyx
index 7fdd8c8..aebc1c4 100644
--- a/src/sand_toy.onyx
+++ b/src/sand_toy.onyx
@@ -161,7 +161,7 @@ draw :: () {
 
     gfx.set_texture(0);
     gfx.use_ortho_projection(0, ~~window_width, 0, ~~window_height);
-    gfx.textured_quad(.{ 0, BAR_HEIGHT }, .{ ~~window_width, ~~window_height - BAR_HEIGHT }, .{ 0, 0 }, .{ 1, 1 });
+    gfx.textured_rect(.{ 0, BAR_HEIGHT }, .{ ~~window_width, ~~window_height - BAR_HEIGHT }, .{ 0, 0 }, .{ 1, 1 });
 
     gfx.flush();
 
@@ -169,16 +169,16 @@ draw :: () {
 
 
     draw_selection_bar :: () {
-        gfx.quad(.{ 0, 0 }, .{ ~~window_width, BAR_HEIGHT }, color=.{.2,.2,.2});
+        gfx.rect(.{ 0, 0 }, .{ ~~window_width, BAR_HEIGHT }, color=.{.2,.2,.2});
 
         x_off := 4.0f;
         for type: Particle.types {
             if type == selected_particle {
-                gfx.quad(.{ x_off - 4, 0 }, .{ BAR_HEIGHT, BAR_HEIGHT }, color=.{1,1,0});
+                gfx.rect(.{ x_off - 4, 0 }, .{ BAR_HEIGHT, BAR_HEIGHT }, color=.{1,1,0});
             }
 
             color := particle_type_to_color(type) |> convert_color();
-            gfx.quad(.{ x_off, 4 }, .{ BAR_HEIGHT - 8,  BAR_HEIGHT - 8 }, color=color);
+            gfx.rect(.{ x_off, 4 }, .{ BAR_HEIGHT - 8,  BAR_HEIGHT - 8 }, color=color);
 
             x_off += BAR_HEIGHT;
         }
-- 
2.25.1