Skip to content
Snippets Groups Projects
Commit bcf9907d authored by Christopher Van Wiemeersch's avatar Christopher Van Wiemeersch
Browse files

add `crossorigin="anonymous"` attributes to cross-origin images in `<a-assets>` (fixes issue #373)

parent 2f8fc17b
No related branches found
No related tags found
No related merge requests found
...@@ -36,19 +36,19 @@ ...@@ -36,19 +36,19 @@
> >
<a-assets> <a-assets>
<img id="tooltip" src="./assets/hud/tooltip.9.png" > <img id="tooltip" crossorigin="anonymous" src="./assets/hud/tooltip.9.png">
<img id="mute-off" src="./assets/hud/mute_off.png" > <img id="mute-off" crossorigin="anonymous" src="./assets/hud/mute_off.png">
<img id="mute-off-hover" src="./assets/hud/mute_off-hover.png" > <img id="mute-off-hover" crossorigin="anonymous" src="./assets/hud/mute_off-hover.png">
<img id="mute-on" src="./assets/hud/mute_on.png" > <img id="mute-on" crossorigin="anonymous" src="./assets/hud/mute_on.png">
<img id="mute-on-hover" src="./assets/hud/mute_on-hover.png" > <img id="mute-on-hover" crossorigin="anonymous" src="./assets/hud/mute_on-hover.png">
<img id="bubble-off" src="./assets/hud/bubble_off.png" > <img id="bubble-off" crossorigin="anonymous" src="./assets/hud/bubble_off.png">
<img id="bubble-off-hover" src="./assets/hud/bubble_off-hover.png" > <img id="bubble-off-hover" crossorigin="anonymous" src="./assets/hud/bubble_off-hover.png">
<img id="bubble-on" src="./assets/hud/bubble_on.png" > <img id="bubble-on" crossorigin="anonymous" src="./assets/hud/bubble_on.png">
<img id="bubble-on-hover" src="./assets/hud/bubble_on-hover.png" > <img id="bubble-on-hover" crossorigin="anonymous" src="./assets/hud/bubble_on-hover.png">
<img id="freeze-off" src="./assets/hud/freeze_off.png" > <img id="freeze-off" crossorigin="anonymous" src="./assets/hud/freeze_off.png">
<img id="freeze-off-hover" src="./assets/hud/freeze_off-hover.png" > <img id="freeze-off-hover" crossorigin="anonymous" src="./assets/hud/freeze_off-hover.png">
<img id="freeze-on" src="./assets/hud/freeze_on.png" > <img id="freeze-on" crossorigin="anonymous" src="./assets/hud/freeze_on.png">
<img id="freeze-on-hover" src="./assets/hud/freeze_on-hover.png" > <img id="freeze-on-hover" crossorigin="anonymous" src="./assets/hud/freeze_on-hover.png">
<a-asset-item id="botdefault" response-type="arraybuffer" src="https://asset-bundles-prod.reticulum.io/bots/BotDefault_Avatar-9f71f8ff22.gltf"></a-asset-item> <a-asset-item id="botdefault" response-type="arraybuffer" src="https://asset-bundles-prod.reticulum.io/bots/BotDefault_Avatar-9f71f8ff22.gltf"></a-asset-item>
<a-asset-item id="botbobo" response-type="arraybuffer" src="https://asset-bundles-prod.reticulum.io/bots/BotBobo_Avatar-f9740a010b.gltf"></a-asset-item> <a-asset-item id="botbobo" response-type="arraybuffer" src="https://asset-bundles-prod.reticulum.io/bots/BotBobo_Avatar-f9740a010b.gltf"></a-asset-item>
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<a-asset-item id="quack" src="./assets/sfx/quack.mp3" response-type="arraybuffer" preload="auto"></a-asset-item> <a-asset-item id="quack" src="./assets/sfx/quack.mp3" response-type="arraybuffer" preload="auto"></a-asset-item>
<a-asset-item id="specialquack" src="./assets/sfx/specialquack.mp3" response-type="arraybuffer" preload="auto"></a-asset-item> <a-asset-item id="specialquack" src="./assets/sfx/specialquack.mp3" response-type="arraybuffer" preload="auto"></a-asset-item>
<img id="water-normal-map" src="./assets/waternormals.jpg"> <img id="water-normal-map" crossorigin="anonymous" src="./assets/waternormals.jpg">
<!-- Templates --> <!-- Templates -->
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
<template id="interactable-template"> <template id="interactable-template">
<a-entity <a-entity
gltf-model-plus="src: #interactable-duck; inflate: true;" gltf-model-plus="src: #interactable-duck; inflate: true;"
class="interactable" class="interactable"
super-networked-interactable="counter: #counter; mass: 1;" super-networked-interactable="counter: #counter; mass: 1;"
body="type: dynamic; shape: none; mass: 1;" body="type: dynamic; shape: none; mass: 1;"
grabbable grabbable
...@@ -192,8 +192,8 @@ ...@@ -192,8 +192,8 @@
<a-entity <a-entity
id="cursor-controller" id="cursor-controller"
cursor-controller=" cursor-controller="
cursor: #cursor; cursor: #cursor;
camera: #player-camera; camera: #player-camera;
playerRig: #player-rig; playerRig: #player-rig;
physicalHandSelector: #player-right-controller; physicalHandSelector: #player-right-controller;
gazeTeleportControls: #gaze-teleport;" gazeTeleportControls: #gaze-teleport;"
...@@ -216,7 +216,7 @@ ...@@ -216,7 +216,7 @@
segments-height="9" segments-height="9"
segments-width="9" segments-width="9"
event-repeater="events: raycaster-intersection, raycaster-intersection-cleared; eventSource: #cursor-controller" event-repeater="events: raycaster-intersection, raycaster-intersection-cleared; eventSource: #cursor-controller"
></a-sphere> ></a-sphere>
<!-- Player Rig --> <!-- Player Rig -->
<a-entity <a-entity
...@@ -257,9 +257,9 @@ ...@@ -257,9 +257,9 @@
id="gaze-teleport" id="gaze-teleport"
position = "0.15 0 0" position = "0.15 0 0"
teleport-controls=" teleport-controls="
cameraRig: #player-rig; cameraRig: #player-rig;
teleportOrigin: #player-camera; teleportOrigin: #player-camera;
button: cursor-teleport_; button: cursor-teleport_;
collisionEntities: [nav-mesh]; collisionEntities: [nav-mesh];
drawIncrementally: true; drawIncrementally: true;
incrementalDrawMs: 600; incrementalDrawMs: 600;
...@@ -274,9 +274,9 @@ ...@@ -274,9 +274,9 @@
hand-controls2="left" hand-controls2="left"
tracked-controls tracked-controls
teleport-controls=" teleport-controls="
cameraRig: #player-rig; cameraRig: #player-rig;
teleportOrigin: #player-camera; teleportOrigin: #player-camera;
button: cursor-teleport_; button: cursor-teleport_;
collisionEntities: [nav-mesh]; collisionEntities: [nav-mesh];
drawIncrementally: true; drawIncrementally: true;
incrementalDrawMs: 600; incrementalDrawMs: 600;
...@@ -295,9 +295,9 @@ ...@@ -295,9 +295,9 @@
hand-controls2="right" hand-controls2="right"
tracked-controls tracked-controls
teleport-controls=" teleport-controls="
cameraRig: #player-rig; cameraRig: #player-rig;
teleportOrigin: #player-camera; teleportOrigin: #player-camera;
button: cursor-teleport_; button: cursor-teleport_;
collisionEntities: [nav-mesh]; collisionEntities: [nav-mesh];
drawIncrementally: true; drawIncrementally: true;
incrementalDrawMs: 600; incrementalDrawMs: 600;
...@@ -344,8 +344,8 @@ ...@@ -344,8 +344,8 @@
</a-entity> </a-entity>
<!-- Environment --> <!-- Environment -->
<a-entity <a-entity
id="environment-root" id="environment-root"
nav-mesh-helper nav-mesh-helper
static-body="shape: none;" static-body="shape: none;"
></a-entity> ></a-entity>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment