pd4web 2.1.0.dev5__tar.gz → 2.1.0.dev6__tar.gz

{pd4web-2.1.0.dev5 → pd4web-2.1.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pd4web
-Version: 2.1.0.dev5
+Version: 2.1.0.dev6
 Summary: pd4web compiles PureData patches with external objects for Wasm, allowing to run entire patches in web browsers.
 Home-page: https://charlesneimog.github.io/pd4web
 Author: Charles K. Neimog

{pd4web-2.1.0.dev5 → pd4web-2.1.0.dev6}/Sources/Templates/2/sketch.js

@@ -8,10 +8,6 @@ function preload() {
   handPose = ml5.handPose({ flipped: true });
 }
 
-function mousePressed() {
-  console.log(hands);
-}
-
 function gotHands(results) {
   hands = results;
 }
@@ -38,18 +34,23 @@ function draw() {
     let hand = hands[i];
     for (let j = 0; j < hand.keypoints.length; j++) {
       let keypoint = hand.keypoints[j];
-      let whichHand = hand.handedness;
+      let handLorR = hand.handedness;
       fill(255, 0, 0);
       noStroke();
       circle(keypoint.x, keypoint.y, 5);
-      if (Pd4Web){
+      if (Pd4Web && Pd4Web.sendList && hand.confidence > 0.95) {
         let x = keypoint.x / width;
         let y = keypoint.y / height;
-        // check if sendList is available
-        if (Pd4Web.sendList){
-          Pd4Web.sendList(whichHand[0] + "-" + j, [x, y]);
-        } 
+        if (handLorR == "Left"){
+          let r = "L-" + j;
+          Pd4Web.sendList(r, [x, y]);
+          //console.log(handLorR + "-" + j + " : " + x + ", " + y);
+        } else if (handLorR == "Right"){
+          let r = "R-" + j;
+          Pd4Web.sendList(r, [x, y]);
+          //console.log(handLorR + "-" + j + " : " + x + ", " + y);
+        }
       }
     }
   }
-}
+}

{pd4web-2.1.0.dev5 → pd4web-2.1.0.dev6}/Sources/pd4web/Builder.py

@@ -71,7 +71,17 @@ class GetAndBuildExternals:
         )
         self.cmakeFile.append("include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Pd4Web/pure-data/src)")
         self.cmakeFile.append("add_definitions(-DPDTHREADS)")
-
+        self.cmakeFile.append("")
+        
+        # Debug option
+        self.cmakeFile.append('if(CMAKE_BUILD_TYPE STREQUAL "Debug")')
+        self.cmakeFile.append('    message(WARNING "Building in Debug mode")')
+        self.cmakeFile.append('    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")')
+        self.cmakeFile.append('    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g")')
+        self.cmakeFile.append('else()')
+        self.cmakeFile.append('    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -O3 -flto -pthread -matomics -mbulk-memory -msimd128")')
+        self.cmakeFile.append('    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -flto -pthread -matomics -mbulk-memory -msimd128")')
+        self.cmakeFile.append("endif()")
         self.cmakeFile.append("")
 
         # Pd4web executable
@@ -355,6 +365,10 @@ class GetAndBuildExternals:
         emcmake = self.Pd4Web.Compiler.EMCMAKE
         cmake = self.Pd4Web.Compiler.CMAKE
         ninja = self.Pd4Web.Compiler.NINJA
+        releaseType = "Release"
+        if self.Pd4Web.DEBUG:
+            releaseType = "Debug"
+        
         command = [
             emcmake,
             cmake,
@@ -362,6 +376,7 @@ class GetAndBuildExternals:
             "-B",
             "build",
             "-DPDCMAKE_DIR=Pd4Web/Externals/",
+            "-DCMAKE_BUILD_TYPE=" + releaseType,
             "-G",
             "Ninja",
             f"-DCMAKE_MAKE_PROGRAM={ninja}",

{pd4web-2.1.0.dev5 → pd4web-2.1.0.dev6}/Sources/pd4web/Pd4Web.py

@@ -29,6 +29,7 @@ class Pd4Web:
     SILENCE: bool = False
     PD_VERSION: str = "0.55-0"
     EMSDK_VERSION: str = "3.1.68"
+    DEBUG: bool = False
 
     # Compiler
     MEMORY_SIZE: int = 256
@@ -80,6 +81,7 @@ class Pd4Web:
         self.PD_EXTERNAL = self.Parser.pd_external
         self.BYPASS_UNSUPPORTED = self.Parser.bypass_unsupported
         self.TEMPLATE = self.Parser.template
+        self.DEBUG = self.Parser.debug
 
         self.Execute()
 
@@ -258,11 +260,7 @@ class Pd4Web:
 
         if parser.version:
             pd4web_version = importlib_metadata.version("pd4web")
-            numbers = pd4web_version.split(".")
-            major = numbers[0]
-            minor = numbers[1]
-            patch = numbers[2]
-            print(f"pd4web version {major}.{minor}.{patch}")
+            print(f"pd4web version {pd4web_version}")
             exit()
 
     def action_flags(self, parser):
@@ -330,7 +328,17 @@ class Pd4Web:
             default=1,
             help="Zoom level for the patch (must be a number)",
         )
+        
+        # Debug
+        parser.add_argument(
+            "--debug",
+            required=False,
+            action="store_true",
+            default=False,
+            help="Enable debug mode for the build",
+        )
 
+        # Pure Data
         parser.add_argument(
             "--pd-version",
             required=False,

{pd4web-2.1.0.dev5 → pd4web-2.1.0.dev6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pd4web"
-version = "2.1.0.dev5"
+version = "2.1.0.dev6"
 description = "pd4web compiles PureData patches with external objects for Wasm, allowing to run entire patches in web browsers."
 authors = ["Charles K. Neimog <charlesneimog@outlook.com>"]
 readme = "README.md"