Fixes

kaischroeder · kaischroeder · commit a2c702ff9ccd · 2021-12-15T20:37:04.000+01:00
diff --git a/build_scripts/build_usd.py b/build_scripts/build_usd.py
@@ -868,7 +868,7 @@ def InstallBoost(context, force, buildArgs):
     TBB_URL = "https://github.com/oneapi-src/oneTBB/archive/2018_U6.tar.gz"
 
 # Note: this refers to a fork of tbb for wasm. Is this maintained?
-TBB_EMSCRIPTEN_URL = "https://github.com/hpcwasm/wasmtbb/archive/master.zip"
+TBB_EMSCRIPTEN_URL = "https://github.com/sdunkel/wasmtbb/archive/master.zip"
 
 def InstallTBB(context, force, buildArgs):
     if context.emscripten:
diff --git a/extras/usd/js_bindings/CMakeLists.txt b/extras/usd/js_bindings/CMakeLists.txt
@@ -40,10 +40,37 @@ set(BUILD_FILES
     ${CMAKE_CURRENT_BINARY_DIR}/${BINDINGS_NAME}.js
     ${CMAKE_CURRENT_BINARY_DIR}/${BINDINGS_NAME}.wasm
     ${CMAKE_CURRENT_BINARY_DIR}/${BINDINGS_NAME}.worker.js
+    ${CMAKE_SOURCE_DIR}/js/test.html
 )
 
+install(
+    FILES
+      ${BUILD_FILES}
+    DESTINATION ${CMAKE_BINARY_DIR}/../../bin
+)
+
+# Install files for npm package
 install(
     FILES
       ${BUILD_FILES}
     DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../../../js/bindings/${CMAKE_BUILD_TYPE}
 )
+
+#[[
+# Create ES6 module - TBD
+install(
+    CODE
+    "execute_process(
+        COMMAND
+        ${CMAKE_COMMAND}
+        -DSOURCE_DIR=${CMAKE_SOURCE_DIR}
+        -P
+        ${CMAKE_CURRENT_LIST_DIR}/create_es6_module.cmake
+    )"
+)
+
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/usd.js 
+    DESTINATION ${CMAKE_BINARY_DIR}/../../bin
+)
+]]
diff --git a/extras/usd/js_bindings/create_es6_module.cmake b/extras/usd/js_bindings/create_es6_module.cmake
@@ -0,0 +1,19 @@
+
+set(BINDINGS_NAME "jsBindings")
+
+function(cat IN_FILE OUT_FILE)
+  file(READ ${IN_FILE} CONTENTS)
+  file(APPEND ${OUT_FILE} "${CONTENTS}")
+endfunction()
+
+message(STATUS "SOURCE_DIR: ${SOURCE_DIR}")
+
+set(ES6_MODULE_FILES
+  ${CMAKE_BINARY_DIR}/extras/usd/js_bindings/${BINDINGS_NAME}.js
+  ${SOURCE_DIR}/js/usd-module-appendix.js
+)
+file(WRITE ${CMAKE_BINARY_DIR}/extras/usd/js_bindings/usd.js "")
+
+foreach(ES6_MODULE_FILE ${ES6_MODULE_FILES})
+  cat(${ES6_MODULE_FILE} ${CMAKE_BINARY_DIR}/extras/usd/js_bindings/usd.js)
+endforeach()
diff --git a/js/README.md b/js/README.md
@@ -42,6 +42,12 @@ or in watch mode
 npm run test --  --watch
 ```
 
+After installation you have a *bin* subfolder under your *build* folder. This contains 
+a *test.html* file you can open in a browser. USD-for-Web uses the SharedArrayBuffer
+feature - this requires certain security headers (CORS). 
+If you don't want to worry about this for testing purposes you can run the Chrome browser
+with --enable-features=SharedArrayBuffer as a command line argument.
+
 NPM package consumption
 ------------------------
 
@@ -67,16 +73,17 @@ and after adding `<script src="jsBindings.js"></script>` to your HTML page use i
 ```
     <script src="jsBindings.js"></script>
     <script type="module">
-      import {UsdStage} from './usd.js';
+      const Usd = await usdModule();
+      const UsdStage = Usd.UsdStage;
       let stage = UsdStage.CreateNew('HelloWorld.usda');
     </script>
 ```
 
 In Node.Js you can load it via 
 ```
 const usdModule = require("usd");
