Merge pull request #206 from Tour-360/dev

Релиз v2.0.0
Tour-360 · Aug 27, 2016 · 87d6c41 · 87d6c41
2 parents af0f2a3 + 680d60d
commit 87d6c41
Show file tree

Hide file tree

Showing 110 changed files with 1,545 additions and 245 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,9 @@
 node_modules/
 bower_components/
+build/
 src/lib/
 build/**/*.map
 Thumbs.db
 npm-debug.log
-.ftppass
+.ftppass
+.DS_Store
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,3 @@
+language: node_js
+node_js:
+- '5.4.0'
diff --git a/README.md b/README.md
@@ -1,5 +1,9 @@
 tour-player
 ===========
+[![Build Status](https://travis-ci.org/Tour-360/tour-player.svg?branch=master)](https://travis-ci.org/Tour-360/tour-player)
+
+#### Demo
+**[tour-player.herokuapp.com](http://tour-player.herokuapp.com)**
 
 #### Getting started
 ```git clone https://github.com/Tour-360/tour-player.git && cd tour-player```

diff --git a/app.json b/app.json
@@ -0,0 +1,6 @@
+{
+    "name": "tour-player",
+    "scripts": {},
+    "env": {},
+    "addons": []
+}
diff --git a/build/tour-player.css b/build/tour-player.css
diff --git a/build/tour-player.js b/build/tour-player.js
diff --git a/example/index.html b/example/index.html
@@ -5,21 +5,70 @@
         <meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
         <link rel="stylesheet" href="../build/tour-player.css">
         <script src="../build/tour-player.js"></script>
-        <title></title>
+        <title>Example Tour-360 player</title>
+        <style>
+            /* Цвет всех маркеров */
+            #markers .button {
+                background-color: rgba(0,0,0,.8);
+            }
+
+            /* Цвет информационных маркеров */
+            #markers .button.info{
+                background-color: #ed1c24;
+            }
+
+            /* Цвет полосы загрузки */
+            #control-panel .progress-bar .value {
+                background: #ed1c24;
+            }
+        </style>
     </head>
     <body>
-        <div id="markers">
-            <div class="marker down">
-                <div class="title">
-                    <span>Хол</span>
+        <div class="popup-layout">
+            <div class="popups">
+                <div class="close"></div>
+                <div class="popup" id="lana-del-rey-born-to-die">
+                    <img src="http://cdn1.umg3.net/89/files/2014/06/Lana-Del-Rey-Born-To-Die-Paradise-Edition-1500x1500-2012.png" alt="Lana Del Rey — Born To Die: Paradise Edition">
+                    <div class="content">
+                        <h1>Lana Del Rey — Born To Die: Paradise Edition</h1>
+                        <p>Другой альбом: <a href="#lana-del-rey-ultraviolence">Lana Del Rey — Ultraviolence</a></p>
+                        <p><b>«Born to Die: The Paradise Edition»</b> — переиздание американской певицы Ланы Дель Рей студийного альбома Born to Die (2012). Выпущен 9 ноября 2012 года под лейблами Polydor и Interscope. Также одновременно с переизданием был выпущен мини-альбом Paradise, в который вошли 8 новых треков, которыми был дополнен оригинальный альбом. Рик Новелл и Эмили Хейни были единственными, кто работал над двумя этими сборниками вместе.</p>
+                        <ol>
+                            <li>«Born to Die»</li>
+                            <li>«Off to the Races»</li>
+                            <li>«Blue Jeans»</li>
+                            <li>«Video Games»</li>
+                            <li>«Diet Mountain Dew»</li>
+                            <li>«National Anthem»</li>
+                            <li>«Dark Paradise»</li>
+                            <li>«Radio»</li>
+                            <li>«Carmen»</li>
+                            <li>«Million Dollar Man»</li>
+                            <li>«Summertime Sadness»</li>
+                            <li>«This Is What Makes Us Girls»</li>
+                            <li>«Without You»</li>
+                            <li>«Lolita»</li>
+                            <li>«Lucky Ones»</li>
+                        </ol>
+                    </div>
+                </div>
+                <div class="popup" id="lana-del-rey-ultraviolence">
+                    <img src="http://cdn1.umg3.net/89/files/2014/06/Lana-Del-Rey-Ultraviolence-2014-1500x1500.png" width="100" alt="Lana Del Rey — Ultraviolence">
+                    <div class="content">
+                        <h1>Lana Del Rey — Ultraviolence</h1>
+                        <p>Другой альбом: <a href="#lana-del-rey-born-to-die">Lana Del Rey — Born To Die: Paradise Edition</a></p>
+                    </div>
                 </div>
             </div>
         </div>
