Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Restoring multimarkers examples #419

Merged
merged 6 commits into from
Apr 23, 2022
Merged

Restoring multimarkers examples #419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c1690a3
changing include libs
kalwalt Mar 20, 2022
2967065
delete symlinks
kalwalt Apr 10, 2022
673385a
Merge branch 'dev' into restoring-multimarkers-examples
kalwalt Apr 10, 2022
d87f773
Merge branch 'dev' into restoring-multimarkers-examples
kalwalt Apr 20, 2022
e5b0d70
Merge branch 'restoring-multimarkers-examples' of https://github.com/…
kalwalt Apr 20, 2022
f5ae7eb
fix minimist security issue
kalwalt Apr 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions package-lock.json
View file
Open in desktop

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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop

This file was deleted.

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

This file was deleted.

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

This file was deleted.