Add 'vive', 'optitrack' to ARMarker.markertype enum

arenaxr · Dec 5, 2023 · b10385d · b10385d
1 parent 1041c07
commit b10385d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/build/schemas/definitions-common.json b/build/schemas/definitions-common.json
@@ -173,9 +173,9 @@
                 },
                 "markertype": {
                     "default": "apriltag_36h11",
-                    "enum": ["apriltag_36h11", "lightanchor", "uwb"],
+                    "enum": ["apriltag_36h11", "lightanchor", "uwb", "vive", "optitrack"],
                     "title": "markertype",
-                    "description": "The marker type (apriltag_36h11, lightanchor, uwb)",
+                    "description": "The marker type (apriltag_36h11, lightanchor, uwb, vive, optitrack)",
                     "type": "string"
                 },
                 "size": {

diff --git a/src/components/object/armarker.js b/src/components/object/armarker.js
@@ -13,7 +13,7 @@
 /**
  * ARMarker Component. Supports ARMarkers in a scene
  * @module armarker
- * @property {string} [markertype=apriltag_36h11] - The marker type. One of 'apriltag_36h11', 'lightanchor', 'uwb'
+ * @property {string} [markertype=apriltag_36h11] - The marker type. One of 'apriltag_36h11', 'lightanchor', 'uwb', 'vive', 'optitrack'
  * @property {boolean} [dynamic=false] - Whether tag is a static and used to for camera relocalization, or dynamic and used for object tracking
  * @property {boolean} [publish=false] - Force publish of tag detections to realm/g/, even without networked solver mode
  * @property {boolean} [buildable=false] - Whether tag has "dynamic" toggled on click. Used to position a tag, then lock into position
@@ -29,8 +29,8 @@ AFRAME.registerComponent('armarker', {
     schema: {
         markertype: {
             default: 'apriltag_36h11',
-            oneOf: ['apriltag_36h11', 'lightanchor', 'uwb'],
-        }, // markertype: apriltag_36h11, lightanchor, uwb
+            oneOf: ['apriltag_36h11', 'lightanchor', 'uwb', 'vive', 'optitrack'],
+        },
         dynamic: {
             default: false,
             type: 'boolean',

diff --git a/src/systems/armarker/armarker.js b/src/systems/armarker/armarker.js
@@ -420,7 +420,7 @@ AFRAME.registerSystem('armarker', {
     },
     /**
      * Get all markers registered with the system
-     * @param {object} mtype - The marker type 'apriltag_36h11', 'lightanchor', 'uwb' to filter for;
+     * @param {object} mtype - The marker type 'apriltag_36h11', 'lightanchor', 'uwb', 'vive', 'optitrack' to filter for;
      *                         No argument or undefined will return all
      * @return {object} - a dictionary of markers
      * @alias module:armarker-system