Skip to content

Commit 55cc8ef

Browse files
nicolocarpignolinicolocarpignoli
authored
Merge pull request #39 from AR-js-org/autoplay
Autoplay
2 parents 9f568d5 + 12d232e commit 55cc8ef

File tree

7 files changed

+38
-19147
lines changed

7 files changed

+38
-19147
lines changed

‎dist/arjs-studio-backend.js‎

Lines changed: 0 additions & 19107 deletions
This file was deleted.

‎dist/arjs-studio-backend.js.map‎

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

‎dist/arjs-studio-backend.min.js‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎dist/arjs-studio-backend.min.js.map‎

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

‎src/modules/location/templates/location.audio.handlebars‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
response-type="arraybuffer"
2222
></a-asset-item>
2323
</a-assets>
24-
24+
2525
{{#each assetParam.locations}}
2626
<a-entity
2727
look-at="[gps-camera]"

‎src/modules/marker/templates/pattern.audio.handlebars‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,24 @@
33
<head>
44
<script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
55
<script src="https://raw.githack.com/AR-js-org/AR.js/master/aframe/build/aframe-ar.js"></script>
6+
<script>
7+
AFRAME.registerComponent('audiohandler', {
8+
init: function () {
9+
var marker = this.el;
10+
this.vid = document.querySelector("#vid");
11+
12+
marker.addEventListener('markerFound', () => {
13+
this.toggle = true;
14+
this.vid.play();
15+
}.bind(this));
16+
17+
marker.addEventListener('markerLost', () => {
18+
this.toggle = false;
19+
this.vid.pause();
20+
}.bind(this));
21+
},
22+
});
23+
</script>
624
</head>
725

826
<body style="margin: 0; overflow: hidden;">
@@ -29,6 +47,7 @@
2947
></a-marker>
3048

3149
<a-entity
50+
audiohandler
3251
id="sound-entity"
3352
sound="src: #sound"
3453
autoplay="false"

‎src/modules/marker/templates/pattern.video.handlebars‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,24 @@
55
<script src="https://raw.githack.com/AR-js-org/AR.js/master/aframe/build/aframe-ar.js"></script>
66
<script src="https://raw.githack.com/AR-js-org/studio-backend/master/src/modules/marker/tools/gesture-detector.js"></script>
77
<script src="https://raw.githack.com/AR-js-org/studio-backend/master/src/modules/marker/tools/gesture-handler.js"></script>
8+
<script>
9+
AFRAME.registerComponent('videohandler', {
10+
init: function () {
11+
var marker = this.el;
12+
this.vid = document.querySelector("#vid");
13+
14+
marker.addEventListener('markerFound', () => {
15+
this.toggle = true;
16+
this.vid.play();
17+
}.bind(this));
18+
19+
marker.addEventListener('markerLost', () => {
20+
this.toggle = false;
21+
this.vid.pause();
22+
}.bind(this));
23+
},
24+
});
25+
</script>
826
</head>
927

1028
<body style="margin: 0; overflow: hidden;">

0 commit comments

Comments
 (0)