Merge branch 'dev'

webarkit · Apr 4, 2023 · 412276a · 412276a
2 parents e900b13 + 2f93fe5
commit 412276a
Show file tree

Hide file tree

Showing 55 changed files with 2,164 additions and 958 deletions.
diff --git a/build/artoolkitNFT.debug.js b/build/artoolkitNFT.debug.js
@@ -66035,30 +66035,6 @@ function std____2____stdoutbuf_wchar_t___overflow_28unsigned_20int_29($0, $1) {
  return $0 | 0;
 }
 
-function passVideoData($0, $1, $2) {
- $0 = $0 | 0;
- $1 = $1 | 0;
- $2 = $2 | 0;
- var $3 = 0;
- $3 = __stack_pointer - 32 | 0;
- __stack_pointer = $3;
- HEAP32[$3 + 28 >> 2] = $0;
- if (std____2____hash_iterator_std____2____hash_node_std____2____hash_value_type_int_2c_20arController__2c_20void_____20std____2____hash_table_std____2____hash_value_type_int_2c_20arController__2c_20std____2____unordered_map_hasher_int_2c_20std____2____hash_value_type_int_2c_20arController__2c_20std____2__hash_int__2c_20std____2__equal_to_int__2c_20true__2c_20std____2____unordered_map_equal_int_2c_20std____2____hash_value_type_int_2c_20arController__2c_20std____2__equal_to_int__2c_20std____2__hash_int__2c_20true__2c_20std____2__allocator_std____2____hash_value_type_int_2c_20arController_____find_int__28int_20const__29(77292, $3 + 28 | 0)) {
-  $0 = std____2__unordered_map_int_2c_20arController_2c_20std____2__hash_int__2c_20std____2__equal_to_int__2c_20std____2__allocator_std____2__pair_int_20const_2c_20arController_____operator_5b_5d_28int_20const__29(77292, $3 + 28 | 0);
-  std____2__vector_unsigned_20char_2c_20std____2__allocator_unsigned_20char___20emscripten__convertJSArrayToNumberVector_unsigned_20char__28emscripten__val_20const__29($3 + 16 | 0, $1);
-  std____2__vector_unsigned_20char_2c_20std____2__allocator_unsigned_20char___20emscripten__convertJSArrayToNumberVector_unsigned_20char__28emscripten__val_20const__29($3 + 4 | 0, $2);
-  __memcpy(HEAP32[$0 + 196 >> 2], HEAP32[$3 + 16 >> 2], HEAP32[$0 + 200 >> 2]);
-  __memcpy(HEAP32[$0 + 204 >> 2], HEAP32[$3 + 4 >> 2], HEAP32[$0 + 200 >> 2] >>> 2 | 0);
-  std____2__vector_unsigned_20char_2c_20std____2__allocator_unsigned_20char_____vector_5babi_v15007_5d_28_29($3 + 4 | 0);
-  std____2__vector_unsigned_20char_2c_20std____2__allocator_unsigned_20char_____vector_5babi_v15007_5d_28_29($3 + 16 | 0);
-  $0 = 0;
- } else {
-  $0 = -1;
- }
- __stack_pointer = $3 + 32 | 0;
- return $0 | 0;
-}
-
 function atanf($0) {
  var $1 = 0, $2 = Math_fround(0), $3 = 0, $4 = Math_fround(0), $5 = 0, $6 = Math_fround(0);
  $5 = (wasm2js_scratch_store_f32($0), wasm2js_scratch_load_i32(2));
@@ -66708,6 +66684,30 @@ function std____2____hash_table_std____2____hash_value_type_int_2c_20std____2__s
  return std____2__unique_ptr_std____2____hash_node_base_std____2____hash_node_std____2____hash_value_type_int_2c_20std____2__shared_ptr_vision__Keyframe_96____2c_20void______20_5b_5d_2c_20std____2____bucket_list_deallocator_std____2__allocator_std____2____hash_node_base_std____2____hash_node_std____2____hash_value_type_int_2c_20std____2__shared_ptr_vision__Keyframe_96____2c_20void___________unique_ptr_5babi_v15007_5d_28_29($0);
 }
 
