adding pthreads also in the bytecode libs

Author: kalwalt

build/artoolkitNft.debug.js

@@ -112,6 +112,10 @@ extern "C" {
 				//ftmi = arFilterTransMatInit(filterSampleRate, filterCutoffFrequency);
 				if (arc->threadHandle) {
 				int              ret;
+				if( arc->detectedPage == -2 ) {
+						trackingInitStart( arc->threadHandle, arc->videoLuma );
+						arc->detectedPage = -1;
+				}
 				if( arc->detectedPage == -1 ) {
 					//ARLOGi("arc->detectedPage: %d \n",  arc->detectedPage);
 					ret = trackingInitGetResult( arc->threadHandle, trackingTrans, &pageNo);
@@ -126,25 +130,25 @@ extern "C" {
 										arc->detectedPage = -2;
 								}
 						} else if( ret < 0 ) {
-								ARLOGd("No page detected.\n");
+								ARLOGi("No page detected.\n");
 								arc->detectedPage = -2;
 						}
 				}
 				if( arc->detectedPage >= 0 && arc->detectedPage < arc->surfaceSetCount) {
 					if( ar2Tracking(arc->ar2Handle, arc->surfaceSet[pageNo], arc->videoLuma, trackingTrans, &err) < 0 ) {
-						ARLOGd("Tracking lost.\n");
+						ARLOGi("Tracking lost.\n");
 						arc->detectedPage = -2;
 				} else {
-						ARLOGd("Tracked page %d (max %d).\n", arc->detectedPage, arc->surfaceSetCount - 1);
+						ARLOGi("Tracked page %d (max %d).\n", arc->detectedPage, arc->surfaceSetCount - 1);
 				}
 		}
 	} else {
 		ARLOGe("Error: threadHandle\n");
 		arc->detectedPage = -2;
 	}
 
-        //if (pageNo >= 0 && pageNo == arc->detectedPage) {
-					if (arc->detectedPage > -1) {
+        if (arc->detectedPage >= 0 && arc->detectedPage < arc->surfaceSetCount ) {
+					//if (arc->detectedPage > -1) {
             for (j = 0; j < 3; j++) {
             	for (k = 0; k < 4; k++) {
             		trans[j][k] = trackingTrans[j][k];
@@ -251,7 +255,7 @@ extern "C" {
 
         //kpmMatching( arc->kpmHandle, arc->videoLuma );
         //kpmGetResult( arc->kpmHandle, &kpmResult, &kpmResultNum );
-				if (arc->threadHandle) {
+				/*if (arc->threadHandle) {
             // Perform NFT tracking.
             float            err;
             int              ret;
@@ -261,7 +265,7 @@ extern "C" {
                 trackingInitStart( arc->threadHandle, arc->videoLuma );
                 arc->detectedPage = -1;
             }
-					}
+					}*/
         return kpmResultNum;
 	}
 

build/artoolkitNft.min.js

@@ -27,11 +27,11 @@ <h1>NFT marker example with Three.js</h1>
 
 <p>&larr; <a href="index.html">Back to examples</a></p>
 
-<script async src="../build/artoolkitNft.min.js"></script>
-<!--<script src="../build/artoolkitNft.debug.js"></script>
-<script src="../js/artoolkit.api.js"></script>-->
-<script async src="js/third_party/three.js/three.min.js"></script>
-<script async src="../js/artoolkit.three.js"></script>
+<script src="../build/artoolkitNft.min.js"></script>
+<!--<script async src="../build/artoolkitNft.debug.js"></script>
+<script async src="../js/artoolkit.api.js"></script>-->
+<script src="js/third_party/three.js/three.min.js"></script>
+<script src="../js/artoolkit.three.js"></script>
 
 <script>
 

build/artoolkitNft_wasm.js

@@ -23,7 +23,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 = ' -O2 '; // -Oz for smallest size
+var OPTIMIZE_FLAGS = ' -Oz '; // -Oz for smallest size
 var MEM = 256 * 1024 * 1024; // 64MB
 
 
@@ -122,7 +122,9 @@ FLAGS += ' -s USE_ZLIB=1';
 FLAGS += ' --memory-init-file 0 '; // for memless file
 FLAGS += ' -s BINARYEN_TRAP_MODE=clamp'
 
-var CFLAGS = ' -Wimplicit-function-declaration -DHAVE_NFT=1 -s USE_PTHREADS=1'
+var CFLAGS = ' -Wimplicit-function-declaration -DHAVE_NFT=1';
+
+var PTHREADS = ' -s USE_PTHREADS=1 ';
 
 var PRE_FLAGS = ' --pre-js ' + path.resolve(__dirname, '../js/artoolkit.api.js') +' ';
 
@@ -196,17 +198,17 @@ function clean_builds() {
 
 var compile_arlib = format(EMCC + ' ' + INCLUDES + ' '
 	+ ar_sources.join(' ')
-	+ FLAGS + ' ' + DEFINES + ' -o {OUTPUT_PATH}libar.bc ',
+	+ FLAGS + ' ' + DEFINES + PTHREADS + ' -o {OUTPUT_PATH}libar.bc ',
 		OUTPUT_PATH);
 
  var compile_kpm = format(EMCC + ' ' + INCLUDES + ' '
  	+ kpm_sources.join(' ')
- 	+ FLAGS + ' ' + DEFINES + ' -o {OUTPUT_PATH}libkpm.bc ',
+ 	+ FLAGS + ' ' + DEFINES + PTHREADS + ' -o {OUTPUT_PATH}libkpm.bc ',
  		OUTPUT_PATH);
 
 var compile_libjpeg = format(EMCC + ' ' + INCLUDES + ' '
     + path.resolve(__dirname, LIBJPEG_ROOT) + '/' + libjpeg_sources
-	+ FLAGS + ' ' + DEFINES + ' -o {OUTPUT_PATH}libjpeg.bc ',
+	+ FLAGS + ' ' + DEFINES + PTHREADS + ' -o {OUTPUT_PATH}libjpeg.bc ',
 		OUTPUT_PATH);
 
 /*
@@ -233,7 +235,7 @@ var compile_combine_min = format(EMCC + ' ' + INCLUDES + ' '
 */
 var compile_combine_min = format(EMCC + ' ' + INCLUDES + ' '
 	+ ' {OUTPUT_PATH}*.bc ' + MAIN_SOURCES
-	+ FLAGS + ' -s WASM=0' + ' ' + DEFINES + PRE_FLAGS + CFLAGS + ' -o {OUTPUT_PATH}{BUILD_FILE} ',
+	+ FLAGS + ' -s WASM=0' + ' ' + DEFINES + PRE_FLAGS + CFLAGS + PTHREADS + ' -o {OUTPUT_PATH}{BUILD_FILE} ',
 	OUTPUT_PATH, OUTPUT_PATH, BUILD_MIN_FILE);
 
 var compile_wasm = format(EMCC + ' ' + INCLUDES + ' '