Skip to content

Commit 7d6eccb

Browse files
Merge branch 'master' of github.com:AR-js-org/studio-backend
2 parents 055a72d + 93a1c2f commit 7d6eccb

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

dist/arjs-studio-backend.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2098,7 +2098,7 @@ module.exports = (Handlebars["default"] || Handlebars).template({"compiler":[8,"
20982098
return undefined
20992099
};
21002100

2101-
return "<!doctype html>\n<html>\n <head>\n <script src=\"https://aframe.io/releases/1.0.4/aframe.min.js\"></script>\n <script src=\"https://raw.githack.com/AR-js-org/AR.js/master/aframe/build/aframe-ar.js\"></script>\n <script>\n AFRAME.registerComponent('audiohandler', {\n init: function () {\n var marker = this.el;\n this.vid = document.querySelector(\"#vid\");\n\n marker.addEventListener('markerFound', () => {\n this.toggle = true;\n this.vid.play();\n }).bind(this));\n\n marker.addEventListener('markerLost', () => {\n this.toggle = false;\n this.vid.pause();\n }).bind(this));\n },\n });\n </script>\n </head>\n\n <body style=\"margin: 0; overflow: hidden;\">\n <a-scene\n vr-mode-ui=\"enabled: false\"\n loading-screen=\"enabled: false;\"\n arjs=\"sourceType: webcam; debugUIEnabled: false;\"\n embedded\n >\n <a-assets>\n <a-asset-item\n id=\"sound\"\n src=\""
2101+
return "<!doctype html>\n<html>\n <head>\n <script src=\"https://aframe.io/releases/1.0.4/aframe.min.js\"></script>\n <script src=\"https://raw.githack.com/AR-js-org/AR.js/master/aframe/build/aframe-ar.js\"></script>\n <script>\n AFRAME.registerComponent('audiohandler', {\n init: function () {\n var marker = this.el;\n this.vid = document.querySelector(\"#vid\");\n\n marker.addEventListener('markerFound', function () {\n this.toggle = true;\n this.vid.play();\n }.bind(this));\n\n marker.addEventListener('markerLost', function () {\n this.toggle = false;\n this.vid.pause();\n }.bind(this));\n },\n });\n </script>\n </head>\n\n <body style=\"margin: 0; overflow: hidden;\">\n <a-scene\n vr-mode-ui=\"enabled: false\"\n loading-screen=\"enabled: false;\"\n arjs=\"sourceType: webcam; debugUIEnabled: false;\"\n embedded\n >\n <a-assets>\n <a-asset-item\n id=\"sound\"\n src=\""
21022102
+ container.escapeExpression(((helper = (helper = lookupProperty(helpers,"assetPath") || (depth0 != null ? lookupProperty(depth0,"assetPath") : depth0)) != null ? helper : container.hooks.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),{"name":"assetPath","hash":{},"data":data,"loc":{"start":{"line":36,"column":25},"end":{"line":36,"column":38}}}) : helper)))
21032103
+ "\"\n response-type=\"arraybuffer\"\n ></a-asset-item>\n </a-assets>\n\n <a-marker\n id=\"animated-marker\"\n type=\"pattern\"\n preset=\"custom\"\n url=\"assets/marker.patt\"\n emitsevent=\"true\"\n ></a-marker>\n\n <a-entity\n audiohandler\n id=\"sound-entity\"\n sound=\"src: #sound\"\n autoplay=\"false\"\n ></a-entity>\n\n <a-entity camera></a-entity>\n </a-scene>\n </body>\n</html>\n";
21042104
},"useData":true});
@@ -2117,7 +2117,7 @@ module.exports = (Handlebars["default"] || Handlebars).template({"compiler":[8,"
21172117
return undefined
21182118
};
21192119

2120-
return "<!doctype html>\n<html>\n <head>\n <script src=\"https://aframe.io/releases/1.0.4/aframe.min.js\"></script>\n <script src=\"https://raw.githack.com/AR-js-org/AR.js/master/aframe/build/aframe-ar.js\"></script>\n <script src=\"https://raw.githack.com/AR-js-org/studio-backend/master/src/modules/marker/tools/gesture-detector.js\"></script>\n <script src=\"https://raw.githack.com/AR-js-org/studio-backend/master/src/modules/marker/tools/gesture-handler.js\"></script>\n <script>\n AFRAME.registerComponent('videohandler', {\n init: function () {\n var marker = this.el;\n this.vid = document.querySelector(\"#vid\");\n\n marker.addEventListener('markerFound', () => {\n this.toggle = true;\n this.vid.play();\n }).bind(this));\n\n marker.addEventListener('markerLost', () => {\n this.toggle = false;\n this.vid.pause();\n }).bind(this));\n },\n });\n </script>\n </head>\n\n <body style=\"margin: 0; overflow: hidden;\">\n <a-scene\n vr-mode-ui=\"enabled: false\"\n loading-screen=\"enabled: false;\"\n arjs='sourceType: webcam; debugUIEnabled: false;'\n id=\"scene\"\n embedded\n gesture-detector\n >\n <a-assets>\n <video\n id=\"vid\"\n src=\""
2120+
return "<!doctype html>\n<html>\n <head>\n <script src=\"https://aframe.io/releases/1.0.4/aframe.min.js\"></script>\n <script src=\"https://raw.githack.com/AR-js-org/AR.js/master/aframe/build/aframe-ar.js\"></script>\n <script src=\"https://raw.githack.com/AR-js-org/studio-backend/master/src/modules/marker/tools/gesture-detector.js\"></script>\n <script src=\"https://raw.githack.com/AR-js-org/studio-backend/master/src/modules/marker/tools/gesture-handler.js\"></script>\n <script>\n AFRAME.registerComponent('videohandler', {\n init: function () {\n var marker = this.el;\n this.vid = document.querySelector(\"#vid\");\n\n marker.addEventListener('markerFound', function () {\n this.toggle = true;\n this.vid.play();\n }.bind(this));\n\n marker.addEventListener('markerLost', function () {\n this.toggle = false;\n this.vid.pause();\n }.bind(this));\n },\n });\n </script>\n </head>\n\n <body style=\"margin: 0; overflow: hidden;\">\n <a-scene\n vr-mode-ui=\"enabled: false\"\n loading-screen=\"enabled: false;\"\n arjs='sourceType: webcam; debugUIEnabled: false;'\n id=\"scene\"\n embedded\n gesture-detector\n >\n <a-assets>\n <video\n id=\"vid\"\n src=\""
21212121
+ alias1(((helper = (helper = lookupProperty(helpers,"assetPath") || (depth0 != null ? lookupProperty(depth0,"assetPath") : depth0)) != null ? helper : container.hooks.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),{"name":"assetPath","hash":{},"data":data,"loc":{"start":{"line":40,"column":25},"end":{"line":40,"column":38}}}) : helper)))
21222122
+ "\"\n preload=\"auto\"\n response-type=\"arraybuffer\"\n loop\n crossorigin\n webkit-playsinline\n autoplay\n muted\n playsinline\n ></video>\n </a-assets>\n\n <a-marker\n type=\"pattern\"\n preset=\"custom\"\n url=\"assets/marker.patt\"\n videohandler\n smooth=\"true\"\n smoothCount=\"10\"\n smoothTolerance=\"0.01\"\n smoothThreshold=\"5\"\n raycaster=\"objects: .clickable\"\n emitevents=\"true\"\n cursor=\"fuse: false; rayOrigin: mouse;\"\n id=\"markerA\"\n >\n <a-video\n src=\"#vid\"\n scale=\""
21232123
+ alias1(alias2(((stack1 = (depth0 != null ? lookupProperty(depth0,"assetParam") : depth0)) != null ? lookupProperty(stack1,"scale") : stack1), depth0))

dist/arjs-studio-backend.js.map

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

dist/arjs-studio-backend.min.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.

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

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "studio-backend",
3-
"version": "0.19.0",
3+
"version": "0.20.0",
44
"description": "Backend for arjs-studio project",
55
"main": "dist/arjs-studio-backend.min.js",
66
"repository": "[email protected]:AR-js-org/studio-backend.git",

0 commit comments

Comments
 (0)