Skip to content

Commit 3a2ea07

Browse files
committed
new libs and fix aframe version in the examples
1 parent efd026b commit 3a2ea07

File tree

36 files changed

+35
-4906
lines changed

36 files changed

+35
-4906
lines changed

aframe/build/aframe-ar-nft.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

aframe/build/aframe-ar.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

aframe/examples/image-tracking/nft-video/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<script src="https://cdn.jsdelivr.net/gh/aframevr/aframe@1c2407b26c61958baa93967b5412487cd94b290b/dist/aframe-master.min.js"></script>
1+
<script src="https://cdn.jsdelivr.net/gh/aframevr/aframe@1.3.0/dist/aframe-master.min.js"></script>
22

33
<!--<script src='https://raw.githack.com/AR-js-org/AR.js/master/aframe/build/aframe-ar.js'></script>-->
44
<script src='../../../../aframe/build/aframe-ar-nft.js'></script>

aframe/examples/image-tracking/nft/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<script src='https://cdn.jsdelivr.net/gh/aframevr/aframe@1c2407b26c61958baa93967b5412487cd94b290b/dist/aframe-master.min.js'></script>
1+
<script src="https://cdn.jsdelivr.net/gh/aframevr/aframe@1.3.0/dist/aframe-master.min.js"></script>
22

