Little refactoring.

natacha-beck · natacha-beck · commit 3ee2b5fc4524 · 2016-09-16T14:19:52.000-04:00
diff --git a/src/brainbrowser/surface-viewer/modules/rendering.js b/src/brainbrowser/surface-viewer/modules/rendering.js
@@ -575,7 +575,7 @@ BrainBrowser.SurfaceViewer.modules.rendering = function(viewer) {
     intersects = raycaster.intersectObject(model, true);
 
     for (i = 0; i < intersects.length; i++) {
-      intersects[i].object.userData.pick_ignore = (intersects[i].object.material.opacity < opacity_threshold) ? true : false;
+      intersects[i].object.userData.pick_ignore = (intersects[i].object.material.opacity < opacity_threshold);
       if (!intersects[i].object.userData.pick_ignore) {
         intersection = intersects[i];
         break;
diff --git a/src/brainbrowser/surface-viewer/modules/views.js b/src/brainbrowser/surface-viewer/modules/views.js
@@ -308,7 +308,7 @@ BrainBrowser.SurfaceViewer.modules.views = function(viewer) {
   }
 
   function toggleWireframe(shape, wireframe, is_wireframe, keep_surface) {
-    shape.material.visible = keep_surface === true ? true : !is_wireframe;
+    shape.material.visible = keep_surface || !is_wireframe;
     wireframe.material.visible = is_wireframe;
     viewer.updated = true;
   }

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ BrainBrowser.SurfaceViewer.modules.views = function(viewer) {`
`308`	`308`	`}`
`309`	`309`
`310`	`310`	`function toggleWireframe(shape, wireframe, is_wireframe, keep_surface) {`
`311`		`- shape.material.visible = keep_surface === true ? true : !is_wireframe;`
	`311`	`+ shape.material.visible = keep_surface \|\| !is_wireframe;`
`312`	`312`	`wireframe.material.visible = is_wireframe;`
`313`	`313`	`viewer.updated = true;`
`314`	`314`	`}`