From b83875e9cb4e8284acd41af5dc2e7413b85f9113 Mon Sep 17 00:00:00 2001 From: sweber <webers@in.tum.de> Date: Tue, 27 Oct 2015 16:22:51 +0100 Subject: [PATCH] [NRRPLT-2785] small fixes: disable pointlight shadowmap, 100% local NRP connection Change-Id: I9f4740500d5a188940abacd0e01dfb3ee57ce3bd --- gz3d/build/gz3d.js | 9 +++++---- gz3d/src/gziface.js | 3 +-- gz3d/src/gzscene.js | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/gz3d/build/gz3d.js b/gz3d/build/gz3d.js index 48e52a7..e2b9a75 100644 --- a/gz3d/build/gz3d.js +++ b/gz3d/build/gz3d.js @@ -2068,7 +2068,7 @@ GZ3D.GZIface.prototype.connect = function() { // connect to websocket var url = GZ3D.webSocketUrl; - if (!localStorage.getItem('localmode.forceuser')) { + if (localStorage.getItem('localmode.forceuser') === 'false') { var token = []; if (localStorage.getItem('tokens-neurorobotics-ui@https://services.humanbrainproject.eu/oidc')) { try { @@ -3013,7 +3013,6 @@ GZ3D.GZIface.prototype.createSensorFromMsg = function(sensor) // view.camera.add( cameraHelper ); view.type = sensor.type; - console.log('view type: ' + view.type); sensorObj.add(view.camera); } @@ -6606,10 +6605,12 @@ GZ3D.Scene.prototype.createPointLight = function(obj, color, intensity, { lightObj.distance = distance; } - if (cast_shadows) + + // point light shadow maps not supported yet, disable for now + /*if (cast_shadows) { lightObj.castShadow = cast_shadows; - } + }*/ var helperGeometry = new THREE.OctahedronGeometry(0.25, 0); helperGeometry.applyMatrix(new THREE.Matrix4().makeRotationX(Math.PI/2)); diff --git a/gz3d/src/gziface.js b/gz3d/src/gziface.js index 5e28028..9a90cbc 100644 --- a/gz3d/src/gziface.js +++ b/gz3d/src/gziface.js @@ -47,7 +47,7 @@ GZ3D.GZIface.prototype.connect = function() { // connect to websocket var url = GZ3D.webSocketUrl; - if (!localStorage.getItem('localmode.forceuser')) { + if (localStorage.getItem('localmode.forceuser') === 'false') { var token = []; if (localStorage.getItem('tokens-neurorobotics-ui@https://services.humanbrainproject.eu/oidc')) { try { @@ -992,7 +992,6 @@ GZ3D.GZIface.prototype.createSensorFromMsg = function(sensor) // view.camera.add( cameraHelper ); view.type = sensor.type; - console.log('view type: ' + view.type); sensorObj.add(view.camera); } diff --git a/gz3d/src/gzscene.js b/gz3d/src/gzscene.js index ebac0df..c618a6e 100644 --- a/gz3d/src/gzscene.js +++ b/gz3d/src/gzscene.js @@ -1080,10 +1080,11 @@ GZ3D.Scene.prototype.createPointLight = function(obj, color, intensity, lightObj.distance = distance; } - if (cast_shadows) + // point light shadow maps not supported yet, disable for now + /*if (cast_shadows) { lightObj.castShadow = cast_shadows; - } + }*/ var helperGeometry = new THREE.OctahedronGeometry(0.25, 0); helperGeometry.applyMatrix(new THREE.Matrix4().makeRotationX(Math.PI/2)); -- GitLab