backport sound fix

Cargo.toml

@@ -27,5 +27,5 @@ tokio = { version = "1.17.0", features = ["sync", "rt"], optional = true }
 tokio-stream = { version = "0.1.8", features = ["sync"], optional = true }
 webbrowser = { version = "0.6.0", optional = true }
 ansi_term = "0.12.1"
-cpal = { version = "0.13.5", optional = true }
+cpal = { version = "0.14.1", optional = true }
 rubato = { version = "0.11.0", optional = true }

examples/include/microw8-api.cwa

@@ -34,6 +34,7 @@ import "env.rectangle_outline" fn rectangle_outline(f32, f32, f32, f32, i32);
 import "env.circle_outline" fn circle_outline(f32, f32, f32, i32);
 import "env.exp" fn exp(f32) -> f32;
 import "env.playNote" fn playNote(i32, i32);
+import "env.sndGes" fn sndGes(i32) -> f32;
 
 const TIME_MS = 0x40;
 const GAMEPAD = 0x44;

examples/include/microw8-api.wat

@@ -34,6 +34,7 @@
 (import "env" "circle_outline" (func $circle_outline (param f32) (param f32) (param f32) (param i32)))
 (import "env" "exp" (func $exp (param f32) (result f32)))
 (import "env" "playNote" (func $playNote (param i32) (param i32)))
