Merge pull request #23 from gopro/rroux-debug

Rroux debug
gopro · Mar 7, 2017 · 7e1e16d · 7e1e16d
2 parents 1a767e9 + 1c4d079
commit 7e1e16d
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 15 deletions.
diff --git a/src/camera/Camera.js b/src/camera/Camera.js
@@ -1081,6 +1081,7 @@ Object.defineProperty(FORGE.Camera.prototype, "parallax",
     set: function(value)
     {
         this._parallax = FORGE.Math.clamp(value, 0, 1);
+        this._radius = this._parallax * FORGE.Camera.RADIUS;
         this._updateComplete();
     }
 });

diff --git a/src/display/components/Canvas.js b/src/display/components/Canvas.js
@@ -33,7 +33,7 @@ FORGE.Canvas.prototype._boot = function()
  * @type {CanvasRenderingContext2D}
  * @readonly
  */
-Object.defineProperty(FORGE.Canvas.prototype, "context2D", 
+Object.defineProperty(FORGE.Canvas.prototype, "context2D",
 {
     /** @this {FORGE.Canvas} */
     get: function()
@@ -48,7 +48,7 @@ Object.defineProperty(FORGE.Canvas.prototype, "context2D",
  * @type {WebGLRenderingContext}
  * @readonly
  */
-Object.defineProperty(FORGE.Canvas.prototype, "context3D", 
+Object.defineProperty(FORGE.Canvas.prototype, "context3D",
 {
     /** @this {FORGE.Canvas} */
     get: function()
@@ -63,7 +63,7 @@ Object.defineProperty(FORGE.Canvas.prototype, "context3D",
  * @type {HTMLCanvasElement}
  * @readonly
  */
-Object.defineProperty(FORGE.Canvas.prototype, "element", 
+Object.defineProperty(FORGE.Canvas.prototype, "element",
 {
     /** @this {FORGE.Canvas} */
     get: function()

diff --git a/src/story/Story.js b/src/story/Story.js
@@ -663,7 +663,7 @@ FORGE.Story.prototype.destroy = function()
 Object.defineProperty(FORGE.Story.prototype, "config",
 {
     /** @this {FORGE.Story} */
-    get: function ()
+    get: function()
     {
         return this._config;
     }
@@ -724,7 +724,7 @@ Object.defineProperty(FORGE.Story.prototype, "description",
 Object.defineProperty(FORGE.Story.prototype, "scenes",
 {
     /** @this {FORGE.Story} */
-    get: function ()
+    get: function()
     {
         return FORGE.UID.get(this._scenes);
     }
@@ -738,7 +738,7 @@ Object.defineProperty(FORGE.Story.prototype, "scenes",
 Object.defineProperty(FORGE.Story.prototype, "scene",
 {
     /** @this {FORGE.Story} */
-    get: function ()
+    get: function()
     {
         if(this._sceneUid === null || this._sceneUid === "")
         {
@@ -755,18 +755,38 @@ Object.defineProperty(FORGE.Story.prototype, "scene",
     }
 });
 
+/**
+* Get all the sceneUids.
+* @name FORGE.Story#sceneUids
+* @readonly
+* @type {Array<string>}
+*/
+Object.defineProperty(FORGE.Story.prototype, "sceneUids",
+{
+    /** @this {FORGE.Story} */
+    get: function()
+    {
+        return this._scenes;
+    }
+});
+
 /**
 * Get the current sceneUid.
 * @name FORGE.Story#sceneUid
-* @readonly
 * @type {string}
 */
 Object.defineProperty(FORGE.Story.prototype, "sceneUid",
 {
     /** @this {FORGE.Story} */
-    get: function ()
+    get: function()
     {
         return this._sceneUid;
+    },
+
+    /** @this {FORGE.Story} */
+    set: function(value)
+    {
+        this.loadScene(value);
     }
 });
 
@@ -793,7 +813,7 @@ Object.defineProperty(FORGE.Story.prototype, "groups",
 Object.defineProperty(FORGE.Story.prototype, "group",
 {
     /** @this {FORGE.Story} */
-    get: function ()
+    get: function()
     {
         if(this._groupUid === null || this._groupUid === "")
         {
@@ -810,18 +830,38 @@ Object.defineProperty(FORGE.Story.prototype, "group",
     }
 });
 
+/**
+* Get all the group Uids.
+* @name FORGE.Story#groupUids
+* @readonly
+* @type {Array<string>}
+*/
+Object.defineProperty(FORGE.Story.prototype, "groupUids",
+{
+    /** @this {FORGE.Story} */
+    get: function()
+    {
+        return this._groups;
+    }
+});
+
 /**
 * Get the current groupUid.
 * @name FORGE.Story#groupUid
-* @readonly
 * @type {string}
 */
 Object.defineProperty(FORGE.Story.prototype, "groupUid",
 {
     /** @this {FORGE.Story} */
-    get: function ()
+    get: function()
     {
         return this._groupUid;
+    },
+
+    /** @this {FORGE.Story} */
+    set: function(value)
+    {
+        this.loadGroup(value);
     }
 });
 

diff --git a/tools/changelog/0.9.1.md b/tools/changelog/0.9.1.md
@@ -2,7 +2,6 @@
 
 ### Viewer
 
-- Update the way we detect Safari browser in FORGE.Device
 - Fix default background configuration for the main container
 
 ### Scene
@@ -17,7 +16,7 @@
 
 - Don't update texture when the video is paused.
 - Don't render the background when a scene has no media.
-- Unload scene background on scene exit.
+- Unload scene background on scene unload.
 - Fix onBeforeRender and onAfterRender events on Hotspot3D objects.
 - Fix render routine when pipeline has no fx.
 
@@ -28,15 +27,14 @@
 
 ### Audio
 
-
 - Redesign of the HTMLAudioElement loader to solve events never fired on Microsoft Edge.
 - Deactivation of the AudioContext suspend and resume methods for Safari browser compatibility
 
 ### Video
 
 - Video auto quality improvements when you use multiple video sources as quality levels.
 - Fix multiple quality issues on Microsoft browsers.
-- Add `playslinline` attribute for HTMLVideoElement to display the video properly on iOS.
+- Add `playslinline` attribute for HTMLVideoElement to display the video properly on iOS 10.x.
 - Video levels can now target a specific environement. Useful to prevent the use of a too high video resolution on Safari or Firefox.
 
 ### Media
@@ -85,6 +83,7 @@
 
 ### Misc
 
+- Update the way we detect Safari browser in FORGE.Device
 - Remove unused classes CameraViewFinder.js, CameraViewFinderType.js, Debug.js.
 - Cubemap videos on cdn.forgejs.org for testing.
 - Array.prototype.keys polyfill for cubemap media type under Internet Explorer 11.