Latest features from @ar-js-org fork

.gitignore

@@ -38,3 +38,7 @@ node_modules/
 .cache
 .vscode
 .DS_Store
+
+# other files
+src/artoolkit5/*.bc
+dist/*.LICENSE.txt

README.md

@@ -1,30 +1,32 @@
 
 # artoolkit5-js
 
-ES6 module port of [artoolkit5](https://github.com/artoolkitx/artoolkit5). Based on the (now defunct) original [Emscripten to JavaScript port](github.com/artoolkit/jsartoolkit5) and [improved](https://github.com/kalwalt/jsartoolkit5) by [Walter Perdan](https://github.com/kalwalt).
+This is the artoolkit5-js fork for the AR.js project.
+
+ES6 module port of [artoolkit5](https://github.com/artoolkitx/artoolkit5). Based on the (now defunct) original [Emscripten to JavaScript port](github.com/artoolkitx/jsartoolkit5) and [improved](https://github.com/kalwalt/jsartoolkit5) by [Walter Perdan](https://github.com/kalwalt).
 
 This build is uses WASM for best possible performance and is designed to be (more or less) a drop-in replacement for the previous jsartoolkit5. Some parts of the previous API have been refactored to implement an async interface instead of the previous callback based interface.
 
 ## Installation
 
-Install the module via NPM:
+The **artoolkit5-js** package can be installed via NPM:
 ```
 npm install artoolkit5-js
 ```
 The module is built in UMD format and can be used in different environments:
 
 ### Browser
-```
+```html
 <script src="/path/to/ARToolkit.js"></script>
 ```
 
 ### Node.js
-```
+```js
 const ARToolkit = require('artoolkit5-js');
 ```
 
 ### ES6 Import
-```
+```js
 import ARToolkit from 'artoolkit5-js';
 ```
 
@@ -34,7 +36,7 @@ import ARToolkit from 'artoolkit5-js';
 
 First you need to create an instance of `ARController`:
 
-```
+```js
 ARController.initWithDimensions(640, 480, '/data/camera_para.dat').then(controller => { ... });
 ```
 This will create an ARController instance expecting source images of dimensions 640x480. The second parameter is a camera definition file which describes the characteristics of your image / video input device. If you don't know which file to use just use the default [camera_para.dat](https://github.com/andypotato/artoolkit5-js/blob/master/data/camera_para.dat) included with this repository.
@@ -45,13 +47,13 @@ There is an alternative initializer `initWithImage` available as convenience met
 
 Next you need to load the marker files to track with your controller. In this example the pattern file for the "Hiro" marker is loaded:
 
-```
+```js
 controller.artoolkit.addMarker(controller.id, '/data/hiro.patt').then(hiroMarkerId => { ... });
 ```
 
 ### 3) Start tracking
 
-```
+```js
 // track with 60 FPS
 const FPS = 60;
 
@@ -88,7 +90,7 @@ setInterval(() => {
 ## Other ARToolkit API methods
 
 You can access all public ARToolkit methods and class constants like this:
-```
+```js
   // for the full API documentation see
   // https://github.com/artoolkit/artoolkit5
   artoolkit.detectMarker( ... );
@@ -97,4 +99,4 @@ You can access all public ARToolkit methods and class constants like this:
 ```
 
 ## Current limitations
-Due to time constraints this build does not implement NFT and multimarker support (yet). Adding support for both should be trivial though as all the groundwork has already been laid out. I will implement it once time allows but PRs are of course welcome!
+Due to time constraints this build does not implement multimarker support (yet). Adding support  should be trivial though as all the groundwork has already been laid out. I will implement it once time allows but PRs are of course welcome!

lib/ARBindEM.cpp

@@ -4,6 +4,8 @@ using namespace emscripten;
 
 EMSCRIPTEN_BINDINGS(constant_bindings) {
 
+	register_vector<nftMarker>("nftMarkers");
+
 	function("setup", &setup);
 	function("teardown", &teardown);
 
@@ -35,6 +37,14 @@ EMSCRIPTEN_BINDINGS(constant_bindings) {
 	function("getMultiEachMarker", &getMultiEachMarkerInfo);
 	function("getMarker", &getMarkerInfo);
 	function("getNFTMarker", &getNFTMarkerInfo);
+	function("getNFTData", &getNFTData);
+
+	/* nft marker struct */
+	value_object<nftMarker>("nftMarker")
+	.field("id", &nftMarker::id_NFT)
+	.field("width", &nftMarker::width_NFT)
+	.field("height", &nftMarker::height_NFT)
+	.field("dpi", &nftMarker::dpi_NFT);
 
 
 	/* AR Toolkit C APIS */
