Merge branch 'dev' into improved-canvas-attach

Author: kalwalt

dist/ARFset.js

@@ -15,7 +15,7 @@ <h1>FeatureSET-Display</h1>
         <p>Feature points: light green circles</p>
         <p>FeatureSet3 points: tiny red circles</p>
         <input type="file" id="markerLoader" name="markerLoader" style="display: none;" multiple />
-        <button class="bt" id="uploadBt" onclick="document.getElementById('markerLoader').click();">Upload NFT marker</button>
+        <button class="bt" id="uploadBt" title="select all 3 files: .iset .fset and .fset3" onclick="document.getElementById('markerLoader').click();">Upload NFT marker</button>
     </div>
 
     <script type="text/javascript" src="../dist/ARFset.js"></script>

example/demo.html

@@ -1,6 +1,6 @@
 {
   "name": "@webarkit/featureset-display",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "main": "dist/ARFset.js",
   "description": "FeatureSET Display based on ARToolKit, ported thanks to Emscripten",
   "keywords": [

package.json

@@ -53,7 +53,7 @@ export default class ARFset {
         this.canvas = null;
         this.canvasParent = null;
         this.ctx = null;
-        this.version = '0.2.1';
+        this.version = '0.2.2';
         console.log('FeatureSETDisplay version: ', this.version);
     }