Merge branch 'develop'

dergunovd · Jul 29, 2018 · d714e37 · d714e37
2 parents abfedf6 + 5145edf
commit d714e37
Show file tree

Hide file tree

Showing 9 changed files with 95 additions and 15 deletions.
diff --git a/dist/images/arrow.svg b/dist/images/arrow.svg
diff --git a/dist/images/door.svg b/dist/images/door.svg
diff --git a/dist/manifest.json b/dist/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Panorama DEMO",
-  "short_name": "Panorama DEMO",
+  "short_name": "Panorama",
   "orientation": "portrait",
   "display": "standalone",
   "start_url": ".",

diff --git a/dist/panorama.js b/dist/panorama.js
diff --git a/dist/sw.js b/dist/sw.js
@@ -1,8 +1,10 @@
 var serviceWorkerOption = {
   "assets": [
     "/panorama.js",
-    "/images/room0/py.webp",
+    "/images/arrow.svg",
+    "/images/door.svg",
     "/index.html",
+    "/images/room0/py.webp",
     "/images/room2/py.webp",
     "/images/room1/py.webp",
     "/images/room1/pz.webp",
@@ -20,9 +22,9 @@ var serviceWorkerOption = {
     "/images/room1/ny.webp",
     "/images/room1/pz.jpg",
     "/images/room0/nz.webp",
+    "/images/room2/pz.webp",
     "/images/room0/ny.webp",
     "/images/room1/nx.jpg",
-    "/images/room2/pz.webp",
     "/images/room2/nx.webp",
     "/images/room2/nz.jpg",
     "/images/room2/px.jpg",

diff --git a/src/panorama.css b/src/panorama.css
@@ -3,17 +3,23 @@ body {
   cursor: move;
 }
 
-.arrow {
-  width: 40px;
-  height: 40px;
-  background: #5b2c6f;
-  box-shadow: 5px 5px 20px #000;
-  border: 5px solid #fff;
-  border-radius: 50%;
+.point {
+  width: 60px;
+  height: 60px;
+  position: relative;
   cursor: pointer;
+  opacity: .7;
 }
 
-.arrow:hover,
-.arrow:active {
+.point.arrow {
+  background: url("/images/arrow.svg") center center no-repeat / cover;
+}
+
+.point.door {
+  background: url("/images/door.svg") center center no-repeat / cover;
+}
+
+.point:hover,
+.point:active {
   opacity: 1;
 }
diff --git a/src/panorama.js b/src/panorama.js
@@ -53,6 +53,7 @@ const THREE = require('three/build/three.min'),
         points = [
           {
             url: '#room0',
+            className: 'door',
             position: [-496, -100, -300],
             rotation: [0, Math.PI / 2, 0]
           }
@@ -63,6 +64,7 @@ const THREE = require('three/build/three.min'),
         points = [
           {
             url: '#room0',
+            className: 'arrow',
             position: [496, -100, 496],
             rotation: [0, Math.PI, 0]
           }
@@ -73,11 +75,13 @@ const THREE = require('three/build/three.min'),
         points = [
           {
             url: '#room1',
+            className: 'door',
             position: [190, -100, -496],
             rotation: [0, 0, 0]
           },
           {
             url: '#room2',
+            className: 'arrow',
             position: [496, -200, -250],
             rotation: [0, -Math.PI / 2, 0]
           }
@@ -512,7 +516,7 @@ function init() {
   for (let i = points.length - 1; i > -1; i--) {
     const point = points[i];
     const element = document.createElement('a');
-    element.className = 'arrow';
+    element.className = `point ${point.className}`;
     element.href = point.url;
     const object = new THREE.CSS3DObject(element);
     object.position.fromArray(point.position);

diff --git a/src/public/images/arrow.svg b/src/public/images/arrow.svg
diff --git a/src/public/images/door.svg b/src/public/images/door.svg