Merge pull request #43 from JohnDog3112/dev2

JohnDog3112 · web-flow · commit f0496ba208b1 · 2024-09-28T11:23:25.000-05:00
Minor Changes
diff --git a/examples/pong/index.html b/examples/pong/index.html
@@ -12,7 +12,8 @@
         </script>
     </head>
     <body>
-        <canvas id="twr_d2dcanvas" width="900" height="600"></canvas>
+        <canvas id="twr_d2dcanvas" width="900" height="600"></canvas><br>
+        <a id="control_text"></a>
 
         <script type="module">
             import {twrWasmModule, twrWasmModuleAsync} from "twr-wasm";
diff --git a/examples/pong/jsEventsLib.ts b/examples/pong/jsEventsLib.ts
@@ -10,6 +10,8 @@ export default class jsEventsLib extends twrLibrary {
       registerAnimationLoop: {},
       registerMousePressEvent: {},
       registerMouseMoveEvent: {},
+
+      setElementText: {},
    };
 
    // every library should have this line
@@ -89,6 +91,16 @@ export default class jsEventsLib extends twrLibrary {
       }
    }
 
+   setElementText(mod:IWasmModule|IWasmModuleAsync, elementIDPtr: number, textPtr: number) {
+      const elementID = mod.wasmMem.getString(elementIDPtr);
+      const text = mod.wasmMem.getString(textPtr);
+
+      const element = document.getElementById(elementID)!;
+      if (!element) throw new Error(`setElementText was given an invalid ID (${elementID})`);
+
+      element.innerText = text;
+   }
+
 }
 
 
diff --git a/examples/pong/pong-menu.cpp b/examples/pong/pong-menu.cpp
@@ -199,6 +199,10 @@ const colorRGB_t s_pong_background_color = 0xFFFFFF;
 const colorRGB_t s_pong_paddle_color = 0xFF0000;
 const colorRGB_t s_pong_ball_color = 0x00FF00;
 
+extern "C" {
+   __attribute__((import_name("setElementText")))
+   void set_element_text(const char* element_id, const char* text);
+}
 void Menu::tryButtonPress(long x, long y) {
    this->updateButtonSelections(x, y);
    for (LinkedList<MenuButton>* node = this->buttons.root; node; node = node->next) {
@@ -208,16 +212,19 @@ void Menu::tryButtonPress(long x, long y) {
             case 0:
                this->state = MenuState::SinglePlayerPong;
                this->s_pong = Pong(600, 600, s_pong_border_color, s_pong_background_color, s_pong_paddle_color, s_pong_ball_color);
+               set_element_text("control_text", "Move the paddle using a and d or the left and right arrow keys.");
             break;
 
             case 1:
                this->state = MenuState::TwoPlayerPong;
                this->t_pong = TwoPlayerPong(this->width, this->height, true);
+               set_element_text("control_text", "Move the paddle using w and s or the up and down arrow keys.");
             break;
 
             case 2:
                this->state = MenuState::TwoPlayerPong;
                this->t_pong = TwoPlayerPong(this->width, this->height, false);
+               set_element_text("control_text", "Move the left paddle using w and s. Move the right one with the up and down arrow keys.");
             break;
 
             default:
diff --git a/examples/pong/pong.cpp b/examples/pong/pong.cpp
@@ -16,7 +16,7 @@ void Pong::resetGame() {
     this->paddle_x = this->width/2.0 - this->paddle_width/2.0;
 
     const double start_speed = 200.0/1000.0;
-    double start_dir = rand()%360;
+    double start_dir = rand()%90 - 90;
     double start_dir_rad = start_dir * M_PI/180;
 
     this->ball_velocity_x = start_speed*cos(start_dir_rad);
@@ -44,7 +44,8 @@ Pong::Pong(double width, double height, colorRGB_t border_color, colorRGB_t back
     assert(image_loaded);
     #endif
     //initialized random number generator
-    srand(time(NULL));
+    
+    srand(twr_epoch_timems());
 
     this->resetGame();
 }
diff --git a/examples/pong/two-player-pong.cpp b/examples/pong/two-player-pong.cpp
@@ -33,7 +33,7 @@ TwoPlayerPong::TwoPlayerPong(double width, double height, bool hasAI) {
    this->width = width;
    this->height = height;
    this->hasAI = hasAI;
-   this->bounce_noise = load_square_wave(493.883, 0.025, 48000);
+   this->bounce_noise = load_square_wave(493.883, 0.05, 48000);
    this->score_noise = load_square_wave(440, 0.05, 48000);
    srand(time(NULL));
 
@@ -274,6 +274,10 @@ void TwoPlayerPong::keyDownEvent(long keycode) {
          paddleOne.dir = PaddleDir::DOWN;
       break;
 
+      case KeyCode::enter:
+         if(!this->running)
+            this->resetGame();
+
       default:
       break;
    }
diff --git a/examples/server.py b/examples/server.py
@@ -2,19 +2,19 @@
 from http import server # Python 3
 
 class MyHTTPRequestHandler(server.SimpleHTTPRequestHandler):
-        def end_headers(self):
-                self.send_my_headers()
-                server.SimpleHTTPRequestHandler.end_headers(self)
+   def end_headers(self):
+      self.send_my_headers()
+      server.SimpleHTTPRequestHandler.end_headers(self)
 
-        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")
+   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)
+   server.test(HandlerClass=MyHTTPRequestHandler)
         
