Skip to content

Commit 1fbb0a3

Browse files
kalwaltkalwalt
authored
Merge pull request #419 from AR-js-org/restoring-multimarkers-examples
Restoring multimarkers examples
2 parents 13e6253 + f5ae7eb commit 1fbb0a3

File tree

7 files changed

+21
-54
lines changed

7 files changed

+21
-54
lines changed

‎package-lock.json‎

Lines changed: 10 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎three.js/examples/multi-markers/examples/learner-testrunner.html‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,10 @@
33
<!-- three.js library -->
44
<script src='../../vendor/three.js/build/three.js'></script>
55
<script src='../../vendor/three.js/examples/js/libs/stats.min.js'></script>
6-
<!-- jsartookit -->
7-
<script src='../../../vendor/jsartoolkit5/build/artoolkit.min.js'></script>
8-
<script src='../../../vendor/jsartoolkit5/js/artoolkit.api.js'></script>
9-
<!-- include threex.artoolkit -->
10-
<script src='../../../src/threex/threex-artoolkitsource.js'></script>
11-
<script src='../../../src/threex/threex-artoolkitcontext.js'></script>
12-
<script src='../../../src/threex/threex-artoolkitprofile.js'></script>
13-
<script src='../../../src/threex/threex-arbasecontrols.js'></script>
14-
<script src='../../../src/threex/threex-armarkercontrols.js'></script>
15-
<script src='../../../src/threex/threex-armarkerhelper.js'></script>
16-
<script src='../../../src/threex/threex-arsmoothedcontrols.js'></script>
17-
<script>THREEx.ArToolkitContext.baseURL = '../../../'</script>
186

19-
<script src='../threex-armultimarkerutils.js'></script>
20-
<script src='../threex-armultimarkercontrols.js'></script>
21-
<script src='../threex-armultimarkerlearning.js'></script>
7+
<!-- include ar-threex.js -->
8+
<script src="../../../build/ar-threex.js"></script>
9+
<script>THREEx.ArToolkitContext.baseURL = '../../../'</script>
2210

2311
<style>
2412
#recordButton:hover, #recordStopButton:hover {

‎three.js/examples/multi-markers/examples/learner.html‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,11 @@
33
<!-- three.js library -->
44
<script src='../../vendor/three.js/build/three.js'></script>
55
<script src='../../vendor/three.js/examples/js/libs/stats.min.js'></script>
6-
<!-- jsartookit -->
7-
<script src='../../../vendor/jsartoolkit5/build/artoolkit.min.js'></script>
8-
<script src='../../../vendor/jsartoolkit5/js/artoolkit.api.js'></script>
9-
<!-- include threex.artoolkit -->
10-
<script src='../../../src/threex/threex-artoolkitsource.js'></script>
11-
<script src='../../../src/threex/threex-artoolkitcontext.js'></script>
12-
<script src='../../../src/threex/threex-artoolkitprofile.js'></script>
13-
<script src='../../../src/threex/threex-arbasecontrols.js'></script>
14-
<script src='../../../src/threex/threex-armarkercontrols.js'></script>
15-
<script src='../../../src/threex/threex-armarkerhelper.js'></script>
16-
<script src='../../../src/threex/threex-arsmoothedcontrols.js'></script>
6+
<!-- include ar-threex.js and ar.js -->
7+
<script src="../../../build/ar-threex.js"></script>
8+
<script src="../../../build/ar.js"></script>
179
<script>THREEx.ArToolkitContext.baseURL = '../../../'</script>
1810

19-
<script src='../threex-armultimarkerutils.js'></script>
20-
<script src='../threex-armultimarkercontrols.js'></script>
21-
<script src='../threex-armultimarkerlearning.js'></script>
22-
2311
<style>
2412
#recordButton:hover, #recordStopButton:hover {
2513
cursor: pointer;

‎three.js/examples/multi-markers/examples/player.html‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,12 @@
33
<!-- three.js library -->
44
<script src='../../vendor/three.js/build/three.js'></script>
55
<script src='../../vendor/three.js/examples/js/libs/stats.min.js'></script>
6-
<!-- jsartookit -->
7-
<script src='../../../vendor/jsartoolkit5/build/artoolkit.min.js'></script>
8-
<script src='../../../vendor/jsartoolkit5/js/artoolkit.api.js'></script>
9-
<!-- include threex.artoolkit -->
10-
<script src='../../../src/threex/threex-artoolkitsource.js'></script>
11-
<script src='../../../src/threex/threex-artoolkitcontext.js'></script>
12-
<script src='../../../src/threex/threex-artoolkitprofile.js'></script>
13-
<script src='../../../src/threex/threex-arbasecontrols.js'></script>
14-
<script src='../../../src/threex/threex-armarkercontrols.js'></script>
15-
<script src='../../../src/threex/threex-armarkerhelper.js'></script>
16-
<script src='../../../src/threex/threex-arsmoothedcontrols.js'></script>
6+
<!-- include ar-threex.js and ar.js -->
7+
<script src="../../../build/ar-threex.js"></script>
8+
<script src="../../../build/ar.js"></script>
179
<script>THREEx.ArToolkitContext.baseURL = '../../../'</script>
1810

19-
<script src='../threex-armultimarkerutils.js'></script>
20-
<script src='../threex-armultimarkercontrols.js'></script>
21-
<script src='../threex-armultimarkerlearning.js'></script>
11+
2212

2313
<script src='threex-screenasportal/threex-screenasportal.js'></script>
2414
<script>THREEx.ScreenAsPortal.baseURL = 'threex-screenasportal/'</script>
@@ -244,7 +234,7 @@
244234
arWorldRoot.add(mesh)
245235

246236
// add a torus knot
247-
var geometry = new THREE.CubeGeometry(1,1,1);
237+
var geometry = new THREE.BoxGeometry(1,1,1);
248238
var material = new THREE.MeshNormalMaterial({
249239
transparent : true,
250240
opacity: 0.5,

‎three.js/examples/multi-markers/threex-armultimarkercontrols.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎three.js/examples/multi-markers/threex-armultimarkerlearning.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎three.js/examples/multi-markers/threex-armultimarkerutils.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)