various testing

AR-js-org · Feb 5, 2025 · a1c8e84 · a1c8e84
1 parent 7bfc66c
commit a1c8e84
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 27 deletions.
diff --git a/aframe/src/component-anchor-nft.js b/aframe/src/component-anchor-nft.js
@@ -1,9 +1,7 @@
 import * as AFRAME from 'aframe';
-//import Anchor from '../../three.js/src/new-api/arjs-anchor';
-//import {Anchor} from '@ar-js-org/arjs-core';
 import ARjsCore from '@ar-js-org/arjs-core';
-const { Anchor, AnchorDebugUI, Context} = ARjsCore;
-console.log(Anchor)
+const {Anchor, AnchorDebugUI, Context} = ARjsCore;
+//console.log(Anchor)
 ////////////////////////////////////////////////////////////////////////////////
 //		arjs-anchor
 //////////////////////////////////////////////////////////////////////////////

diff --git a/aframe/src/component-anchor.js b/aframe/src/component-anchor.js
@@ -1,12 +1,6 @@
 import * as AFRAME from 'aframe';
-//import {ARjsCore} from '@ar-js-org/arjs-core';
 import ARjsCore from '@ar-js-org/arjs-core';
-import { log } from 'aframe';
 const {Anchor, AnchorDebugUI, Context} = ARjsCore;
-//import { AnchorDebugUI } from '@ar-js-org/arjs-core';
-//import {ArToolkitContext} from '@ar-js-org/arjs-core';
-
-
 
 //console.log(Anchor)
 
@@ -66,9 +60,6 @@ AFRAME.registerComponent('arjs-anchor', {
     init: function () {
         var _this = this
 
-        console.log(this.el.sceneEl.systems.arjs);
-
-
         // get arjsSystem
         var arjsSystem = this.el.sceneEl.systems.arjs || this.el.sceneEl.systems.artoolkit
 
@@ -107,11 +98,11 @@ AFRAME.registerComponent('arjs-anchor', {
 
             if (_this.data.preset === 'hiro') {
                 markerParameters.type = 'pattern'
-                markerParameters.patternUrl = Context.baseURL + 'examples/marker-training/examples/pattern-files/pattern-hiro.patt'
+                markerParameters.patternUrl = Context.baseURL + 'three.js/examples/marker-training/examples/pattern-files/pattern-hiro.patt'
                 markerParameters.markersAreaEnabled = false
             } else if (_this.data.preset === 'kanji') {
                 markerParameters.type = 'pattern'
-                markerParameters.patternUrl = Context.baseURL + 'examples/marker-training/examples/pattern-files/pattern-kanji.patt'
+                markerParameters.patternUrl = Context.baseURL + 'three.js/examples/marker-training/examples/pattern-files/pattern-kanji.patt'
                 markerParameters.markersAreaEnabled = false
             } else if (_this.data.preset === 'area') {
                 markerParameters.type = 'barcode'
@@ -183,6 +174,8 @@ AFRAME.registerComponent('arjs-anchor', {
         //		honor pose
         //////////////////////////////////////////////////////////////////////////////
         var arWorldRoot = this._arAnchor.object3d
+        //console.log(arWorldRoot);
+
         arWorldRoot.updateMatrixWorld(true)
         //arWorldRoot.matrixWorld.decompose(this.el.object3D.position, this.el.object3D.quaternion, this.el.object3D.scale)
 

diff --git a/aframe/src/index-nft.js b/aframe/src/index-nft.js
@@ -1,9 +1,9 @@
 // Components
 import "./component-anchor-nft";
-import "./component-hit-testing";
+//import "./component-hit-testing";
 
 // Location-based components
-import "./location-based/arjs-look-controls";
+/*import "./location-based/arjs-look-controls";
 import "./location-based/arjs-webcam-texture";
 import "./location-based/ArjsDeviceOrientationControls";
 import "./location-based/gps-camera";
@@ -12,7 +12,7 @@ import "./location-based/gps-projected-camera";
 import "./location-based/gps-projected-entity-place";
 import "./new-location-based/gps-new-camera";
 import "./new-location-based/gps-new-entity-place";
-import "./new-location-based/arjs-device-orientation-controls";
+import "./new-location-based/arjs-device-orientation-controls";*/
 
 // System
 import "./system-arjs-nft";
diff --git a/aframe/src/index.js b/aframe/src/index.js
@@ -1,5 +1,5 @@
 // Components
-//import "./component-anchor";
+import "./component-anchor";
 //import "./component-hit-testing";
 
 // Location-based components

diff --git a/aframe/src/system-arjs-nft.js b/aframe/src/system-arjs-nft.js
@@ -1,7 +1,6 @@
 import * as AFRAME from 'aframe';
-import {Profile} from '@ar-js-org/arjs-core';
-import {Session} from '@ar-js-org/arjs-core';
-import { SessionDebugUI } from '@ar-js-org/arjs-core';
+import ARjsCore from '@ar-js-org/arjs-core';
+const {Profile, Session, SessionDebugUI} = ARjsCore;
 
 AFRAME.registerSystem('arjs', {
     schema: {

diff --git a/aframe/src/system-arjs.js b/aframe/src/system-arjs.js
@@ -1,11 +1,6 @@
 import * as AFRAME from 'aframe';
 import ARjsCore from '@ar-js-org/arjs-core';
 const {Profile, Session, SessionDebugUI} = ARjsCore;
-/*import {Profile} from '@ar-js-org/arjs-core';
-import {Session} from '@ar-js-org/arjs-core';
-import { SessionDebugUI } from '@ar-js-org/arjs-core';*/
-
-console.log(Profile)
 
 AFRAME.registerSystem('arjs', {
     schema: {
@@ -126,6 +121,9 @@ AFRAME.registerSystem('arjs', {
             .performance(this.data.performanceProfile)
             .defaultMarker()
 
+           // console.log(arProfile);
+
+
         //////////////////////////////////////////////////////////////////////////////
         //		honor this.data and setup arProfile with it
         //////////////////////////////////////////////////////////////////////////////
@@ -165,6 +163,8 @@ AFRAME.registerSystem('arjs', {
             var scene = _this.el.sceneEl.object3D
             var camera = _this.el.sceneEl.camera
             var renderer = _this.el.sceneEl.renderer
+            //console.log(renderer);
+
 
             //////////////////////////////////////////////////////////////////////////////
             //		build ARjs.Session
@@ -176,6 +176,8 @@ AFRAME.registerSystem('arjs', {
                 sourceParameters: arProfile.sourceParameters,
                 contextParameters: arProfile.contextParameters
             })
+            //console.log(arSession);
+
 
             //////////////////////////////////////////////////////////////////////////////
             //		Code Separator
@@ -190,6 +192,8 @@ AFRAME.registerSystem('arjs', {
             window.addEventListener('resize', onResize)
             function onResize() {
                 var arSource = _this._arSession.arSource
+                //console.log(arSource);
+
 
                 // ugly kludge to get resize on aframe... not even sure it works
                 if (arProfile.contextParameters.trackingBackend !== 'tango') {