Skip to content

Commit

Permalink
Merge pull request #419 from AR-js-org/restoring-multimarkers-examples
Browse files Browse the repository at this point in the history 
Restoring multimarkers examples
  • Loading branch information
@kalwalt
kalwalt authored Apr 23, 2022
2 parents 13e6253 + f5ae7eb commit 1fbb0a3
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 54 deletions.
16 changes: 10 additions & 6 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 3 additions & 15 deletions three.js/examples/multi-markers/examples/learner-testrunner.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
18 changes: 3 additions & 15 deletions three.js/examples/multi-markers/examples/learner.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
20 changes: 5 additions & 15 deletions three.js/examples/multi-markers/examples/player.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion three.js/examples/multi-markers/threex-armultimarkercontrols.js
View file

This file was deleted.

1 change: 0 additions & 1 deletion three.js/examples/multi-markers/threex-armultimarkerlearning.js
View file

This file was deleted.

1 change: 0 additions & 1 deletion three.js/examples/multi-markers/threex-armultimarkerutils.js
View file

This file was deleted.

0 comments on commit 1fbb0a3

Please sign in to comment.