Removing nft version in the build libs

.github/workflows/CI.yml

@@ -0,0 +1,35 @@
+name: CI
+on:
+  - push
+  - pull_request
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+
+  tests:
+    strategy:
+      matrix:
+        node:
+          - 14.x
+
+    runs-on: ubuntu-20.04
+    name: Node.js ${{ matrix.node }}
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Use Node.js ${{ matrix.node }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node }}
+      - uses: actions/cache@v2
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-
+      - name: Npm update
+        run: npm update
+      - name: Npm install
+        run: npm install
+      - name: Tests
+        run: npm run format-check

.husky/.gitignore

@@ -0,0 +1 @@
+_

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx lint-staged

.prettierc.json

@@ -0,0 +1,7 @@
+{
+  "trailingComma": "es5",
+  "tabWidth": 4,
+  "printWidth": 120,
+  "semi": true,
+  "singleQuote": false
+}

.prettierignore

@@ -0,0 +1,16 @@
+.github/workflows/CI.yml
+data/**
+node_modules/**
+test/**
+aframe/examples/**
+aframe/build/*.js
+aframe/src/component-anchor.js
+aframe/src/component-anchor-nft.js
+aframe/src/system-arjs.js
+aframe/src/system-arjs-nft.js
+aframe/src/location-based/stylesheets/*.css
+three.js/examples/**
+three.js/build/*.js
+three.js/src/location-based/README.md
+*.md
+webpack.config.js

README.md

@@ -2,7 +2,8 @@
 # AR.js - Augmented Reality on the Web
 
 
-[![Build Status](https://travis-ci.org/jeromeetienne/AR.js.svg?branch=master)](https://travis-ci.org/jeromeetienne/AR.js)
+[![CI](https://github.com/AR-js-org/AR.js/actions/workflows/CI.yml/badge.svg)](https://github.com/AR-js-org/AR.js/actions/workflows/CI.yml)
+[![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
 [![Gitter chat](https://badges.gitter.im/AR-js/Lobby.png)](https://gitter.im/AR-js/Lobby)
 [![Twitter Follow](https://img.shields.io/twitter/follow/nicolocarp.svg?style=plastic&label=nicolocarpignoli-twitter&style=plastic)](https://twitter.com/nicolocarp)
 [![Twitter Follow](https://img.shields.io/twitter/follow/jerome_etienne.svg?style=plastic&label=jeromeetienne-twitter&style=plastic)](https://twitter.com/jerome_etienne)
@@ -32,21 +33,30 @@ If you want to give a first look at AR.js potential, you can continue with this
 -----
 
 
-⚡️ AR.js is coming in two, different builds. They are both maintained. They are exclusive.
+⚡️ AR.js is coming in different builds. They are both maintained. They are exclusive.
 
 Please import the one you need for your project, not both:
 
-- **AR.js with Image Tracking + Location Based AR:**
+- **AR.js with Image Tracking + Location Based AR (AFRAME):**
 
-  - AFRAME version: https://raw.githack.com/AR-js-org/AR.js/master/aframe/build/aframe-ar-nft.js
+  - https://raw.githack.com/AR-js-org/AR.js/master/aframe/build/aframe-ar-nft.js
 
-  - three.js version: https://raw.githack.com/AR-js-org/AR.js/master/three.js/build/ar-nft.js
+- **AR.js with Marker Tracking + Location Based AR (AFRAME):**
 
-- **AR.js with Marker Tracking + Location Based AR:**
+  - https://raw.githack.com/AR-js-org/AR.js/master/aframe/build/aframe-ar.js
 
-  - AFRAME version: https://raw.githack.com/AR-js-org/AR.js/master/aframe/build/aframe-ar.js
 
-  - three.js version: https://raw.githack.com/AR-js-org/AR.js/master/three.js/build/ar.js
+- **AR.js with Image Tracking + Marker Tracking (Threejs):**
+
+  - https://raw.githack.com/AR-js-org/AR.js/master/three.js/build/ar-threex.js
+
+  if you need the ARjs namespace import ar.js:
+
+  - https://raw.githack.com/AR-js-org/AR.js/master/three.js/build/ar.js
+
+- **AR.js with Location Based AR (Threejs):**
+
+  - https://raw.githack.com/AR-js-org/AR.js/master/three.js/build/ar-threex-location-only.js
 
 
 You can also import a specific version replacing `master` keyword with version tag:

aframe/examples/image-tracking/nft-video/index.html

@@ -1,6 +1,7 @@
 <script src="https://cdn.jsdelivr.net/gh/aframevr/aframe@1c2407b26c61958baa93967b5412487cd94b290b/dist/aframe-master.min.js"></script>
 
-<script src='https://raw.githack.com/AR-js-org/AR.js/ES6/aframe/build/aframe-ar-nft.js'></script>
+<!--<script src='https://raw.githack.com/AR-js-org/AR.js/master/aframe/build/aframe-ar.js'></script>-->
+<script src='../../../../aframe/build/aframe-ar-nft.js'></script>
 
 <script>
     window.onload = function() {

aframe/examples/image-tracking/nft/index.html

@@ -22,7 +22,9 @@
 </style>
 
 <!-- rawgithack development URL -->
-<script src='https://raw.githack.com/AR-js-org/AR.js/ES6/aframe/build/aframe-ar-nft.js'></script>
+<!--<script src='https://raw.githack.com/AR-js-org/AR.js/master/aframe/build/aframe-ar.js'></script>-->
+<script src='../../../../aframe/build/aframe-ar-nft.js'></script>
+
 
 <body style='margin : 0px; overflow: hidden;'>
    <!-- minimal loader shown until image descriptors are loaded -->

aframe/src/component-anchor-nft.js

@@ -1,7 +1,7 @@
 import * as AFRAME from 'aframe';
 import Anchor from '../../three.js/src/new-api/arjs-anchor';
 import { AnchorDebugUI } from '../../three.js/src/new-api/arjs-debugui';
-import ArToolkitContext from '../../three.js/src/threex/arjs-context-nft';
+import ArToolkitContext from '../../three.js/src/threex/arjs-context';
 
 ////////////////////////////////////////////////////////////////////////////////
 //		arjs-anchor

aframe/src/component-anchor.js

@@ -3,7 +3,7 @@ import Anchor from '../../three.js/src/new-api/arjs-anchor';
 import { AnchorDebugUI } from '../../three.js/src/new-api/arjs-debugui';
 import ArToolkitContext from '../../three.js/src/threex/arjs-context';
 
-// //////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
 //		arjs-anchor
 //////////////////////////////////////////////////////////////////////////////
 AFRAME.registerComponent('arjs-anchor', {
@@ -119,7 +119,7 @@ AFRAME.registerComponent('arjs-anchor', {
                 markerParameters.patternUrl = _this.data.patternUrl;
                 markerParameters.markersAreaEnabled = false
             }
-            
+
             markerParameters.minConfidence = _this.data.minConfidence;
             markerParameters.smooth = _this.data.smooth;
             markerParameters.smoothCount = _this.data.smoothCount;
@@ -234,7 +234,7 @@ AFRAME.registerPrimitive('a-camera-static', AFRAME.utils.extendDeep({}, AFRAME.p
 //////////////////////////////////////////////////////////////////////////////
 //		backward compatibility
 //////////////////////////////////////////////////////////////////////////////
-// FIXME
+
 AFRAME.registerPrimitive('a-marker', AFRAME.utils.extendDeep({}, AFRAME.primitives.getMeshMixin(), {
     defaultComponents: {
         'arjs-anchor': {},

aframe/src/component-hit-testing.js

@@ -1,74 +1,78 @@
-import * as AFRAME from 'aframe';
-import HitTesting from '../../three.js/src/new-api/arjs-hittesting';
+import * as AFRAME from "aframe";
+import HitTesting from "../../three.js/src/new-api/arjs-hittesting";
 
 // //////////////////////////////////////////////////////////////////////////////
 //		arjs-hit-testing
 //////////////////////////////////////////////////////////////////////////////
-AFRAME.registerComponent('arjs-hit-testing', {
-	dependencies: ['arjs', 'artoolkit'],
-	schema: {
-		enabled : {
-			type: 'boolean',
-			default: false,
-		},
-		renderDebug : {
-			type: 'boolean',
-			default: false,
-		},
-	},
-	init: function () {
-		var _this = this
-		var arjsSystem = this.el.sceneEl.systems.arjs || this.el.sceneEl.systems.artoolkit
+AFRAME.registerComponent("arjs-hit-testing", {
+  dependencies: ["arjs", "artoolkit"],
+  schema: {
+    enabled: {
+      type: "boolean",
+      default: false,
+    },
+    renderDebug: {
+      type: "boolean",
+      default: false,
+    },
+  },
+  init: function () {
+    var _this = this;
+    var arjsSystem =
+      this.el.sceneEl.systems.arjs || this.el.sceneEl.systems.artoolkit;
 
-// TODO make it work on cameraTransformMatrix too
-//
-		_this.isReady = false
-		_this._arAnchor = null
-		_this._arHitTesting = null
+    // TODO make it work on cameraTransformMatrix too
+    //
+    _this.isReady = false;
+    _this._arAnchor = null;
+    _this._arHitTesting = null;
 
-		// trick to wait until arjsSystem is isReady
-		var startedAt = Date.now()
-		var timerId = setInterval(function(){
-			var anchorEl = _this.el
-			var anchorComponent = anchorEl.components['arjs-anchor']
-			// wait until anchorComponent is isReady
-			if( anchorComponent === undefined || anchorComponent.isReady === false )	return
+    // trick to wait until arjsSystem is isReady
+    var startedAt = Date.now();
+    var timerId = setInterval(function () {
+      var anchorEl = _this.el;
+      var anchorComponent = anchorEl.components["arjs-anchor"];
+      // wait until anchorComponent is isReady
+      if (anchorComponent === undefined || anchorComponent.isReady === false)
+        return;
 
-			clearInterval(timerId)
+      clearInterval(timerId);
 
-			//////////////////////////////////////////////////////////////////////////////
-			//		create arAnchor
-			//////////////////////////////////////////////////////////////////////////////
-			var arAnchor = anchorComponent._arAnchor
-			var arSession = arjsSystem._arSession
-			var renderer = arSession.parameters.renderer
+      //////////////////////////////////////////////////////////////////////////////
+      //		create arAnchor
+      //////////////////////////////////////////////////////////////////////////////
+      var arAnchor = anchorComponent._arAnchor;
+      var arSession = arjsSystem._arSession;
+      var renderer = arSession.parameters.renderer;
 
-			var hitTesting = _this._arHitTesting = new HitTesting(arSession)
-			hitTesting.enabled = _this.data.enabled
+      var hitTesting = (_this._arHitTesting = new HitTesting(arSession));
+      hitTesting.enabled = _this.data.enabled;
 
-			_this.isReady = true
-		}, 1000/60)
-	},
-	remove : function(){
-	},
-	update: function () {
-	},
-	tick: function(){
-		var _this = this
-		// if not yet isReady, do nothing
-		if( this.isReady === false )	return
+      _this.isReady = true;
+    }, 1000 / 60);
+  },
+  remove: function () {},
+  update: function () {},
+  tick: function () {
+    var _this = this;
+    // if not yet isReady, do nothing
+    if (this.isReady === false) return;
 
-		var arjsSystem = this.el.sceneEl.systems.arjs || this.el.sceneEl.systems.artoolkit
-		var arSession = arjsSystem._arSession
+    var arjsSystem =
+      this.el.sceneEl.systems.arjs || this.el.sceneEl.systems.artoolkit;
+    var arSession = arjsSystem._arSession;
 
-		var anchorEl = _this.el
-		var anchorComponent = anchorEl.components['arjs-anchor']
-		var arAnchor = anchorComponent._arAnchor
+    var anchorEl = _this.el;
+    var anchorComponent = anchorEl.components["arjs-anchor"];
+    var arAnchor = anchorComponent._arAnchor;
 
-
-		var hitTesting = this._arHitTesting
-		var camera = arSession.parameters.camera
-// console.log(camera.position)
-		hitTesting.update(camera, arAnchor.object3d, arAnchor.parameters.changeMatrixMode)
-	}
+    var hitTesting = this._arHitTesting;
+    var camera = arSession.parameters.camera;
+    // console.log(camera.position)
+    hitTesting.update(
+      camera,
+      arAnchor.object3d,
+      arAnchor.parameters.changeMatrixMode
+    );
+  },
 });

aframe/src/index-nft.js

@@ -1,15 +1,15 @@
 // Components
-import './component-anchor-nft';
-import './component-hit-testing';
+import "./component-anchor-nft";
+import "./component-hit-testing";
 
 // Location-based components
-import './location-based/arjs-look-controls'
-import './location-based/arjs-webcam-texture'
-import './location-based/ArjsDeviceOrientationControls'
-import './location-based/gps-camera'
-import './location-based/gps-entity-place'
-import './location-based/gps-projected-camera'
-import './location-based/gps-projected-entity-place'
+import "./location-based/arjs-look-controls";
+import "./location-based/arjs-webcam-texture";
+import "./location-based/ArjsDeviceOrientationControls";
+import "./location-based/gps-camera";
+import "./location-based/gps-entity-place";
+import "./location-based/gps-projected-camera";
+import "./location-based/gps-projected-entity-place";
 
 // System
-import './system-arjs';
+import "./system-arjs-nft";

aframe/src/index.js

@@ -1,15 +1,15 @@
 // Components
-import './component-anchor';
-import './component-hit-testing';
+import "./component-anchor";
+import "./component-hit-testing";
 
 // Location-based components
-import './location-based/arjs-look-controls'
-import './location-based/arjs-webcam-texture'
-import './location-based/ArjsDeviceOrientationControls'
-import './location-based/gps-camera'
-import './location-based/gps-entity-place'
-import './location-based/gps-projected-camera'
-import './location-based/gps-projected-entity-place'
+import "./location-based/arjs-look-controls";
+import "./location-based/arjs-webcam-texture";
+import "./location-based/ArjsDeviceOrientationControls";
+import "./location-based/gps-camera";
+import "./location-based/gps-entity-place";
+import "./location-based/gps-projected-camera";
+import "./location-based/gps-projected-entity-place";
 
 // System
-import './system-arjs';
+import "./system-arjs";