+function passVideoData($0, $1, $2) {
+ $0 = $0 | 0;
+ $1 = $1 | 0;
+ $2 = $2 | 0;
+ var $3 = 0;
+ $3 = __stack_pointer - 32 | 0;
+ __stack_pointer = $3;
+ HEAP32[$3 + 28 >> 2] = $0;
+ if (std____2____hash_iterator_std____2____hash_node_std____2____hash_value_type_int_2c_20arController__2c_20void_____20std____2____hash_table_std____2____hash_value_type_int_2c_20arController__2c_20std____2____unordered_map_hasher_int_2c_20std____2____hash_value_type_int_2c_20arController__2c_20std____2__hash_int__2c_20std____2__equal_to_int__2c_20true__2c_20std____2____unordered_map_equal_int_2c_20std____2____hash_value_type_int_2c_20arController__2c_20std____2__equal_to_int__2c_20std____2__hash_int__2c_20true__2c_20std____2__allocator_std____2____hash_value_type_int_2c_20arController_____find_int__28int_20const__29(77292, $3 + 28 | 0)) {
+  $0 = std____2__unordered_map_int_2c_20arController_2c_20std____2__hash_int__2c_20std____2__equal_to_int__2c_20std____2__allocator_std____2__pair_int_20const_2c_20arController_____operator_5b_5d_28int_20const__29(77292, $3 + 28 | 0);
+  std____2__vector_unsigned_20char_2c_20std____2__allocator_unsigned_20char___20emscripten__convertJSArrayToNumberVector_unsigned_20char__28emscripten__val_20const__29($3 + 16 | 0, $1);
+  std____2__vector_unsigned_20char_2c_20std____2__allocator_unsigned_20char___20emscripten__convertJSArrayToNumberVector_unsigned_20char__28emscripten__val_20const__29($3 + 4 | 0, $2);
+  HEAP32[$0 + 196 >> 2] = HEAP32[$3 + 16 >> 2];
+  HEAP32[$0 + 204 >> 2] = HEAP32[$3 + 4 >> 2];
+  std____2__vector_unsigned_20char_2c_20std____2__allocator_unsigned_20char_____vector_5babi_v15007_5d_28_29($3 + 4 | 0);
+  std____2__vector_unsigned_20char_2c_20std____2__allocator_unsigned_20char_____vector_5babi_v15007_5d_28_29($3 + 16 | 0);
+  $0 = 0;
+ } else {
+  $0 = -1;
+ }
+ __stack_pointer = $3 + 32 | 0;
+ return $0 | 0;
+}
+
 function std____2____stdoutbuf_char___overflow_28int_29($0, $1) {
  $0 = $0 | 0;
  $1 = $1 | 0;
@@ -104248,7 +104248,7 @@ assert(typeof Int32Array != 'undefined' && typeof Float64Array !== 'undefined' &
 // include: runtime_init_memory.js
 // Create the wasm memory. (Note: this only applies if IMPORTED_MEMORY is defined)
 
-var INITIAL_MEMORY = Module['INITIAL_MEMORY'] || 268435456;legacyModuleProp('INITIAL_MEMORY', 'INITIAL_MEMORY');
+var INITIAL_MEMORY = Module['INITIAL_MEMORY'] || 134217728;legacyModuleProp('INITIAL_MEMORY', 'INITIAL_MEMORY');
 
 assert(INITIAL_MEMORY >= 65536, 'INITIAL_MEMORY should be larger than STACK_SIZE, was ' + INITIAL_MEMORY + '! (STACK_SIZE=' + 65536 + ')');
 

diff --git a/build/artoolkitNFT.min.js b/build/artoolkitNFT.min.js
diff --git a/build/artoolkitNFT_ES6_wasm.js b/build/artoolkitNFT_ES6_wasm.js
diff --git a/build/artoolkitNFT_ES6_wasm.simd.js b/build/artoolkitNFT_ES6_wasm.simd.js
diff --git a/build/artoolkitNFT_embed_ES6_wasm.js b/build/artoolkitNFT_embed_ES6_wasm.js
diff --git a/build/artoolkitNFT_wasm.js b/build/artoolkitNFT_wasm.js
diff --git a/build/artoolkitNFT_wasm.simd.js b/build/artoolkitNFT_wasm.simd.js
diff --git a/dist/ARToolkitNFT.js b/dist/ARToolkitNFT.js
diff --git a/dist/ARToolkitNFT_simd.js b/dist/ARToolkitNFT_simd.js
diff --git a/emscripten/ARToolKitJS.cpp b/emscripten/ARToolKitJS.cpp
@@ -129,8 +129,9 @@ extern "C"
     std::vector<uint8_t> vf = emscripten::convertJSArrayToNumberVector<uint8_t>(videoFrame);
     std::vector<uint8_t> vl = emscripten::convertJSArrayToNumberVector<uint8_t>(videoLuma);
 
-    memcpy(arc->videoFrame, vf.data(), sizeof(uint8_t) * arc->videoFrameSize);
-    memcpy(arc->videoLuma, vl.data(), sizeof(uint8_t) * arc->videoFrameSize/4);
+    arc->videoFrame = vf.data();
+    arc->videoLuma = vl.data();
+
     return 0;
   }