From 19b81d0b4c5aef505768455d598ffb0c29a51d5d Mon Sep 17 00:00:00 2001 From: kovacsv Date: Sun, 18 Sep 2022 11:11:23 +0200 Subject: [PATCH] Fix field of view during embedding. --- sandbox/embed_camera.html | 50 +++++++++++++++++++++++ sandbox/embed_iframe_camera.html | 17 -------- sandbox/embed_selfhost_camera.html | 34 --------------- source/engine/parameters/parameterlist.js | 2 +- source/engine/viewer/viewer.js | 2 + 5 files changed, 53 insertions(+), 52 deletions(-) create mode 100644 sandbox/embed_camera.html delete mode 100644 sandbox/embed_iframe_camera.html delete mode 100644 sandbox/embed_selfhost_camera.html diff --git a/sandbox/embed_camera.html b/sandbox/embed_camera.html new file mode 100644 index 0000000..f3c6685 --- /dev/null +++ b/sandbox/embed_camera.html @@ -0,0 +1,50 @@ + + + + + + + + Online 3D Viewer + + + + + + + + + + + + + +
+
+ +
+
+ + + diff --git a/sandbox/embed_iframe_camera.html b/sandbox/embed_iframe_camera.html deleted file mode 100644 index 5514433..0000000 --- a/sandbox/embed_iframe_camera.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - Online 3D Viewer - - - - - - - diff --git a/sandbox/embed_selfhost_camera.html b/sandbox/embed_selfhost_camera.html deleted file mode 100644 index 8ef4c3d..0000000 --- a/sandbox/embed_selfhost_camera.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - Online 3D Viewer - - - - - - - - - -
-
- - - diff --git a/source/engine/parameters/parameterlist.js b/source/engine/parameters/parameterlist.js index ccc90b5..37290fc 100644 --- a/source/engine/parameters/parameterlist.js +++ b/source/engine/parameters/parameterlist.js @@ -61,7 +61,7 @@ export let ParameterConverter = return null; } let paramParts = str.split (','); - if (paramParts.length < 9) { + if (paramParts.length !== 9 && paramParts.length !== 10) { return null; } diff --git a/source/engine/viewer/viewer.js b/source/engine/viewer/viewer.js index 46653b2..25f5182 100644 --- a/source/engine/viewer/viewer.js +++ b/source/engine/viewer/viewer.js @@ -299,6 +299,8 @@ export class Viewer SetCamera (camera) { this.navigation.SetCamera (camera); + this.camera.fov = camera.fov; + this.camera.updateProjectionMatrix (); this.Render (); }