From 6410aa28324a925902db71ebbd815dab362026da Mon Sep 17 00:00:00 2001
From: Benjamin Baudel <bbaudel@gopro.com>
Date: Thu, 16 Nov 2017 11:14:40 +0100
Subject: [PATCH 1/7] Add HLS sample

---
 projects/hls/config.json | 147 +++++++++++++++++++++++++++++++++++++++
 projects/hls/index.html  |  62 +++++++++++++++++
 2 files changed, 209 insertions(+)
 create mode 100644 projects/hls/config.json
 create mode 100644 projects/hls/index.html

diff --git a/projects/hls/config.json b/projects/hls/config.json
new file mode 100644
index 0000000..80702b4
--- /dev/null
+++ b/projects/hls/config.json
@@ -0,0 +1,147 @@
+{
+    "story":
+    {
+        "uid": "mpegdash-story",
+        "name": "MPEG-DASH Video Story",
+        "slug": "mpegdash-story",
+        "description": "This is sample of MPEG-DASH video display",
+        "default": "scene-0",
+
+        "scenes":
+        [
+            {
+                "uid": "scene-0",
+                "name": "First scene",
+                "slug": "first-scene",
+                "description": "This is the first scene",
+
+                "media":
+                {
+                    "uid": "video-0",
+                    "type": "video",
+
+                    "source":
+                    {
+                        "format": "equi",
+                        "streaming": "hls",
+                        "url": "https://video-dev.github.io/streams/x36xhzz/x36xhzz.m3u8"
+                    },
+
+                    "options":
+                    {
+                        "autoPlay": true,
+                        "loop": true,
+                        "volume": 0.5
+                    }
+                },
+
+                "camera":
+                {
+                    "fov":
+                    {
+                        "default": 90
+                    }
+                }
+            },
+
+            {
+                "uid": "scene-1",
+                "name": "Second scene",
+                "slug": "second-scene",
+                "description": "This is the second scene",
+                "background": "#111",
+
+                "media":
+                {
+                    "uid": "video-1",
+                    "type": "video",
+
+                    "source":
+                    {
+                        "format": "flat",
+                        "streaming": "hls",
+                        "url": "http://www.streambox.fr/playlists/x31jrg1/x31jrg1.m3u8"
+                    },
+
+                    "options":
+                    {
+                        "autoPlay": true,
+                        "loop": true,
+                        "volume": 0.5
+                    }
+                },
+
+                "camera":
+                {
+                    "fov":
+                    {
+                        "default": 180
+                    }
+                },
+
+                "view":
+                {
+                    "type": "flat"
+                }
+            }
+        ]
+    },
+
+    "plugins":
+    {
+        "prefix": "../../plugins/",
+
+        "engines":
+        [
+            {
+                "uid": "org.forgejs.previousnextbuttons",
+                "url": "PreviousNextButtons/"
+            },
+
+            {
+                "uid": "org.forgejs.videocors",
+                "url": "VideoCORS/"
+            },
+
+            {
+                "uid": "org.forgejs.mobilevideoplay",
+                "url": "MobileVideoPlay/"
+            },
+
+            {
+                "uid": "org.forgejs.gyroscopebutton",
+                "url": "GyroscopeButton/"
+            }
+        ],
+
+        "instances":
+        [
+            {
+                "uid": "previousnextbuttons",
+                "engine": "org.forgejs.previousnextbuttons",
+                "index": 10
+            },
+
+            {
+                "uid": "videocors",
+                "engine": "org.forgejs.videocors"
+            },
+
+            {
+                "uid": "mobilevideoplay",
+                "engine": "org.forgejs.mobilevideoplay"
+            },
+
+            {
+                "uid": "gyrobutton",
+                "engine": "org.forgejs.gyroscopebutton",
+
+                "options":
+                {
+                    "bottom": 10,
+                    "left": 10
+                }
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/projects/hls/index.html b/projects/hls/index.html
new file mode 100644
index 0000000..86e1592
--- /dev/null
+++ b/projects/hls/index.html
@@ -0,0 +1,62 @@
+<!doctype html>
+
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="author" content="GoPro, Inc.">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+    <meta http-equiv="x-ua-compatible" content="IE=edge" />
+    <title>ForgeJS sample - HLS videos</title>
+
+    <!-- Little styling -->
+    <style type="text/css">
+        @-ms-viewport { width: device-width; }
+        @-o-viewport { width: device-width; zoom: 1.0; min-zoom: 1.0; max-zoom: 1.0; }
+        @viewport { width: device-width; zoom: 1.0; min-zoom: 1.0; max-zoom: 1.0; }
+
+        html, body
+        {
+            height: 100%;
+            margin: 0;
+            padding: 0;
+            overflow: hidden;
+        }
+
+        div#container
+        {
+            height: 100%;
+        }
+    </style>
+</head>
+
+<body>
+    <div id="container"></div>
+
+    <!-- Include the DASH library -->
+    <script src="//cdn.jsdelivr.net/npm/hls.js@latest"></script>
+    <script>
+    if (Hls.isSupported()) {
+        console.log("hello hls.js!");
+    }
+    </script>
+
+    <!-- Include the threejs custom build -->
+    <script src="../../lib/three.js/three.r86.custom.min.js"></script>
+
+    <!-- Include the Hammer.js library -->
+    <script src="../../lib/hammer.js/hammer.min.js"></script>
+
+    <!-- Include the ForgeJS library -->
+    <script type="text/javascript" src="../../lib/forge/forge.min.js" ></script>
+
+    <!-- Start ForgeJS -->
+    <script type="text/javascript">
+
+        // Create a viewer
+        var viewer = new FORGE.Viewer("container", "config.json");
+
+    </script>
+</body>
+</html>
\ No newline at end of file

From d1061a3be5b883c354909aff16b8a1d23a918e40 Mon Sep 17 00:00:00 2001
From: Benjamin Baudel <bbaudel@gopro.com>
Date: Thu, 16 Nov 2017 13:40:53 +0100
Subject: [PATCH 2/7] Remove unused code

---
 projects/hls/index.html | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/projects/hls/index.html b/projects/hls/index.html
index 86e1592..1698391 100644
--- a/projects/hls/index.html
+++ b/projects/hls/index.html
@@ -36,11 +36,6 @@
 
     <!-- Include the DASH library -->
     <script src="//cdn.jsdelivr.net/npm/hls.js@latest"></script>
-    <script>
-    if (Hls.isSupported()) {
-        console.log("hello hls.js!");
-    }
-    </script>
 
     <!-- Include the threejs custom build -->
     <script src="../../lib/three.js/three.r86.custom.min.js"></script>
@@ -49,7 +44,7 @@
     <script src="../../lib/hammer.js/hammer.min.js"></script>
 
     <!-- Include the ForgeJS library -->
-    <script type="text/javascript" src="../../lib/forge/forge.min.js" ></script>
+    <script type="text/javascript" src="../../lib/forge/forge.js" ></script>
 
     <!-- Start ForgeJS -->
     <script type="text/javascript">

From ce8186e5465568e221ff29c62b1bd71070b6f5d0 Mon Sep 17 00:00:00 2001
From: Benjamin Baudel <bbaudel@gopro.com>
Date: Fri, 1 Dec 2017 16:03:24 +0100
Subject: [PATCH 3/7] Update HLS sample

---
 projects/hls/config.json | 4 ++--
 projects/hls/index.html  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/projects/hls/config.json b/projects/hls/config.json
index 80702b4..8756fec 100644
--- a/projects/hls/config.json
+++ b/projects/hls/config.json
@@ -24,7 +24,7 @@
                     {
                         "format": "equi",
                         "streaming": "hls",
-                        "url": "https://video-dev.github.io/streams/x36xhzz/x36xhzz.m3u8"
+                        "url": "http://www.streambox.fr/playlists/x31jrg1/x31jrg1.m3u8"
                     },
 
                     "options":
@@ -60,7 +60,7 @@
                     {
                         "format": "flat",
                         "streaming": "hls",
-                        "url": "http://www.streambox.fr/playlists/x31jrg1/x31jrg1.m3u8"
+                        "url": "https://video-dev.github.io/streams/x36xhzz/x36xhzz.m3u8"
                     },
 
                     "options":
diff --git a/projects/hls/index.html b/projects/hls/index.html
index 1698391..d4aba3d 100644
--- a/projects/hls/index.html
+++ b/projects/hls/index.html
@@ -34,7 +34,7 @@
 <body>
     <div id="container"></div>
 
-    <!-- Include the DASH library -->
+    <!-- Include the HLS library -->
     <script src="//cdn.jsdelivr.net/npm/hls.js@latest"></script>
 
     <!-- Include the threejs custom build -->
@@ -44,7 +44,7 @@
     <script src="../../lib/hammer.js/hammer.min.js"></script>
 
     <!-- Include the ForgeJS library -->
-    <script type="text/javascript" src="../../lib/forge/forge.js" ></script>
+    <script type="text/javascript" src="../../../sources/build/forge.js" ></script>
 
     <!-- Start ForgeJS -->
     <script type="text/javascript">

From cfeb407d1172ea23d690fe00db5cf35769044b06 Mon Sep 17 00:00:00 2001
From: Benjamin Baudel <bbaudel@gopro.com>
Date: Mon, 4 Dec 2017 17:30:46 +0100
Subject: [PATCH 4/7] Update sample metadata

---
 projects/hls/index.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/projects/hls/index.html b/projects/hls/index.html
index d4aba3d..380b8a5 100644
--- a/projects/hls/index.html
+++ b/projects/hls/index.html
@@ -9,6 +9,12 @@
     <meta name="apple-mobile-web-app-status-bar-style" content="black" />
     <meta http-equiv="x-ua-compatible" content="IE=edge" />
     <title>ForgeJS sample - HLS videos</title>
+    <meta property="og:title" content="ForgeJS sample - HLS videos" />
+    <meta property="og:description" content="Video player based on HTTP Live Streaming technology." />
+    <meta property="og:type" content="article" />
+    <meta property="og:url" content="https://releases.forgejs.org/latest/samples/projects/hls/" />
+    <meta property="og:image" content="https://cdn.forgejs.org/grav/images/ForgeJS-logo-1200x630.png" />
+    <meta property="og:site_name" content="ForgeJS" />
 
     <!-- Little styling -->
     <style type="text/css">

From b4d870bf3a7116444b64dfff5fb378d8809fb179 Mon Sep 17 00:00:00 2001
From: Benjamin Baudel <bbaudel@gopro.com>
Date: Tue, 5 Dec 2017 16:16:58 +0100
Subject: [PATCH 5/7] Use a gopro Hls video into the sample

---
 projects/hls/config.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/hls/config.json b/projects/hls/config.json
index 8756fec..75738e5 100644
--- a/projects/hls/config.json
+++ b/projects/hls/config.json
@@ -24,7 +24,7 @@
                     {
                         "format": "equi",
                         "streaming": "hls",
-                        "url": "http://www.streambox.fr/playlists/x31jrg1/x31jrg1.m3u8"
+                        "url": "https://cdn.forgejs.org/samples/common/videos/omni-highlights/hls/filename.m3u8"
                     },
 
                     "options":
@@ -60,7 +60,7 @@
                     {
                         "format": "flat",
                         "streaming": "hls",
-                        "url": "https://video-dev.github.io/streams/x36xhzz/x36xhzz.m3u8"
+                        "url": "https://cdn.forgejs.org/samples/common/videos/omni-highlights/hls/filename.m3u8"
                     },
 
                     "options":

From e3cc48b07b8f0d05cdf2dfbc09811f195b049803 Mon Sep 17 00:00:00 2001
From: Benjamin Baudel <bbaudel@gopro.com>
Date: Tue, 5 Dec 2017 16:18:12 +0100
Subject: [PATCH 6/7] Remove the flat scene used for internal tests

---
 projects/hls/config.json | 60 +++-------------------------------------
 1 file changed, 4 insertions(+), 56 deletions(-)

diff --git a/projects/hls/config.json b/projects/hls/config.json
index 75738e5..326b114 100644
--- a/projects/hls/config.json
+++ b/projects/hls/config.json
@@ -1,10 +1,10 @@
 {
     "story":
     {
-        "uid": "mpegdash-story",
-        "name": "MPEG-DASH Video Story",
-        "slug": "mpegdash-story",
-        "description": "This is sample of MPEG-DASH video display",
+        "uid": "hls-story",
+        "name": "HLS Video Story",
+        "slug": "hls-story",
+        "description": "This is sample of HLS video display",
         "default": "scene-0",
 
         "scenes":
@@ -42,47 +42,6 @@
                         "default": 90
                     }
                 }
-            },
-
-            {
-                "uid": "scene-1",
-                "name": "Second scene",
-                "slug": "second-scene",
-                "description": "This is the second scene",
-                "background": "#111",
-
-                "media":
-                {
-                    "uid": "video-1",
-                    "type": "video",
-
-                    "source":
-                    {
-                        "format": "flat",
-                        "streaming": "hls",
-                        "url": "https://cdn.forgejs.org/samples/common/videos/omni-highlights/hls/filename.m3u8"
-                    },
-
-                    "options":
-                    {
-                        "autoPlay": true,
-                        "loop": true,
-                        "volume": 0.5
-                    }
-                },
-
-                "camera":
-                {
-                    "fov":
-                    {
-                        "default": 180
-                    }
-                },
-
-                "view":
-                {
-                    "type": "flat"
-                }
             }
         ]
     },
@@ -93,11 +52,6 @@
 
         "engines":
         [
-            {
-                "uid": "org.forgejs.previousnextbuttons",
-                "url": "PreviousNextButtons/"
-            },
-
             {
                 "uid": "org.forgejs.videocors",
                 "url": "VideoCORS/"
@@ -116,12 +70,6 @@
 
         "instances":
         [
-            {
-                "uid": "previousnextbuttons",
-                "engine": "org.forgejs.previousnextbuttons",
-                "index": 10
-            },
-
             {
                 "uid": "videocors",
                 "engine": "org.forgejs.videocors"

From 53b418ba3cd9859a0978ff7efd05b0031272bd7b Mon Sep 17 00:00:00 2001
From: Benjamin Baudel <bbaudel@gopro.com>
Date: Tue, 5 Dec 2017 16:44:21 +0100
Subject: [PATCH 7/7] Update sample to use the internal HLS.js library version

---
 projects/hls/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/hls/index.html b/projects/hls/index.html
index 380b8a5..810722d 100644
--- a/projects/hls/index.html
+++ b/projects/hls/index.html
@@ -41,7 +41,7 @@
     <div id="container"></div>
 
     <!-- Include the HLS library -->
-    <script src="//cdn.jsdelivr.net/npm/hls.js@latest"></script>
+    <script src="../../lib/hls.js/hls.min.js"></script>
 
     <!-- Include the threejs custom build -->
     <script src="../../lib/three.js/three.r86.custom.min.js"></script>
@@ -50,7 +50,7 @@
     <script src="../../lib/hammer.js/hammer.min.js"></script>
 
     <!-- Include the ForgeJS library -->
-    <script type="text/javascript" src="../../../sources/build/forge.js" ></script>
+    <script type="text/javascript" src="../../lib/forge/forge.min.js" ></script>
 
     <!-- Start ForgeJS -->
     <script type="text/javascript">