-let Usd = await usdModule();
-let UsdStage = Usd.UsdStage;
+const Usd = await usdModule();
+const UsdStage = Usd.UsdStage;
 
 let stage = UsdStage.CreateNew('HelloWorld.usda');
 ...
diff --git a/js/package.json b/js/package.json
@@ -8,8 +8,7 @@
   },
   "scripts": {
     "test": "jest --forceExit",
-    "test-html": "emrun --no_browser test.html",
-    "postinstall": "cp usd.mjs bindings/RelWithDebInfo"
+    "test-html": "emrun --no_browser test.html"
   },
   "jest": {
     "testTimeout": 30000,
diff --git a/js/test.html b/js/test.html
@@ -1,11 +1,10 @@
 <html>
-  <head>
-    <base href="bindings/RelWithDebInfo/">
-  </head>
   <body>
-    <script src="jsBindings.js"></script>
+    <script src='./jsBindings.js'></script>
+    
     <script type="module">
-      import {UsdStage} from './usd.mjs';
+      const Usd = await getUsdModule();
+      const UsdStage = Usd.UsdStage;
 
       let stage = UsdStage.CreateNew('HelloWorld.usda');
       stage.DefinePrim('/hello', 'Xform');
diff --git a/js/usd-module-appendix.js b/js/usd-module-appendix.js
@@ -0,0 +1,5 @@
+
+if (typeof window === 'object') {
+    window.GET_USD_MODULE = getUsdModule;
+}
+  
diff --git a/js/usd.mjs b/js/usd.mjs
diff --git a/pxr/base/arch/timing.cpp b/pxr/base/arch/timing.cpp
@@ -72,6 +72,11 @@ Arch_InitTickTimer()
 {
 }
 
+static
+void
+Arch_ComputeNanosecondsPerTick()
+{
+}
 #elif defined(ARCH_OS_LINUX)
 
 static
@@ -200,6 +205,7 @@ Arch_ComputeNanosecondsPerTick()
 #error Unknown architecture.
 #endif
 
+#if !defined(__EMSCRIPTEN__)
 // A externally visible variable used only to ensure the compiler doesn't do
 // certain optimizations we don't want in order to measure accurate times.
 uint64_t testTimeAccum;
@@ -240,6 +246,7 @@ Arch_InitTickTimer()
         });
     }
 }
+#endif
 
 uint64_t
 ArchGetTickQuantum()
@@ -295,9 +302,13 @@ Arch_MeasureExecutionTime(uint64_t maxMicroseconds, bool *reachedConsensus,
     // Since measured times are +/- 1 quantum, we multiply by 2000 to get the
     // desired runtime, and from there figure number of iterations for a sample.
     const uint64_t minTicksPerSample = 2000 * ArchGetTickQuantum();
+    #if defined(__EMSCRIPTEN__)
+    const int sampleIters = 1; // FIXME
+    #else
     const int sampleIters = (estTicksPer < minTicksPerSample)
         ? (minTicksPerSample + estTicksPer/2) / estTicksPer
-        : 1;
+        : 1;    
+    #endif
 
     auto measureSample = [&measureN, sampleIters]() {
         return (measureN(sampleIters) + sampleIters/2) / sampleIters;
diff --git a/pxr/base/arch/timing.h b/pxr/base/arch/timing.h
@@ -96,7 +96,7 @@ inline uint64_t
 ArchGetStartTickTime()
 {
     uint64_t t;
-#if defined (ARCH_OS_DARWIN)
+#if defined (ARCH_OS_DARWIN) || defined(__EMSCRIPTEN__)
     return ArchGetTickTime();
 #elif defined (ARCH_CPU_ARM)
     std::atomic_signal_fence(std::memory_order_seq_cst);
@@ -137,7 +137,7 @@ inline uint64_t
 ArchGetStopTickTime()
 {
     uint64_t t;
-#if defined (ARCH_OS_DARWIN)
+#if defined (ARCH_OS_DARWIN) || defined(__EMSCRIPTEN__)
     return ArchGetTickTime();
 #elif defined (ARCH_CPU_ARM)
     std::atomic_signal_fence(std::memory_order_seq_cst);

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
++
 +if (typeof window === 'object') {
 +    window.GET_USD_MODULE = getUsdModule;
 +}
++