@@ -128,6 +138,10 @@ EMSCRIPTEN_BINDINGS(constant_bindings) {
 	constant("AR_MATRIX_CODE_4x4", AR_MATRIX_CODE_4x4 + 0);
 	constant("AR_MATRIX_CODE_4x4_BCH_13_9_3", AR_MATRIX_CODE_4x4_BCH_13_9_3 + 0);
 	constant("AR_MATRIX_CODE_4x4_BCH_13_5_5", AR_MATRIX_CODE_4x4_BCH_13_5_5 + 0);
+	constant("AR_MATRIX_CODE_5x5_BCH_22_12_5", AR_MATRIX_CODE_5x5_BCH_22_12_5 + 0);
+	constant("AR_MATRIX_CODE_5x5_BCH_22_7_7", AR_MATRIX_CODE_5x5_BCH_22_7_7 + 0);
+	constant("AR_MATRIX_CODE_5x5", AR_MATRIX_CODE_5x5 + 0);
+	constant("AR_MATRIX_CODE_6x6", AR_MATRIX_CODE_6x6 + 0);
 
 	constant("AR_LABELING_THRESH_MODE_MANUAL", AR_LABELING_THRESH_MODE_MANUAL + 0);
 	constant("AR_LABELING_THRESH_MODE_AUTO_MEDIAN", AR_LABELING_THRESH_MODE_AUTO_MEDIAN + 0);

lib/ARToolKitJS.cpp

@@ -28,6 +28,12 @@
 
 #define PAGES_MAX               10          // Maximum number of pages expected. You can change this down (to save memory) or up (to accomodate more pages.)
 
+struct nftMarker {
+	int id_NFT;
+	int width_NFT;
+	int height_NFT;
+	int dpi_NFT;
+};
 struct multi_marker {
 	int id;
 	ARMultiMarkerInfoT *multiMarkerHandle;
@@ -60,6 +66,10 @@ struct arController {
 	AR2SurfaceSetT      *surfaceSet[PAGES_MAX];
 	std::unordered_map<int, AR2SurfaceSetT*> surfaceSets;
 
+	// nftMarker struct inside arController
+	nftMarker nft;
+    std::vector<nftMarker> nftMarkers;
+
 	ARdouble nearPlane = 0.0001;
 	ARdouble farPlane = 1000.0;
 
@@ -313,9 +323,30 @@ extern "C" {
 		if ((arc->surfaceSet[surfaceSetCount] = ar2ReadSurfaceSet(datasetPathname, "fset", NULL)) == NULL ) {
 		    ARLOGe("Error reading data from %s.fset\n", datasetPathname);
 		}
-		ARLOGi("  Done.\n");
-
-	if (surfaceSetCount == PAGES_MAX) exit(-1);
+        // int surfaceSetCount = arc->surfaceSetCount;
+        int numIset = arc->surfaceSet[i]->surface[0].imageSet->num;
+        arc->nft.width_NFT =
+                    arc->surfaceSet[i]->surface[0].imageSet->scale[0]->xsize;
+        arc->nft.height_NFT =
+                    arc->surfaceSet[i]->surface[0].imageSet->scale[0]->ysize;
+        arc->nft.dpi_NFT =
+                    arc->surfaceSet[i]->surface[0].imageSet->scale[0]->dpi;
+
+        ARLOGi("NFT num. of ImageSet: %i\n", numIset);
+        ARLOGi("NFT marker width: %i\n", arc->nft.width_NFT);
+        ARLOGi("NFT marker height: %i\n", arc->nft.height_NFT);
+        ARLOGi("NFT marker dpi: %i\n", arc->nft.dpi_NFT);
+
+        arc->nft.id_NFT = i;
+        arc->nft.width_NFT = arc->nft.width_NFT;
+        arc->nft.height_NFT = arc->nft.height_NFT;
+        arc->nft.dpi_NFT = arc->nft.dpi_NFT;
+        arc->nftMarkers.push_back(arc->nft);
+
+        ARLOGi("  Done.\n");
+
+        if (surfaceSetCount == PAGES_MAX)
+            exit(-1);
 
 		if (kpmSetRefDataSet(kpmHandle, refDataSet) < 0) {
 		    ARLOGe("Error: kpmSetRefDataSet\n");
@@ -327,6 +358,13 @@ extern "C" {
 		return (TRUE);
 	}
 
+	nftMarker getNFTData(int id, int index) {
+		if (arControllers.find(id) == arControllers.end()) { return {}; }
+		arController *arc = &(arControllers[id]);
+		// get marker(s) nft data.
+		return arc->nftMarkers.at(index);
+	}
+
 	/***************
 	 * Set Log Level
 	 ****************/
@@ -902,12 +940,11 @@ extern "C" {
 		arController *arc = &(arControllers[id]);
 
 		// Convert video frame to AR2VideoBufferT
-    AR2VideoBufferT buff = {0};
-    buff.buff = arc->videoFrame;
-    buff.fillFlag = 1;
-
-    buff.buffLuma = arc->videoLuma;
+        AR2VideoBufferT buff = {0};
+        buff.buff = arc->videoFrame;
+        buff.fillFlag = 1;
 
+        buff.buffLuma = arc->videoLuma;
 
 		return arDetectMarker( arc->arhandle, &buff);
 	}