33
<style>
44
.arjs-loader {

aframe/examples/location-based/always-face-user/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset='utf-8'>
55
<meta http-equiv='X-UA-Compatible' content='IE=edge'>
66
<title>GeoAR.js demo</title>
7-
<script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
7+
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
88
<script src="https://unpkg.com/[email protected]/dist/aframe-look-at-component.min.js"></script>
99
<script type='text/javascript' src='../../../build/aframe-ar-nft.js'></script>
1010
</head>

aframe/examples/location-based/avoid-shaking/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset='utf-8'>
55
<meta http-equiv='X-UA-Compatible' content='IE=edge'>
66
<title>GeoAR.js demo</title>
7-
<script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
7+
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
88
<script type='text/javascript' src='../../../build/aframe-ar-nft.js'></script>
99
</head>
1010

aframe/examples/location-based/click-places/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html>
33
<head>
44
<title>AR.js Click Places Example</title>
5-
<script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
5+
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
66
<script type='text/javascript' src='../../../build/aframe-ar-nft.js'></script>
77
<script>
88
AFRAME.registerComponent('clicker', {

aframe/examples/location-based/hello-world/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html>
33
<head>
44
<title>AR.js Hello World Example</title>
5-
<script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
5+
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
66
<script type='text/javascript' src='../../../build/aframe-ar-nft.js'></script>
77
</head>
88
<body>

aframe/examples/location-based/max-min-distance/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset='utf-8'>
55
<meta http-equiv='X-UA-Compatible' content='IE=edge'>
66
<title>GeoAR.js demo</title>
7-
<script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
7+
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
88
<script type='text/javascript' src='../../../build/aframe-ar-nft.js'></script>
99
</head>
1010

aframe/examples/location-based/osm-ways/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset='utf-8' />
55
<title>AR.js osm example</title>
6-
<script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
6+
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
77
<script type='text/javascript' src='../../../build/aframe-ar-nft.js'></script>
88
<script type='text/javascript' src='index.js'></script>
99
<script type='text/javascript' src='osm.js'></script>

aframe/examples/location-based/peakfinder-2d/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<html>
22
<head>
33
<title>AR.js Peakfinder (2D - no elevation)</title>
4-
<script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
4+
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
55
<script src="https://unpkg.com/[email protected]/dist/aframe-look-at-component.min.js"></script>
66
<script type='text/javascript' src='../../../build/aframe-ar-nft.js'></script>
77
<script type='text/javascript' src='index.js'></script>

aframe/examples/location-based/places-name/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<meta http-equiv='X-UA-Compatible' content='IE=edge'>
77
<title>GeoAR.js demo</title>
88
<!-- Dynamically add places from Javascript -->
9-
<script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
9+
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
1010
<script type='text/javascript' src='../../../build/aframe-ar-nft.js'></script>
1111
<script type='text/javascript' src='index.js'></script>
1212

aframe/examples/location-based/projected-base-camera/basic/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<html>
44
<head>
55
<title>AR.js Basic Projected Camera Example</title>
6-
<script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
6+
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
77
<script src='../../../../build/aframe-ar-nft.js'></script>
88
</head>
99
<body style='margin: 0; overflow: hidden'>

aframe/examples/location-based/projected-base-camera/way-vectors/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset='utf-8' />
55
<title>AR.js osm example</title>
6-
<script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
6+
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
77
<script src='../../../../build/aframe-ar-nft.js'></script>
88
<script src='bundle.js'></script>
99
<style type='text/css'>

aframe/examples/location-based/show-arbitrary-distant-places/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<head>
55
<meta charset="utf-8" />
66
<title>Use of Video Texture</title>
7-
<script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
7+
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
88
<script type='text/javascript' src='../../../build/aframe-ar-nft.js'></script>
99
</head>
1010

aframe/examples/marker-based/basic.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE html>
22
<html>
3-
<script src="https://aframe.io/releases/1.0.0/aframe.min.js"></script>
3+
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
44
<!-- we import arjs version without NFT but with marker + location based support -->
55
<script src="https://raw.githack.com/AR-js-org/AR.js/dev/aframe/build/aframe-ar.js"></script>
66
<body style="margin : 0px; overflow: hidden;">

aframe/examples/marker-based/marker-camera.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<script src="https://cdn.jsdelivr.net/gh/aframevr/aframe@1c2407b26c61958baa93967b5412487cd94b290b/dist/aframe-master.min.js"></script>
2+
<script src="https://cdn.jsdelivr.net/gh/aframevr/aframe@1.3.0/dist/aframe-master.min.js"></script>
33
<!-- include aframe-ar.js -->
44
<script src="../../build/aframe-ar.js"></script>
55

aframe/examples/marker-based/marker-events.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<script src="https://cdn.jsdelivr.net/gh/aframevr/aframe@1c2407b26c61958baa93967b5412487cd94b290b/dist/aframe-master.min.js"></script>
2+
<script src="https://cdn.jsdelivr.net/gh/aframevr/aframe@1.3.0/dist/aframe-master.min.js"></script>
33
<!-- include aframe-ar.js -->
44
<script src="../../build/aframe-ar.js"></script>
55
<!-- Register an aframe component that allows reacting to marker events -->

aframe/examples/marker-based/minimal.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!-- Augmented Reality on the Web in 10 lines of html! https://github.com/jeromeetienne/ar.js -->
2-
<script src="https://cdn.jsdelivr.net/gh/aframevr/aframe@1c2407b26c61958baa93967b5412487cd94b290b/dist/aframe-master.min.js"></script>
2+
<script src="https://cdn.jsdelivr.net/gh/aframevr/aframe@1.3.0/dist/aframe-master.min.js"></script>
33
<script src="../../build/aframe-ar.js"></script>
44
<body style='margin : 0px; overflow: hidden;'>
55
<a-scene embedded arjs renderer='precision: medium;'>

aframe/examples/marker-based/minimal_ES6.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE html>
22
<html>
3-
<script src="https://aframe.io/releases/1.0.0/aframe.min.js"></script>
3+
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
44
<!-- we import arjs version without NFT but with marker + location based support -->
55
<script src="../../build/aframe-ar.js"></script>
66
<link rel="import" href="../assets/index.css">

aframe/examples/marker-based/multiple-independent-markers.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<script src="https://cdn.jsdelivr.net/gh/aframevr/aframe@1c2407b26c61958baa93967b5412487cd94b290b/dist/aframe-master.min.js"></script>
2+
<<script src="https://cdn.jsdelivr.net/gh/aframevr/aframe@1.3.0/dist/aframe-master.min.js"></script>
33
<!-- include aframe-ar.js -->
44
<script src="../../build/aframe-ar.js"></script>
55

aframe/examples/marker-based/white-region-marker.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<script
2-
src="https://cdn.jsdelivr.net/gh/aframevr/aframe@1c2407b26c61958baa93967b5412487cd94b290b/dist/aframe-master.min.js"></script>
1+
<script src="https://cdn.jsdelivr.net/gh/aframevr/[email protected]/dist/aframe-master.min.js"></script>
32
<script src="../../build/aframe-ar.js"></script>
43

54
<body style='margin : 0px; overflow: hidden;'>

aframe/examples/new-location-based/always-face-user/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<html>
44
<head>
55
<title>AR.js A-Frame</title>
6-
<script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
6+
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
77
<script src="https://unpkg.com/[email protected]/dist/aframe-look-at-component.min.js"></script>
88
<!-- Assumes AR.js build is in the 'AR.js' directory -->
99
<script type='text/javascript' src='../../../../three.js/build/ar-threex-location-only.js'></script>

aframe/examples/new-location-based/avoid-shaking/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html>
33
<head>
44
<title>AR.js A-Frame</title>
5-
<script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
5+
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
66
<!-- Assumes AR.js build is in the 'AR.js' directory -->
77
<script type='text/javascript' src='../../../../three.js/build/ar-threex-location-only.js'></script>
88
<script type='text/javascript' src='../../../build/aframe-ar.js'></script>

aframe/examples/new-location-based/basic-js/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html>
33
<head>
44
<title>AR.js A-Frame</title>
5-
<script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
5+
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
66
<!-- Assumes AR.js build is in the 'AR.js' directory -->
77
<script type='text/javascript' src='../../../../three.js/build/ar-threex-location-only.js'></script>
88
<script type='text/javascript' src='../../../build/aframe-ar.js'></script>

aframe/examples/new-location-based/click-places/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html>
33
<head>
44
<title>AR.js Click Places Example</title>
5-
<script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
5+
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
66
<script type='text/javascript' src='../../../../three.js/build/ar-threex-location-only.js'></script>
77
<script type='text/javascript' src='../../../build/aframe-ar-nft.js'></script>
88
<script>

aframe/examples/new-location-based/hello-world/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<html>
44
<head>
55
<title>AR.js A-Frame</title>
6-
<script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
6+
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
77
<!-- Assumes AR.js build is in the 'AR.js' directory -->
88
<script type='text/javascript' src='../../../../three.js/build/ar-threex-location-only.js'></script>
99
<script type='text/javascript' src='../../../build/aframe-ar.js'></script>

aframe/examples/new-location-based/initial-location-as-origin/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html>
33
<head>
44
<title>AR.js A-Frame</title>
5-
<script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
5+
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
66
<!-- Assumes AR.js build is in the 'AR.js' directory -->
77
<script type='text/javascript' src='../../../../three.js/build/ar-threex-location-only.js'></script>
88
<script type='text/javascript' src='../../../build/aframe-ar.js'></script>

aframe/examples/new-location-based/multiple-boxes/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<html>
44
<head>
55
<title>AR.js A-Frame</title>
6-
<script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
6+
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
77
<!-- Assumes AR.js build is in the 'AR.js' directory -->
88
<script type='text/javascript' src='../../../../three.js/build/ar-threex-location-only.js'></script>
99
<script type='text/javascript' src='../../../build/aframe-ar.js'></script>

aframe/examples/new-location-based/osm-ways/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset='utf-8' />
55
<title>AR.js osm example</title>
6-
<script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
6+
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
77
<!-- Assumes AR.js build is in the 'AR.js' directory -->
88
<script type='text/javascript' src='../../../../three.js/build/ar-threex-location-only.js'></script>
99
<script type='text/javascript' src='../../../build/aframe-ar.js'></script>

aframe/examples/new-location-based/poi-component/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<html>
44
<head>
55
<title>AR.js A-Frame - Points of Interest Example</title>
6-
<script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
6+
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
77
<script type='text/javascript' src='../../../../three.js/build/ar-threex-location-only.js'></script>
88
<script type='text/javascript' src='../../../build/aframe-ar.js'></script>
99
<script type='text/javascript' src='index.js'></script>

aframe/examples/new-location-based/poi/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<html>
44
<head>
55
<title>AR.js A-Frame - Points of Interest Example</title>
6-
<script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
6+
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
77
<script type='text/javascript' src='../../../../three.js/build/ar-threex-location-only.js'></script>
88
<script type='text/javascript' src='../../../build/aframe-ar.js'></script>
99
<script type='text/javascript' src='index.js'></script>

aframe/examples/new-location-based/show-distance/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html>
33
<head>
44
<title>AR.js A-Frame</title>
5-
<script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
5+
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
66
<!-- Assumes AR.js build is in the 'AR.js' directory -->
77
<script type='text/javascript' src='../../../../three.js/build/ar-threex-location-only.js'></script>
88
<script type='text/javascript' src='../../../build/aframe-ar.js'></script>

0 commit comments

Comments
 (0)