From: Brendan Hansen <brendan.f.hansen@gmail.com>
Date: Tue, 9 Feb 2021 22:10:08 +0000 (-0600)
Subject: change with onyx version
X-Git-Url: https://git.brendanfh.com/?a=commitdiff_plain;h=HEAD;p=onyx-game.git

change with onyx version
---

diff --git a/build.onyx b/build.onyx
index 36dd2a2..df4a233 100644
--- a/build.onyx
+++ b/build.onyx
@@ -1,7 +1,7 @@
 package build
 
 // Load the core modules
-#load "core/std/js"
+#load "core/std"
 #load "core/js/webgl"
 
 
diff --git a/build.sh b/build.sh
index 04397f0..090ed5b 100755
--- a/build.sh
+++ b/build.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-onyx -V build.onyx
+onyx -r js -V build.onyx -o build.wasm
diff --git a/src/font.onyx b/src/font.onyx
index 480373f..5b03018 100644
--- a/src/font.onyx
+++ b/src/font.onyx
@@ -311,7 +311,7 @@ ttf_read_simple_glyph :: (use ttf: ^TrueTypeFont, glyph: ^TTGlyph) {
 
     if glyph.contour_count == ~~0 do return;
 
-    num_points := array.fold(^glyph.contour_ends, cast(u16) 0, math.max) + ~~1;
+    num_points := array.fold(^glyph.contour_ends, cast(u16) 0, math.max_poly) + ~~1;
 
     flags : [..] TTGlyphFlags;
     array.init(^flags);
diff --git a/src/main.onyx b/src/main.onyx
index 74e23e0..5a6ddf8 100644
--- a/src/main.onyx
+++ b/src/main.onyx
@@ -159,9 +159,9 @@ update :: (dt: f32) {
     }
 
     for ^tile: tilemap.tiles {
-        if tile.r < 255 do tile.r += 1; else do tile.r = 255;
-        if tile.g < 255 do tile.g += 1; else do tile.g = 255;
-        if tile.b < 255 do tile.b += 1; else do tile.b = 255;
+        if tile.r > 0 do tile.r -= 1; else do tile.r = 0;
+        if tile.g > 0 do tile.g -= 1; else do tile.g = 0;
+        if tile.b > 0 do tile.b -= 1; else do tile.b = 0;
     }
 }
 
@@ -195,7 +195,8 @@ draw :: () {
     renderer.color = Color4f32.{ 0.0f, 0.0f, 0.0f, 1.0f };
     font.draw_text(^renderer, "Hello. Test(12486)", V2f.{ 10.0f, 10.0f }, 2.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, ~~(input_state.mouse.x - 10), ~~(input_state.mouse.y - 10), 20, 20);
     render_context_ui(^renderer);
 }
 
@@ -377,9 +378,9 @@ Tilemap :: struct {
 }
 
 Tile :: struct {
-    r : u8 = 255;
-    g : u8 = 255;
-    b : u8 = 255;
+    r : u8 = 0;
+    g : u8 = 0;
+    b : u8 = 0;
 }
 
 tilemap_init :: (use tm: ^Tilemap, w := 10, h := 10) {
diff --git a/src/vecmath.onyx b/src/vecmath.onyx
index 32abfe5..319f369 100644
--- a/src/vecmath.onyx
+++ b/src/vecmath.onyx
@@ -7,21 +7,21 @@ V2 :: struct (T: type_expr) { x: T = 0; y: T = 0; }
 V2f :: #type V2(f32);
 V2i :: #type V2(i32);
 
-v2_add :: (a: V2($T), b: V2(T)) -> V2(T) {
+v2_add :: (a: V2($T), b: V2(T)) -> V2(T) #operator+ {
     ret : V2(T);
     ret.x = a.x + b.x;
     ret.y = a.y + b.y;
     return ret;
 }
 
-v2_sub :: (a: V2($T), b: V2(T)) -> V2(T) {
+v2_sub :: (a: V2($T), b: V2(T)) -> V2(T) #operator- {
     ret : V2(T);
     ret.x = a.x - b.x;
     ret.y = a.y - b.y;
     return ret;
 }
 
-v2_mul :: (a: V2($T), scalar: T) -> V2(T) {
+v2_mul :: (a: V2($T), scalar: T) -> V2(T) #operator* {
     ret : V2(T);
     ret.x = a.x * scalar;
     ret.y = a.y * scalar;