-        <div id="notification">
-            <span>Мой текст</span>
-        </div>
+
         <script>
-        Tour.init();
+        Tour.init(false, {
+            controlPanel: true
+        });
+        Tour.on('load', function(data) {
+            this.controls.autoRotate()
+        })
         </script>
     </body>
 </html>
diff --git a/example/manifest.json b/example/manifest.json
@@ -1,32 +1,109 @@
 {
 	"_specification": "https://github.com/Tour-360/tour-player/wiki/Формат-файла-Data.json",
 	"title": "Avant SHOP",
+	"start": 1,
+	"backgroundImage": "data:image/gif;base64,R0lGODdhCAAGAPIAAOjt86O4sp2np0tbTJKNi46gqLyyvcHK0iwAAAAACAAGAAADGhgGdxwiyFDEGaIckQ0mhtENhEBsFqFajJEAADs=",
+	"backgroundColor": "#a3aaac",
 	"panorams": [
 		{
 			"id": 0,
+			"title": "Стелаж",
 			"lon": 0,
 			"lat": 0,
 			"markers": [
 				{
-					"lon": -270,
-					"lat": 5,
-					"class": "up",
+					"lon": 0,
+					"lat": -5,
+					"icon": "up",
 					"action": {
 						"type": "panorama",
-						"id": 1,
-						"lon": -270,
-						"lat": 0
+						"id": 2
+					}
+				},{
+					"lon": 0,
+					"lat": -50,
+					"icon": "point",
+					"action": {
+						"type": "panorama",
+						"id": 1
+					}
+				},{
+					"lon": -90,
+					"lat": 16,
+					"icon": "info",
+					"title": "<a href=\"https://ru.wikipedia.org/wiki/Linkin_Park\" target=\"_blank\">Linkin Park</a> — A Thousand Suns", 
+					"action": {
+						"type": "url",
+						"href": "https://ru.wikipedia.org/wiki/Linkin_Park"
 					}
 				}
 			]
 		},{
 			"id": 1,
+			"title": "Центр",
 			"lon": 0,
-			"lat": 0
+			"lat": 0,
+			"markers": [
+				{
+					"lon": 0,
+					"lat": -5,
+					"icon": "up",
+					"action": {
+						"type": "panorama",
+						"id": 2
+					}
+				},{
+					"lon": 180,
+					"lat": -5,
+					"icon": "up",
+					"action": {
+						"type": "panorama",
+						"id": 0
+					}
+				},{
+					"lon": 280,
+					"lat": 13.73,
+					"icon": "info",
+					"title": "Lana Del Rey — Born To Die: Paradise Edition", 
+					"action": {
+						"type": "popup",
+						"id": "lana-del-rey-born-to-die"
+					}
+				},{
+					"lon": 292,
+					"lat": 3,
+					"icon": "info",
+					"title": "Lana Del Rey — Ultraviolence", 
+					"action": {
+						"type": "popup",
+						"id": "lana-del-rey-ultraviolence"
+					}
+				}
+			]
 		},{
 			"id": 2,
+			"title": {"ru": "Касса", "en": "Сashbox"},
 			"lon": 0,
-			"lat": 0
+			"lat": 0,
+			"markers": [
+				{
+					"lon": 180,
+					"lat": -5,
+					"icon": "up",
+					"action": {
+						"type": "panorama",
+						"id": 0
+					}
+				},{
+					"lon": 180,
+					"lat": -40,
+					"icon": "point",
+					"action": {
+						"type": "panorama",
+						"id": 1
+					}
+				}
+			]
 		}
 	]
 }
