Merge pull request #41 from JohnDog3112/dev

Fixes for milestone 2.5.0

Author: twiddlingbits

docs/api/api-c-audio.md

@@ -39,7 +39,7 @@ void play() {
 
    //creates a mon-audio channel buffer at our given SAMPLE_RATE
    // and square-wave data we generated
-   long node_id = twr_audio_from_samples(1, SAMPLE_RATE, wave, length);
+   long node_id = twr_audio_from_float_pcm(1, SAMPLE_RATE, wave, length);
 
    //plays the square wave
    // Can be played multiple times, and is only freed on twr_audio_free
@@ -50,7 +50,7 @@ void play() {
 ## Overview
 The Audio API is part a twr-wasm library that can be accessed via `#include "twr-audio.h"`. It has two main methods to play audio: from raw PCM data and from a URL. 
 
-Raw PCM data can be initialized via `twr_audio_from_samples` or `twr_audio_load`. `twr_audio_from_samples` takes in the PCM data as an array of floats between -1.0 and 1.0. `twr_audio_load`, on the other hand, reads the PCM data from an audio file that is specified by a URL. This method does not stream the audio, so it might take some time to read the file (depending how long the file is). Each function returns an integer `node_id` that identifies the loaded PCM data.  Once the PCM data is initialized, it can be played via functions like `twr_audio_play`, `twr_audio_play_range`, `twr_audio_play_sync`, and `twr_audio_play_range_sync`.  The play functions can be called multiple times for each audio ID.
+Raw PCM data can be initialized via `twr_audio_from_<type>_pcm` or `twr_audio_load`. There are multiple types for `twr_audio_from_<type>_pcm`. These types include Float, 8bit, 16bit, and 32bit. Float takes in values between -1.0 and 1.0. Meanwhile, the 8bit, 16bit, and 32bit versions take them in as signed numbers between their minimum and maximum values. `twr_audio_load`, on the other hand, reads the PCM data from an audio file that is specified by a URL. This method does not stream the audio, so it might take some time to read the file (depending how long the file is). Each function returns an integer `node_id` that identifies the loaded PCM data.  Once the PCM data is initialized, it can be played via functions like `twr_audio_play`, `twr_audio_play_range`, `twr_audio_play_sync`, and `twr_audio_play_range_sync`.  The play functions can be called multiple times for each audio ID.
 
 You can also play audio directly from a URL. Unlike `twr_audio_load`, the url is initialized directly into an `HTMLAudioElement` which streams the audio and starts playback immediately.
 
@@ -65,7 +65,15 @@ Functions that end in `_sync` are for use with `twrWamModuleAsync`, and are sync
 These are the current Audio APIs available in C/C++:
 
 ~~~c
-long twr_audio_from_samples(long num_channels, long sample_rate, float* data, long singleChannelDataLen);
+long twr_audio_from_float_pcm(long num_channels, long sample_rate, float* data, long singleChannelDataLen);
+long twr_audio_from_8bit_pcm(long number_channels, long sample_rate, char* data, long singleChannelDataLen);
+long twr_audio_from_16bit_pcm(long number_channels, long sample_rate, short* data, long singleChannelDataLen);
+long twr_audio_from_32bit_pcm(long number_channels, long sample_rate, int* data, long singleChannelDataLen);
+
+float* twr_audio_get_float_pcm(long node_id, long* singleChannelDataLenPtr, long* numChannelsPtr);
+char* twr_audio_get_8bit_pcm(long node_id, long* singleChannelDataLenPtr, long* numChannelsPtr);
+short* twr_audio_get_16bit_pcm(long node_id, long* singleChannelDataLenPtr, long* numChannelsPtr);
+int* twr_audio_get_32bit_pcm(long node_id, long* singleChannelDataLenPtr, long* numChannelsPtr);
 
 long twr_audio_play(long node_id);
 long twr_audio_play_volume(long node_id, double volume, double pan);
@@ -97,14 +105,13 @@ long twr_audio_play_range_sync_ex(long node_id, long start_sample, long end_samp
 long twr_audio_load_sync(char* url);
 long twr_audio_load(int event_id, char* url);
 long twr_audio_query_playback_position(long playback_id);
-float* twr_audio_get_samples(long node_id, long* singleChannelDataLenPtr, long* channelPtr);
 void twr_audio_free_id(long node_id);
 
 void twr_audio_stop_playback(long playback_id);
 
-void twr_audio_modify_playback_volume(long node_id, double volume);
-void twr_audio_modify_playback_pan(long node_id, double pan);
-void twr_audio_modify_playback_rate(long node_id, double sample_rate);
+void twr_audio_modify_playback_volume(long playback_id, double volume);
+void twr_audio_modify_playback_pan(long playback_id, double pan);
+void twr_audio_modify_playback_rate(long playback_id, double sample_rate);
 
 long twr_audio_play_file(char* file_url);
 long twr_audio_play_file_ex(char* file_url, double volume, double playback_rate, int loop);
@@ -116,9 +123,5 @@ struct AudioMetadata {
 };
 
 void twr_audio_get_metadata(long node_id, struct AudioMetadata* metadata);
-
-float* twr_convert_8_bit_pcm(char* pcm, long pcm_len);
-float* twr_convert_16_bit_pcm(short* pcm, long pcm_len);
-float* twr_convert_32_bit_pcm(long* pcm, long pcm_len);
 ~~~
 

docs/api/api-c-d2d.md

@@ -197,6 +197,7 @@ void d2d_resettransform(struct d2d_draw_seq* ds);
 bool d2d_load_image(const char* url, long id);
 bool d2d_load_image_with_con(const char* url, long id, twr_ioconsole_t * con);
 void d2d_drawimage(struct d2d_draw_seq* ds, long id, double dx, double dy);
+void d2d_drawimage_ex(struct d2d_draw_seq* ds, long id, double sx, double sy, double sWidth, double sHeight, double dx, double dy, double dWidth, double dHeight);
 void d2d_getimagedata(struct d2d_draw_seq* ds, long id, double x, double y, double width, double height);
 unsigned long d2d_getimagedatasize(double width, double height);
 void d2d_imagedatatoc(struct d2d_draw_seq* ds, long id, void* buffer, unsigned long buffer_len);

docs/api/api-c-stdlib.md

@@ -108,6 +108,7 @@ void assert(int expression);
 double acos(double arg);
 double asin(double arg);
 double atan(double arg);
+double atan2(double y, double x);
 double ceil(double arg);
 double cos(double arg);
 double exp(double arg);

examples/pong/Makefile

@@ -36,7 +36,7 @@ jsEventsLib.js: jsEventsLib.ts
 
 entry-point.wasm: $(OBJECTS)
 	wasm-ld $(OBJECTS) ../../lib-c/twr.a -o entry-point.wasm \
-		--no-entry --shared-memory --no-check-features --initial-memory=2031616 --max-memory=2031616
+		--no-entry --initial-memory=2031616 --max-memory=2031616
 
 entry-point-a.wasm: $(OBJECTS_ASYNC)
 	wasm-ld $(OBJECTS_ASYNC) ../../lib-c/twr.a -o entry-point-a.wasm \

examples/pong/extra.cpp

@@ -15,7 +15,7 @@ float* generate_square_wave(double frequency, double duration, long sample_rate)
 
 long load_square_wave(double frequency, double duration, long sample_rate) {
    float* wave = generate_square_wave(frequency, duration, sample_rate);
-   long node_id = twr_audio_from_samples(1, sample_rate, wave, (long)ceil(duration * sample_rate));
+   long node_id = twr_audio_from_float_pcm(1, sample_rate, wave, (long)ceil(duration * sample_rate));
    free(wave);
    return node_id;
 }

examples/pong/pong.cpp

@@ -83,7 +83,7 @@ void Pong::render() {
 }
 void Pong::renderBackground() {
    #ifdef ASYNC
-   this->canvas.drawImage(background_image_id, 0, 0, 0, 0, this->width, this->height);
+   this->canvas.drawImage(background_image_id, 0, 0, this->width, this->height, 0, 0, 0, 0);
    #endif
 
 
@@ -261,6 +261,7 @@ void Pong::tick(long time) {
 
     this->run_time += delta;
 }
+const double BALL_BOUNCE_VOL = 2.0;
 void Pong::tickBall(long delta) {
     double prev_y = this->ball_y;
     this->ball_x += this->ball_velocity_x * delta;
@@ -270,18 +271,18 @@ void Pong::tickBall(long delta) {
     if (this->ball_x <= this->border_width) { //left wall
         this->ball_x = this->border_width;
         this->ball_velocity_x *= -1;
-        twr_audio_play(this->bounce_noise);
+        twr_audio_play_volume(this->bounce_noise, BALL_BOUNCE_VOL, 0.0);
     } else if (this->ball_x >= this->width - this->ball_size - this->border_width) { //right wall
         this->ball_x = this->width - this->ball_size - this->border_width;
         this->ball_velocity_x *= -1;
-        twr_audio_play(this->bounce_noise);
+        twr_audio_play_volume(this->bounce_noise, BALL_BOUNCE_VOL, 0.0);
     } 
 
     //x and y are seperate checks for the corner case
     if (this->ball_y <= border_width) { //top wall
         this->ball_y = this->border_width;
         this->ball_velocity_y *= -1;
-        twr_audio_play(this->bounce_noise);
+        twr_audio_play_volume(this->bounce_noise, BALL_BOUNCE_VOL, 0.0);
     } else if (this->ball_y >= this->height - this->ball_size - this->border_width) { //bottom wall, lost game
         this->ball_y = this->height - this->ball_size - this->border_width - 1.0;
         twr_audio_play(this->lose_noise);
@@ -324,7 +325,7 @@ void Pong::tickBall(long delta) {
             //set score time
             this->score_time = this->last_timestamp;
         }
-        twr_audio_play(this->bounce_noise);
+        twr_audio_play_volume(this->bounce_noise, BALL_BOUNCE_VOL, 0.0);
     }
 }
 void Pong::tickPaddle(long delta) {

examples/pong/two-player-pong.cpp

@@ -336,6 +336,7 @@ T better_abs(T val) {
 }
 
 
+const double BALL_BOUNCE_VOL = 2.0;
 void paddleCollision(Ball& ball, double& n_x, double& n_y, Paddle& paddle, double paddle_x, long bounce_noise){
 
    double paddle_middle = paddle.y + PADDLE_HEIGHT/2.0;
@@ -364,7 +365,7 @@ void paddleCollision(Ball& ball, double& n_x, double& n_y, Paddle& paddle, doubl
          ball.v_y = better_abs(ball.v_y);
       }
 
-      twr_audio_play(bounce_noise);
+      twr_audio_play_volume(bounce_noise, BALL_BOUNCE_VOL, 0.0);
 
       //add paddle velocity to ball
       double paddle_vel = get_paddle_vel(paddle);
@@ -396,15 +397,15 @@ void TwoPlayerPong::updateBall(double delta) {
       //interpolate to add the extra y back in th eopposite direction
       n_y = 0 - n_y;
       this->ball.v_y *= -1;
-      twr_audio_play(this->bounce_noise);
+      twr_audio_play_volume(this->bounce_noise, BALL_BOUNCE_VOL, 0.0);
    } else if (n_y > max_y) {
       //bounce off bottom wall by flipping y direction
       //interpolate to add the extra y back in the opposite direction
 
       //max_y - (n_y - max_y) = max_y + max_y - n_y = 2*max_y - n_y
       n_y = 2*max_y - n_y;
       this->ball.v_y *= -1;
-      twr_audio_play(this->bounce_noise);
+      twr_audio_play_volume(this->bounce_noise, BALL_BOUNCE_VOL, 0.0);
    }
 
    if (n_x < 0) { //hit left

examples/server.py

@@ -10,7 +10,11 @@ def send_my_headers(self):
                 self.send_header("Access-Control-Allow-Origin", "*")
                 self.send_header("Cross-Origin-Embedder-Policy", "require-corp")
                 self.send_header("Cross-Origin-Opener-Policy", "same-origin")
+				# Turn off caching
+				self.send_header("Cache-Control", "no-cache, no-store, must-revalidate")
+				self.send_header("Pragma", "no-cache")
+				self.send_header("Expires", "0")
 
 if __name__ == '__main__':
         server.test(HandlerClass=MyHTTPRequestHandler)
-        
+