Handle width / height correctly

2 files changed, 10 insertions, 5 deletions

diff --git a/apps/samples/vrml/viewer-webgl.js b/apps/samples/vrml/viewer-webgl.js
index aa98761..c828b1f 100644
--- a/apps/samples/vrml/viewer-webgl.js
+++ b/apps/samples/vrml/viewer-webgl.js
@@ -23,8 +23,8 @@ function VRMLViewer(element, params) {
       x: 0,
       y: 0,
       z: 0,
-      width: this.width,
-      height: this.height,
+      width: false,
+      height: false,
       autorotate: false,
     }
     this.pose = pose;
@@ -55,6 +55,11 @@ function VRMLViewer(element, params) {
     }
   }
   
+  if (!self.pose.width)
+    self.pose.width = self.width;
+  if (!self.pose.height)
+    self.pose.height = self.height;
+  
   var hasWebGL = function() {
     try {
       if (!window.WebGLRenderingContext) {
diff --git a/apps/samples/vrml/viewer.html b/apps/samples/vrml/viewer.html
index 873da0e..28ffbf3 100644
--- a/apps/samples/vrml/viewer.html
+++ b/apps/samples/vrml/viewer.html
@@ -69,10 +69,10 @@
 					  x           : 0,
 					  y           : 0,
 					  z           : 0,
-					  width       : 400,
-					  height      : 400,
 					  autorotate  : true
 					},
+					height: 600,
+					width: 800,
 					enableMovies: false,
 					enableDND: false,
 					enableWebGL: true,
@@ -82,7 +82,7 @@
 					treeNavigationStyle: true,
 					listDirectory: "/hard_mp",
 					imagePath: "/hard_mp/HARD_MP_VAL_000",
-					imageFormat: "png",
+					imageFormat: ".png",
 					serverURL: "http://localhost:8081/vrml",
 				});
 				//var viewer2 = new VRMLViewer("scene2");