From 938befbf5dc08cc658d058cd2581314269bf4a27 Mon Sep 17 00:00:00 2001
From: Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de>
Date: Sat, 16 Nov 2013 01:03:47 +0100
Subject: Fixed issues with imageFormat suffix

---
 apps/samples/vrml/viewer-webgl.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/samples/vrml/viewer-webgl.js b/apps/samples/vrml/viewer-webgl.js
index e0827d9..aa98761 100644
--- a/apps/samples/vrml/viewer-webgl.js
+++ b/apps/samples/vrml/viewer-webgl.js
@@ -30,11 +30,11 @@ function VRMLViewer(element, params) {
     this.pose = pose;
   }
   
-  this.enableMovies = true;
+  this.enableMovies = false;
   this.enableDND = true;
-  this.enableWebGL = false;
-  this.enableSceneshots = true;
-  this.enableDraggables = true;
+  this.enableWebGL = true;
+  this.enableSceneshots = false;
+  this.enableDraggables = false;
   this.treeNavigationStyle = true;
   this.listNavigationStyle = true;
   this.listDirectory = "";
@@ -99,7 +99,7 @@ function VRMLViewer(element, params) {
     if (!self.imagePath)
       self.imagePath = self.listDirectory + "latest";
   
-    if (!self.imageFormat.substring(0, 1) != ".")
+    if (!self.imageFormat.substring(0, 1) == ".")
       self.imageFormat = "." + self.imageFormat;
   }
   normalizeParams();
@@ -171,7 +171,7 @@ function VRMLViewer(element, params) {
         osgDB.Promise.when(getWebGLModel(self.serverURL + self.imagePath + '.osgjs')).then(function(model) {       
           self.webGLViewer.setSceneData(model);
           if (!webGLManipulatorsSetup) {
-            self.webGLViewer.setupManipulator();
+            self.webGLViewer.setupManipulator(new osgGA.OrbitManipulator(), false);
             self.webGLViewer.getManipulator().computeHomePosition();  
           }
           webGLManipulatorsSetup = true;
@@ -711,9 +711,9 @@ function VRMLViewer(element, params) {
                  avatarPose.width=60;
                  avatarPose.height=60;
                  var avatarImgUrl = urlSuffixForPose(avatarPose);
-                 avatar.innerHTML = '<img src=' + self.imagePath + self.imageFormat + avatarImgUrl + ' /> ';
+                 avatar.innerHTML = '<img src=' + self.serverURL + self.imagePath + self.imageFormat + avatarImgUrl + ' /> ';
                  item.srcEcc = "VRMLViewer";
-                 item.iconPoseUrl = self.imagePath + self.imageFormat + avatarImgUrl;
+                 item.iconPoseUrl = self.serverURL + self.imagePath + self.imageFormat + avatarImgUrl;
                  item.imagePath = self.imagePath;
                  item.imageFormat = self.imageFormat;
                  item.serverURL = self.serverURL;
@@ -826,7 +826,7 @@ function VRMLViewer(element, params) {
           if (enable) {
 
             array.forEach(dojo.query(".treeNavigation", element), function(entry, i) {
-              entry.style.display = "inline";
+              entry.style.display = "";
             });
           
             if (!self.fileTreeStore) {
-- 
cgit v0.12