Merge branch 'master' into master

HEPPanoramic · Mar 5, 2019 · 3fcc83d · 3fcc83d
2 parents f9a9720 + 03e7ee5
commit 3fcc83d
Show file tree

Hide file tree

Showing 37 changed files with 10 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -6,5 +6,11 @@ The project uses the WebVR Framework A-Frame. Which makes 3D images accessible i
 
 ## Usage
 * Use a [WebVR-enabled browser](https://webvr.rocks/)
-* Go to https://quinnan-gill.github.io/lhc-panoramas/
+* Go to https://HEPPanoramic.github.io/lhc-panoramas/
 * Explore the ATLAS facilities
+
+Author: [email protected]
+Contributor: Quinnan Gill
+
+Images credits: M. Brice
+
diff --git a/components/set-image.js b/components/set-image.js
@@ -16,17 +16,16 @@ AFRAME.registerComponent('set-image', {
     var data = this.data;
     var el = this.el;
 
-    this.setupFadeAnimation();
+    //this.setupFadeAnimation();
 
     el.addEventListener(data.on, function () {
       // Fade out image.
-      data.target.emit('set-image-fade');
+      //data.target.emit('set-image-fade');
       // Wait for fade to complete.
+
       setTimeout(function () {
         // Set image.
         data.target.setAttribute('material', 'src', data.src);
-        console.log("---------------------");
-        console.log(data.src);
       }, data.dur);
     });
   },

diff --git a/img/0pOgmYSEETO5_equirectangular_2048.jpg b/img/0pOgmYSEETO5_equirectangular_2048.jpg
diff --git a/img/0pOgmYSEETO5_equirectangular_4096.jpg b/img/0pOgmYSEETO5_equirectangular_4096.jpg
diff --git a/img/1102319_02_2048.jpg b/img/1102319_02_2048.jpg
diff --git a/img/1102319_02_4096.jpg b/img/1102319_02_4096.jpg
diff --git a/img/1102319_03_2048.jpg b/img/1102319_03_2048.jpg
diff --git a/img/1102319_03_4096.jpg b/img/1102319_03_4096.jpg
diff --git a/img/1cvTuu1MUXmS_equirectangular_2048.jpg b/img/1cvTuu1MUXmS_equirectangular_2048.jpg
diff --git a/img/1cvTuu1MUXmS_equirectangular_4096.jpg b/img/1cvTuu1MUXmS_equirectangular_4096.jpg
diff --git a/img/CMS_equirectangular_16384.jpg b/img/CMS_equirectangular_16384.jpg
diff --git a/img/CMS_equirectangular_2048.jpg b/img/CMS_equirectangular_2048.jpg
diff --git a/img/CMS_equirectangular_4096.jpg b/img/CMS_equirectangular_4096.jpg
diff --git a/img/Jl1MSV90aJ1L_equirectangular_2048.jpg b/img/Jl1MSV90aJ1L_equirectangular_2048.jpg
diff --git a/img/Jl1MSV90aJ1L_equirectangular_4096.jpg b/img/Jl1MSV90aJ1L_equirectangular_4096.jpg
diff --git a/img/MA278252_Panorama_4096.jpg b/img/MA278252_Panorama_4096.jpg
diff --git a/img/MA27852_Panorama_2048.jpg b/img/MA27852_Panorama_2048.jpg
diff --git a/img/MA27852_Panorama_4096.jpg b/img/MA27852_Panorama_4096.jpg
diff --git a/img/MA27860_Panorama_2048.jpg b/img/MA27860_Panorama_2048.jpg
diff --git a/img/MA27860_Panorama_4096.jpg b/img/MA27860_Panorama_4096.jpg
diff --git a/img/_MA27720Panorama.jpg b/img/_MA27720Panorama.jpg
diff --git a/img/_MA28252Panorama.jpg b/img/_MA28252Panorama.jpg
diff --git a/img/_MA28452Panorama.jpg b/img/_MA28452Panorama.jpg
diff --git a/img/atlas0-thumb.png b/img/atlas0-thumb.png
diff --git a/img/atlas1-thumb.png b/img/atlas1-thumb.png
diff --git a/img/atlas2-thumb.png b/img/atlas2-thumb.png
diff --git a/img/cavern_atlas_level_1_4096.jpg b/img/cavern_atlas_level_1_4096.jpg
diff --git a/img/cavern_atlas_level_9_4096.jpg b/img/cavern_atlas_level_9_4096.jpg
diff --git a/img/cms-aframe.png b/img/cms-aframe.png
diff --git a/img/cms0_thumb.jpg b/img/cms0_thumb.jpg
diff --git a/img/cms1_thumb.jpg b/img/cms1_thumb.jpg
diff --git a/img/cms2_thumb.jpg b/img/cms2_thumb.jpg
diff --git a/img/cms3_thumb.jpg b/img/cms3_thumb.jpg
diff --git a/img/lhc1_thumb.jpg b/img/lhc1_thumb.jpg
diff --git a/img/lhc2_thumb.jpg b/img/lhc2_thumb.jpg
diff --git a/img/p50_thumb.jpg b/img/p50_thumb.jpg
diff --git a/img/p51_thumb.jpg b/img/p51_thumb.jpg