From c1690a3f0187b383cad451526fea5241cff35755 Mon Sep 17 00:00:00 2001
From: kalwalt <github@kalwaltart.it>
Date: Sun, 20 Mar 2022 18:24:11 +0100
Subject: [PATCH 1/3] changing include libs

---
 .../examples/learner-testrunner.html          | 18 +++--------------
 .../multi-markers/examples/learner.html       | 18 +++--------------
 .../multi-markers/examples/player.html        | 20 +++++--------------
 3 files changed, 11 insertions(+), 45 deletions(-)

diff --git a/three.js/examples/multi-markers/examples/learner-testrunner.html b/three.js/examples/multi-markers/examples/learner-testrunner.html
index f7d0b23d..7ca65599 100644
--- a/three.js/examples/multi-markers/examples/learner-testrunner.html
+++ b/three.js/examples/multi-markers/examples/learner-testrunner.html
@@ -3,22 +3,10 @@
 <!-- three.js library -->
 <script src='../../vendor/three.js/build/three.js'></script>
 <script src='../../vendor/three.js/examples/js/libs/stats.min.js'></script>
-<!-- jsartookit -->
-<script src='../../../vendor/jsartoolkit5/build/artoolkit.min.js'></script>
-<script src='../../../vendor/jsartoolkit5/js/artoolkit.api.js'></script>
-<!-- include threex.artoolkit -->
-<script src='../../../src/threex/threex-artoolkitsource.js'></script>
-<script src='../../../src/threex/threex-artoolkitcontext.js'></script>
-<script src='../../../src/threex/threex-artoolkitprofile.js'></script>
-<script src='../../../src/threex/threex-arbasecontrols.js'></script>
-<script src='../../../src/threex/threex-armarkercontrols.js'></script>
-<script src='../../../src/threex/threex-armarkerhelper.js'></script>
-<script src='../../../src/threex/threex-arsmoothedcontrols.js'></script>
-<script>THREEx.ArToolkitContext.baseURL = '../../../'</script>
 
-<script src='../threex-armultimarkerutils.js'></script>
-<script src='../threex-armultimarkercontrols.js'></script>
-<script src='../threex-armultimarkerlearning.js'></script>
+<!-- include ar-threex.js -->
+<script src="../../../build/ar-threex.js"></script>
+<script>THREEx.ArToolkitContext.baseURL = '../../../'</script>
 
 <style>
 	#recordButton:hover, #recordStopButton:hover  {
diff --git a/three.js/examples/multi-markers/examples/learner.html b/three.js/examples/multi-markers/examples/learner.html
index 6260ad09..1d0acf3c 100644
--- a/three.js/examples/multi-markers/examples/learner.html
+++ b/three.js/examples/multi-markers/examples/learner.html
@@ -3,23 +3,11 @@
 <!-- three.js library -->
 <script src='../../vendor/three.js/build/three.js'></script>
 <script src='../../vendor/three.js/examples/js/libs/stats.min.js'></script>
-<!-- jsartookit -->
-<script src='../../../vendor/jsartoolkit5/build/artoolkit.min.js'></script>
-<script src='../../../vendor/jsartoolkit5/js/artoolkit.api.js'></script>
-<!-- include threex.artoolkit -->
-<script src='../../../src/threex/threex-artoolkitsource.js'></script>
-<script src='../../../src/threex/threex-artoolkitcontext.js'></script>
-<script src='../../../src/threex/threex-artoolkitprofile.js'></script>
-<script src='../../../src/threex/threex-arbasecontrols.js'></script>
-<script src='../../../src/threex/threex-armarkercontrols.js'></script>
-<script src='../../../src/threex/threex-armarkerhelper.js'></script>
-<script src='../../../src/threex/threex-arsmoothedcontrols.js'></script>
+<!-- include ar-threex.js and ar.js -->
+<script src="../../../build/ar-threex.js"></script>
+<script src="../../../build/ar.js"></script>
 <script>THREEx.ArToolkitContext.baseURL = '../../../'</script>
 
-<script src='../threex-armultimarkerutils.js'></script>
-<script src='../threex-armultimarkercontrols.js'></script>
-<script src='../threex-armultimarkerlearning.js'></script>
-
 <style>
 	#recordButton:hover, #recordStopButton:hover  {
 		cursor: pointer;
diff --git a/three.js/examples/multi-markers/examples/player.html b/three.js/examples/multi-markers/examples/player.html
index 05afb88e..938cc83c 100644
--- a/three.js/examples/multi-markers/examples/player.html
+++ b/three.js/examples/multi-markers/examples/player.html
@@ -3,22 +3,12 @@
 <!-- three.js library -->
 <script src='../../vendor/three.js/build/three.js'></script>
 <script src='../../vendor/three.js/examples/js/libs/stats.min.js'></script>
-<!-- jsartookit -->
-<script src='../../../vendor/jsartoolkit5/build/artoolkit.min.js'></script>
-<script src='../../../vendor/jsartoolkit5/js/artoolkit.api.js'></script>
-<!-- include threex.artoolkit -->
-<script src='../../../src/threex/threex-artoolkitsource.js'></script>
-<script src='../../../src/threex/threex-artoolkitcontext.js'></script>
-<script src='../../../src/threex/threex-artoolkitprofile.js'></script>
-<script src='../../../src/threex/threex-arbasecontrols.js'></script>
-<script src='../../../src/threex/threex-armarkercontrols.js'></script>
-<script src='../../../src/threex/threex-armarkerhelper.js'></script>
-<script src='../../../src/threex/threex-arsmoothedcontrols.js'></script>
+<!-- include ar-threex.js and ar.js -->
+<script src="../../../build/ar-threex.js"></script>
+<script src="../../../build/ar.js"></script>
 <script>THREEx.ArToolkitContext.baseURL = '../../../'</script>
 
-<script src='../threex-armultimarkerutils.js'></script>
-<script src='../threex-armultimarkercontrols.js'></script>
-<script src='../threex-armultimarkerlearning.js'></script>
+
 
 <script src='threex-screenasportal/threex-screenasportal.js'></script>
 <script>THREEx.ScreenAsPortal.baseURL = 'threex-screenasportal/'</script>
@@ -244,7 +234,7 @@
 		arWorldRoot.add(mesh)
 
 		// add a torus knot