+(import "env" "sndGes" (func $sndGes (param i32) (result f32)))
 
 ;; to use defines, include this file with a preprocessor
 ;; like gpp (https://logological.org/gpp).

platform/Cargo.lock

@@ -391,7 +391,7 @@ checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
 [[package]]
 name = "upkr"
 version = "0.1.0"
-source = "git+https://github.com/exoticorn/upkr.git?rev=2e7983fc#2e7983fc650788d98da2eecef2d16f63e849e4a0"
+source = "git+https://github.com/exoticorn/upkr.git?rev=d93aec186c9fb91d962c488682a2db125c61306c#d93aec186c9fb91d962c488682a2db125c61306c"
 dependencies = [
  "anyhow",
  "cdivsufsort",

platform/src/ges.cwa

@@ -10,7 +10,7 @@ const GesState.Size = GesState.Filter + 8*4;
 const GesStateOffset = 32;
 const GesBufferOffset = 32 + GesState.Size;
 
-export fn gesSnd(t: i32) -> f32 {
+export fn sndGes(t: i32) -> f32 {
     let baseAddr = 0!0x12c78;
     if !(t & 127) {
         let i: i32;
@@ -62,7 +62,6 @@ export fn gesSnd(t: i32) -> f32 {
             let phase = channelState!GesChannelState.Phase;
 
             let inline pulseWidth = channelReg?1;
-            let phaseShift = (pulseWidth - 128) * 255;
             let invPhaseInc = 1 as f32 / phaseInc as f32;
 
             i = 0;
@@ -131,7 +130,7 @@ export fn gesSnd(t: i32) -> f32 {
                 let phaseInc = (freq * (65536.0 / 44100.0)) as i32;
 
                 let phase = channelState!GesChannelState.Phase;
-                if modSrc > ch {
+                if modSrc < ch {
                     phase = phase - (phaseInc << 6);
                 }
 

site/content/_index.md

@@ -29,6 +29,19 @@ Examplers for older versions:
 
 ## Versions
 
+### v0.2.1
+
+* [Web runtime](v0.2.1)
+* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.2.1/microw8-0.2.1-linux.tgz)
+* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.2.1/microw8-0.2.1-macos.tgz)
+* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.2.1/microw8-0.2.1-windows.zip)
+
+Changes:
+
+* new gpu accelerated renderer with (optional) crt filter
+* optimized `hline` function, a big speed-up when drawing large filled circles or rectangles
+* print fractional size of packed `uw8` cart
+
 ### v0.2.0
 
 * [Web runtime](v0.2.0)

site/templates/index.html

@@ -4,7 +4,7 @@
         <section>
             <h1 class="text-center heading-text">A WebAssembly based fantasy console</h1>
         </section>
-        <a href="v0.2.0">
+        <a href="v0.2.1">
             <img class="demonstration-gif" style="width:640px;height:480px;image-rendering:pixelated" src="img/technotunnel.png"></img>
         </a>
     </div>

src/main.rs

@@ -81,11 +81,12 @@ fn run(mut args: Arguments) -> Result<()> {
     #[cfg(not(feature = "native"))]
     let run_browser = args.contains(["-b", "--browser"]) || true;
 
+    #[allow(unused)]
     let disable_audio = args.contains(["-m", "--no-audio"]);
 
     #[cfg(feature = "native")]
     let window_config = {
-        let mut config = WindowConfig::default();
+        let mut config = uw8_window::WindowConfig::default();
         if !run_browser {
             config.parse_arguments(&mut args);
         }
@@ -98,8 +99,6 @@ fn run(mut args: Arguments) -> Result<()> {
 
     use std::process::exit;
 
-    use uw8_window::WindowConfig;
-
     let mut runtime: Box<dyn Runtime> = if !run_browser {
         #[cfg(not(feature = "native"))]
         unimplemented!();

src/run_native.rs

@@ -314,7 +314,7 @@ fn init_sound(
 
     let snd = instance
         .get_typed_func::<(i32,), f32, _>(&mut store, "snd")
-        .or_else(|_| platform_instance.get_typed_func::<(i32,), f32, _>(&mut store, "gesSnd"))?;
+        .or_else(|_| platform_instance.get_typed_func::<(i32,), f32, _>(&mut store, "sndGes"))?;
 
     let host = cpal::default_host();
     let device = host
@@ -342,7 +342,7 @@ fn init_sound(
         .ok_or_else(|| anyhow!("Could not find float output config"))?;
     let sample_rate = cpal::SampleRate(44100)
         .max(config.min_sample_rate())
-        .max(config.max_sample_rate());
+        .min(config.max_sample_rate());
     let config = config.with_sample_rate(sample_rate);
     let buffer_size = match *config.buffer_size() {
         cpal::SupportedBufferSize::Unknown => cpal::BufferSize::Default,
@@ -419,6 +419,14 @@ fn init_sound(
                     mem[64..68].copy_from_slice(&current_time.to_le_bytes());
                 }
 
+                fn clamp_sample(s: f32) -> f32 {
+                    if s.is_nan() {
+                        0.0
+                    } else {
+                        s.max(-1.0).min(1.0)
+                    }
+                }
+
                 if let Some(ref mut resampler) = resampler {
                     while !buffer.is_empty() {
                         let copy_size = resampler.output_buffers[0]
@@ -429,10 +437,12 @@ fn init_sound(
                             resampler.input_buffers[0].clear();
                             resampler.input_buffers[1].clear();
                             for _ in 0..resampler.resampler.input_frames_next() {
-                                resampler.input_buffers[0]
-                                    .push(snd.call(&mut store, (sample_index,)).unwrap_or(0.0));
-                                resampler.input_buffers[1]
-                                    .push(snd.call(&mut store, (sample_index + 1,)).unwrap_or(0.0));
+                                resampler.input_buffers[0].push(clamp_sample(
+                                    snd.call(&mut store, (sample_index,)).unwrap_or(0.0),
+                                ));
+                                resampler.input_buffers[1].push(clamp_sample(
+                                    snd.call(&mut store, (sample_index + 1,)).unwrap_or(0.0),
+                                ));
                                 sample_index = sample_index.wrapping_add(2);
                             }
 
@@ -458,7 +468,7 @@ fn init_sound(
                     }
                 } else {
                     for v in buffer {
-                        *v = snd.call(&mut store, (sample_index,)).unwrap_or(0.0);
+                        *v = clamp_sample(snd.call(&mut store, (sample_index,)).unwrap_or(0.0));
                         sample_index = sample_index.wrapping_add(1);
                     }
                 }

todo.txt

@@ -0,0 +1 @@
+* add support for 16bit sound (not just float)

uw8-tool/src/base_module.rs

@@ -167,6 +167,7 @@ impl BaseModule {
         add_function(&mut functions, &type_map, "exp", &[F32], Some(F32));
 
         add_function(&mut functions, &type_map, "playNote", &[I32, I32], None);
+        add_function(&mut functions, &type_map, "sndGes", &[I32], Some(F32));
 
         for i in functions.len()..64 {
             add_function(

uw8-tool/src/pack.rs

@@ -220,6 +220,11 @@ impl<'a> ParsedModule<'a> {
                     validate_table_section(reader)?;
                     table_section = Some(Section::new(range, ()));
                 }
+                Payload::MemorySection(reader) => {
+                    if reader.get_count() != 0 {
+                        bail!("Found non-empty MemorySection. Memory has to be imported!");
+                    }
+                }
                 Payload::ElementSection(mut reader) => {
                     let mut elements = Vec::with_capacity(reader.get_count() as usize);
                     for _ in 0..reader.get_count() {

uw8-window/Cargo.toml

@@ -15,4 +15,4 @@ pollster = "0.2"
 bytemuck = { version = "1.4", features = [ "derive" ] }
 anyhow = "1"
 minifb = { version = "0.23.0", default-features = false, features = ["x11"] }
-winapi = "0.3.9"
+winapi = { version = "0.3.9", features = ["std"] }

uw8-window/src/lib.rs

@@ -4,31 +4,64 @@ use std::time::Instant;
 mod cpu;
 mod gpu;
 
-pub struct Window(Box<dyn WindowImpl>);
+pub struct Window {
+    inner: Box<dyn WindowImpl>,
+    fps_counter: Option<FpsCounter>,
+}
+
+struct FpsCounter {
+    start: Instant,
+    num_frames: u32,
+}
 
 impl Window {
     pub fn new(config: WindowConfig) -> Result<Window> {
+        let fps_counter = if config.fps_counter {
+            Some(FpsCounter {
+                start: Instant::now(),
+                num_frames: 0,
+            })
+        } else {
+            None
+        };
         if config.enable_gpu {
             match gpu::Window::new(config) {
-                Ok(window) => return Ok(Window(Box::new(window))),
+                Ok(window) => {
+                    return Ok(Window {
+                        inner: Box::new(window),
+                        fps_counter,
+                    })
+                }
                 Err(err) => eprintln!(
                     "Failed to create gpu window: {}\nFalling back tp cpu window",
                     err
                 ),
             }
         }
-        cpu::Window::new().map(|window| Window(Box::new(window)))
+        cpu::Window::new().map(|window| Window {
+            inner: Box::new(window),
+            fps_counter,
+        })
     }
 
     pub fn begin_frame(&mut self) -> Input {
-        self.0.begin_frame()
+        self.inner.begin_frame()
     }
     pub fn end_frame(&mut self, framebuffer: &[u8], palette: &[u8], next_frame: Instant) {
-        self.0.end_frame(framebuffer, palette, next_frame)
+        self.inner.end_frame(framebuffer, palette, next_frame);
+        if let Some(ref mut fps_counter) = self.fps_counter {
+            fps_counter.num_frames += 1;
+            let elapsed = fps_counter.start.elapsed().as_secs_f32();
+            if elapsed >= 1.0 {
+                println!("fps: {:.1}", fps_counter.num_frames as f32 / elapsed);
+                fps_counter.num_frames = 0;
+                fps_counter.start = Instant::now();
+            }
+        }
     }
 
     pub fn is_open(&self) -> bool {
-        self.0.is_open()
+        self.inner.is_open()
     }
 }
 
@@ -37,6 +70,7 @@ pub struct WindowConfig {
     enable_gpu: bool,
     filter: u32,
     fullscreen: bool,
+    fps_counter: bool,
 }
 
 impl Default for WindowConfig {
@@ -45,6 +79,7 @@ impl Default for WindowConfig {
             enable_gpu: true,
             filter: 5,
             fullscreen: false,
+            fps_counter: false,
         }
     }
 }
@@ -66,6 +101,7 @@ impl WindowConfig {
             }
         }
         self.fullscreen = args.contains("--fullscreen");
+        self.fps_counter = args.contains("--fps");
     }
 }
 

web/src/audiolet.js

@@ -63,7 +63,7 @@ class APU extends AudioWorkletProcessor {
 
         this.memory = memory;
 
-        this.snd = instance.exports.snd || platform_instance.exports.gesSnd;
+        this.snd = instance.exports.snd || platform_instance.exports.sndGes;
 
         this.port.postMessage(2);
     }