fixing basics

notnullgames · Sep 3, 2024 · c88a21b · c88a21b
1 parent fc09529
commit c88a21b
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 17 deletions.
diff --git a/cart/c/sound/main.c b/cart/c/sound/main.c
@@ -82,10 +82,10 @@ int main() {
 
   // load a SFX from a file
   // currently this is broke
-  SfxParams* fileloaded = malloc(96);
-  load_sfx(fileloaded, "assets/sound.rfx");
-  fileloaded_sfx = new_sfx(fileloaded);
-  print_sfx(*fileloaded);
+  // SfxParams* fileloaded = malloc(96);
+  // load_sfx(fileloaded, "assets/sound.rfx");
+  // fileloaded_sfx = new_sfx(fileloaded);
+  // print_sfx(*fileloaded);
 
   return 0;
 }
@@ -98,7 +98,7 @@ void update() {
   draw_text(0, "Press X for coin sound.", 65, HEIGHT / 2 - 20, RAYWHITE);
   draw_text(0, "Press Y for hurt sound.", 65, HEIGHT / 2, RAYWHITE);
   draw_text(0, "Press START for hardcoded sfx struct", 18, HEIGHT / 2 + 20, RAYWHITE);
-  draw_text(0, "Press SELECT for file sfx", 45, HEIGHT / 2 + 40, RAYWHITE);
+  // draw_text(0, "Press SELECT for file sfx", 45, HEIGHT / 2 + 40, RAYWHITE);
 }
 
 NULL0_EXPORT("buttonDown")
@@ -133,7 +133,7 @@ void buttonDown(GamepadButton button) {
     play_sound(preloaded_sfx, false);
   }
 
-  if (button == GAMEPAD_BUTTON_SELECT) {
-    play_sound(fileloaded_sfx, false);
-  }
+  // if (button == GAMEPAD_BUTTON_SELECT) {
+  //   play_sound(fileloaded_sfx, false);
+  // }
 }
diff --git a/docs/cart/colorbars.null0 b/docs/cart/colorbars.null0
diff --git a/docs/cart/draw.null0 b/docs/cart/draw.null0
diff --git a/docs/cart/filesystem.null0 b/docs/cart/filesystem.null0
diff --git a/docs/cart/flappybird.null0 b/docs/cart/flappybird.null0
diff --git a/docs/cart/hello.null0 b/docs/cart/hello.null0
diff --git a/docs/cart/input.null0 b/docs/cart/input.null0
diff --git a/docs/cart/justlog.null0 b/docs/cart/justlog.null0
diff --git a/docs/cart/sound.null0 b/docs/cart/sound.null0
diff --git a/docs/cart/tracker.null0 b/docs/cart/tracker.null0
diff --git a/docs/cart/typesizes.null0 b/docs/cart/typesizes.null0
diff --git a/docs/index.html b/docs/index.html
@@ -31,11 +31,11 @@
     <null0-cart src="cart/input.null0" fps></null0-cart>
     <null0-cart src="cart/colorbars.null0" fps></null0-cart>
     <null0-cart src="cart/draw.null0" fps></null0-cart>
-    <null0-cart src="cart/hello.null0" fps></null0-cart>
-    <null0-cart src="cart/flappybird.null0" fps></null0-cart>
+    <!-- <null0-cart src="cart/hello.null0" fps></null0-cart> -->
+    <!-- <null0-cart src="cart/flappybird.null0" fps></null0-cart> -->
     <null0-cart src="cart/sound.null0" fps></null0-cart>
-    <null0-cart src="cart/typesizes.null0" fps></null0-cart>
-    <null0-cart src="cart/filesystem.null0"></null0-cart>
-    <null0-cart src="cart/justlog.null0"></null0-cart>
+    <!-- <null0-cart src="cart/typesizes.null0" fps></null0-cart> -->
+    <!-- <null0-cart src="cart/filesystem.null0"></null0-cart> -->
+    <!-- <null0-cart src="cart/justlog.null0"></null0-cart> -->
   </body> 
 </html>
diff --git a/docs/null0.js b/docs/null0.js
@@ -113,6 +113,10 @@ export async function setupCart (url, canvas = document.body.appendChild(documen
     cart[k] = exports[k]
   }
 
+  const d = new TextDecoder()
+  cart.getString = (offset, length) => d.decode(exports.memory.buffer.slice(offset, offset + length))
+  cart.view = new DataView(exports.memory.buffer)
+
   out.cart = cart
 
   if (cart._start) {
@@ -124,7 +128,7 @@ export async function setupCart (url, canvas = document.body.appendChild(documen
   }
 
   if (cart.buttonDown) {
-    canvas.addEventListener('keydown', ({key}) => {
+    canvas.addEventListener('keydown', ({ key }) => {
       if (key === 'z') {
         cart.buttonDown(Buttons.B)
       }
@@ -165,7 +169,7 @@ export async function setupCart (url, canvas = document.body.appendChild(documen
   }
 
   if (cart.buttonUp) {
-    canvas.addEventListener('keyup', ({key}) => {
+    canvas.addEventListener('keyup', ({ key }) => {
       if (key === 'z') {
         cart.buttonUp(Buttons.B)
       }
@@ -205,7 +209,6 @@ export async function setupCart (url, canvas = document.body.appendChild(documen
     })
   }
 
-
   const cartUpdate = () => {
     if (cart.update) {
       cart.update()

diff --git a/docs/wasm/null0.mjs b/docs/wasm/null0.mjs
diff --git a/docs/wasm/null0.wasm b/docs/wasm/null0.wasm