diff --git a/example/panorams/0/low/0.jpg b/example/panorams/0/low/0.jpg
diff --git a/example/panorams/0/low/1.jpg b/example/panorams/0/low/1.jpg
diff --git a/example/panorams/0/low/2.jpg b/example/panorams/0/low/2.jpg
diff --git a/example/panorams/0/low/3.jpg b/example/panorams/0/low/3.jpg
diff --git a/example/panorams/0/low/4.jpg b/example/panorams/0/low/4.jpg
diff --git a/example/panorams/0/low/5.jpg b/example/panorams/0/low/5.jpg
diff --git a/example/panorams/0/standard/0.jpg b/example/panorams/0/standard/0.jpg
diff --git a/example/panorams/0/standard/1.jpg b/example/panorams/0/standard/1.jpg
diff --git a/example/panorams/0/standard/2.jpg b/example/panorams/0/standard/2.jpg
diff --git a/example/panorams/0/standard/3.jpg b/example/panorams/0/standard/3.jpg
diff --git a/example/panorams/0/standard/4.jpg b/example/panorams/0/standard/4.jpg
diff --git a/example/panorams/0/standard/5.jpg b/example/panorams/0/standard/5.jpg
diff --git a/example/panorams/0/thumbnail/0.jpg b/example/panorams/0/thumbnail/0.jpg
diff --git a/example/panorams/1/low/0.jpg b/example/panorams/1/low/0.jpg
diff --git a/example/panorams/1/low/1.jpg b/example/panorams/1/low/1.jpg
diff --git a/example/panorams/1/low/2.jpg b/example/panorams/1/low/2.jpg
diff --git a/example/panorams/1/low/3.jpg b/example/panorams/1/low/3.jpg
diff --git a/example/panorams/1/low/4.jpg b/example/panorams/1/low/4.jpg
diff --git a/example/panorams/1/low/5.jpg b/example/panorams/1/low/5.jpg
diff --git a/example/panorams/1/standard/0.jpg b/example/panorams/1/standard/0.jpg
diff --git a/example/panorams/1/standard/1.jpg b/example/panorams/1/standard/1.jpg
diff --git a/example/panorams/1/standard/2.jpg b/example/panorams/1/standard/2.jpg
diff --git a/example/panorams/1/standard/3.jpg b/example/panorams/1/standard/3.jpg
diff --git a/example/panorams/1/standard/4.jpg b/example/panorams/1/standard/4.jpg
diff --git a/example/panorams/1/standard/5.jpg b/example/panorams/1/standard/5.jpg
diff --git a/example/panorams/1/thumbnail/0.jpg b/example/panorams/1/thumbnail/0.jpg
diff --git a/example/panorams/2/low/0.jpg b/example/panorams/2/low/0.jpg
diff --git a/example/panorams/2/low/1.jpg b/example/panorams/2/low/1.jpg
diff --git a/example/panorams/2/low/2.jpg b/example/panorams/2/low/2.jpg
diff --git a/example/panorams/2/low/3.jpg b/example/panorams/2/low/3.jpg
diff --git a/example/panorams/2/low/4.jpg b/example/panorams/2/low/4.jpg
diff --git a/example/panorams/2/low/5.jpg b/example/panorams/2/low/5.jpg
diff --git a/example/panorams/2/standard/0.jpg b/example/panorams/2/standard/0.jpg
diff --git a/example/panorams/2/standard/1.jpg b/example/panorams/2/standard/1.jpg
diff --git a/example/panorams/2/standard/2.jpg b/example/panorams/2/standard/2.jpg
diff --git a/example/panorams/2/standard/3.jpg b/example/panorams/2/standard/3.jpg
diff --git a/example/panorams/2/standard/4.jpg b/example/panorams/2/standard/4.jpg
diff --git a/example/panorams/2/standard/5.jpg b/example/panorams/2/standard/5.jpg
diff --git a/example/panorams/2/thumbnail/0.jpg b/example/panorams/2/thumbnail/0.jpg