-		var geometry	= new THREE.CubeGeometry(1,1,1);
+		var geometry	= new THREE.BoxGeometry(1,1,1);
 		var material	= new THREE.MeshNormalMaterial({
 			transparent : true,
 			opacity: 0.5,

From 2967065613f622350780ab489a443fd63696fe1f Mon Sep 17 00:00:00 2001
From: kalwalt <info@kalwaltart.it>
Date: Sun, 10 Apr 2022 18:25:40 +0200
Subject: [PATCH 2/3] delete symlinks

---
 three.js/examples/multi-markers/threex-armultimarkercontrols.js | 1 -
 three.js/examples/multi-markers/threex-armultimarkerlearning.js | 1 -
 three.js/examples/multi-markers/threex-armultimarkerutils.js    | 1 -
 3 files changed, 3 deletions(-)
 delete mode 120000 three.js/examples/multi-markers/threex-armultimarkercontrols.js
 delete mode 120000 three.js/examples/multi-markers/threex-armultimarkerlearning.js
 delete mode 120000 three.js/examples/multi-markers/threex-armultimarkerutils.js

diff --git a/three.js/examples/multi-markers/threex-armultimarkercontrols.js b/three.js/examples/multi-markers/threex-armultimarkercontrols.js
deleted file mode 120000
index aaf46047..00000000
--- a/three.js/examples/multi-markers/threex-armultimarkercontrols.js
+++ /dev/null
@@ -1 +0,0 @@
-../../src/markers-area/threex-armultimarkercontrols.js
\ No newline at end of file
diff --git a/three.js/examples/multi-markers/threex-armultimarkerlearning.js b/three.js/examples/multi-markers/threex-armultimarkerlearning.js
deleted file mode 120000
index 602d4ca7..00000000
--- a/three.js/examples/multi-markers/threex-armultimarkerlearning.js
+++ /dev/null
@@ -1 +0,0 @@
-../../src/markers-area/threex-armultimarkerlearning.js
\ No newline at end of file
diff --git a/three.js/examples/multi-markers/threex-armultimarkerutils.js b/three.js/examples/multi-markers/threex-armultimarkerutils.js
deleted file mode 120000
index 786685eb..00000000
--- a/three.js/examples/multi-markers/threex-armultimarkerutils.js
+++ /dev/null
@@ -1 +0,0 @@
-../../src/markers-area/threex-armultimarkerutils.js
\ No newline at end of file

From f5ae7eb5c6c88ee45cb3bcf26a6d79ce8d767bdf Mon Sep 17 00:00:00 2001
From: kalwalt <github@kalwaltart.it>
Date: Wed, 20 Apr 2022 21:52:34 +0200
Subject: [PATCH 3/3] fix minimist security issue

---
 package-lock.json | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 40a82aa4..b1deb17d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1652,9 +1652,9 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
     },
     "node_modules/ms": {
       "version": "2.1.2",
@@ -3077,14 +3077,17 @@
       "dependencies": {
         "debug": {
           "version": "git+ssh://git@github.com/ngokevin/debug.git#ef5f8e66d49ce8bc64c6f282c15f8b7164409e3a",
+          "integrity": "sha512-rUI9wkpSlmwV2QQcE+jDnEdUPyRG+alTguuGlIJHW1PRMycHzpGy24htiAOiBdg6jYFXduQw4JuA1lvKh3DwzA==",
           "from": "debug@github:ngokevin/debug#noTimestamp"
         },
         "document-register-element": {
           "version": "git+ssh://git@github.com/dmarcos/document-register-element.git#8ccc532b7f3744be954574caf3072a5fd260ca90",
+          "integrity": "sha512-dwvGei9I/m1pYQ/9aNODyVmvSWBtlncfIROn5Sbi4MVnIcZKre5QaWx+AGLI/j6VH9sp8jwLyeuWP1micANT0g==",
           "from": "document-register-element@github:dmarcos/document-register-element#8ccc532b7f3744be954574caf3072a5fd260ca90"
         },
         "three-bmfont-text": {
           "version": "git+ssh://git@github.com/dmarcos/three-bmfont-text.git#21d017046216e318362c48abd1a48bddfb6e0733",
+          "integrity": "sha512-lIMa1n+QKNU1f/LZgtS1oUGpoop3MuVXrUr5ybZOUR3+Jk//zjqScnQpHml6MWyvZzL8A5/1Hd8Tsqd3M1kudA==",
           "from": "three-bmfont-text@github:dmarcos/three-bmfont-text#21d017046216e318362c48abd1a48bddfb6e0733",
           "requires": {
             "array-shuffle": "^1.0.1",
@@ -3098,6 +3101,7 @@
         },
         "three-buffer-vertex-data": {
           "version": "git+ssh://git@github.com/dmarcos/three-buffer-vertex-data.git#69378fc58daf27d3b1d930df9f233473e4a4818c",
+          "integrity": "sha512-ZPCCbGfueRzd2/YwH136UnVN+N11Mvxu7uPaEzIdtuk0m5HPs1LGXOM5hOkpxamjvqSC6MDJ3nd11grGi7sMKw==",
           "from": "three-buffer-vertex-data@dmarcos/three-buffer-vertex-data#69378fc58daf27d3b1d930df9f233473e4a4818c",
           "requires": {
             "flatten-vertex-data": "^1.0.0"
@@ -4046,9 +4050,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
     },
     "ms": {
       "version": "2.1.2",