Skip to content

Commit

Permalink
testing WebARKitLog
Browse files Browse the repository at this point in the history
  • Loading branch information
kalwalt committed Aug 22, 2023
1 parent 46d8ab5 commit cd27796
Show file tree
Hide file tree
Showing 10 changed files with 41,352 additions and 111,310 deletions.
111,284 changes: 0 additions & 111,284 deletions build/artoolkitNFT.debug.js

This file was deleted.

16 changes: 0 additions & 16 deletions build/artoolkitNFT.min.js

This file was deleted.

7,581 changes: 7,580 additions & 1 deletion build/artoolkitNFT_ES6_wasm.js

Large diffs are not rendered by default.

7,581 changes: 7,580 additions & 1 deletion build/artoolkitNFT_ES6_wasm.simd.js

Large diffs are not rendered by default.

8,761 changes: 8,760 additions & 1 deletion build/artoolkitNFT_embed_ES6_wasm.js

Large diffs are not rendered by default.

8,712 changes: 8,711 additions & 1 deletion build/artoolkitNFT_wasm.js

Large diffs are not rendered by default.

8,712 changes: 8,711 additions & 1 deletion build/artoolkitNFT_wasm.simd.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion emscripten/ARToolKitJS.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ extern "C"
ARLOGw("*** Camera Parameter resized from %d, %d. ***\n", arc->param.xsize,
arc->param.ysize);
WEBARKITLOGi("Test message from WEBARKITLOG...");
WEBARKITLOGe("setCamera(): Error: arParamLTCreate.");
//WEBARKITLOGe("setCamera(): Error: arParamLTCreate.");
arParamChangeSize(&(arc->param), arc->width, arc->height, &(arc->param));
}

Expand Down
2 changes: 1 addition & 1 deletion emscripten/WebARKitLib
11 changes: 8 additions & 3 deletions tools/makem.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ if (!EMSCRIPTEN_ROOT) {

var EMCC = EMSCRIPTEN_ROOT ? path.resolve(EMSCRIPTEN_ROOT, "emcc ") : "emcc ";
var EMPP = EMSCRIPTEN_ROOT ? path.resolve(EMSCRIPTEN_ROOT, "em++ ") : "em++ ";
var OPTIMIZE_FLAGS = " -Oz "; // -Oz for smallest size
var OPTIMIZE_FLAGS = " -O1 "; // -Oz for smallest size
var MEM = 128 * 1024 * 1024; // 64MB

var SOURCE_PATH = path.resolve(__dirname, "../emscripten/") + "/";
Expand Down Expand Up @@ -186,6 +186,11 @@ FLAGS += " --memory-init-file 0"; // for memless file
FLAGS += ' -s EXPORTED_RUNTIME_METHODS=["FS"]';
FLAGS += " -s ALLOW_MEMORY_GROWTH=1";

FLAGS += " -g2 ";
FLAGS += " -s DEMANGLE_SUPPORT=1 ";
FLAGS += " --profiling ";
FLAGS += " -s ASSERTIONS=2 ";

var WASM_FLAGS = " -s SINGLE_FILE=1";
var SIMD128_FLAGS = " -msimd128";
var ES6_FLAGS =
Expand Down Expand Up @@ -443,13 +448,13 @@ function addJob(job) {
addJob(clean_builds);
addJob(compile_arlib);
addJob(compile_simd_arlib);
addJob(compile_combine);
//addJob(compile_combine);
addJob(compile_wasm);
addJob(compile_wasm_embed_ES6);
addJob(compile_simd_wasm);
addJob(compile_wasm_es6);
addJob(compile_simd_wasm_es6);
addJob(compile_combine_min);
//addJob(compile_combine_min);

if (NO_LIBAR == true) {
jobs.splice(1, 2);
Expand Down

0 comments on commit cd27796

Please sign in to comment.