Skip to content
This repository has been archived by the owner on Jun 27, 2024. It is now read-only.

Commit

Permalink
Merge branch 'dot-registry-zzd/#P200-1245' into 'master'
Browse files Browse the repository at this point in the history
Dot registry zzd/#p200 1245

See merge request common/frontend/brainbrowser!460
  • Loading branch information
liangfz-kit committed Sep 20, 2023
2 parents 58e8102 + 06df590 commit 9adb8f5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ngiq/brainbrowser",
"version": "2.9.6",
"version": "2.9.8",
"license": "GNU Affero GPL 3.0",
"devDependencies": {
"bower": "~1.8.8",
Expand Down
6 changes: 4 additions & 2 deletions src/brainbrowser/surface-viewer/modules/rendering.js
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ BrainBrowser.SurfaceViewer.modules.rendering = function(viewer, isBackgroundWhit
radius = radius || 2;
radius = radius >= 0 ? radius : 0;
color = color >= 0 ? color : 0xFF0000;
const { opacity = 0, isBaseMeterial = false } = materialOption || {};
const { opacity = 0, isBaseMeterial = false, name = 'Dot', otherPorps = {} } = materialOption || {};
const isOpacity = !!opacity;
shininess = shininess === undefined ? 10 : shininess;

Expand All @@ -323,15 +323,17 @@ BrainBrowser.SurfaceViewer.modules.rendering = function(viewer, isBackgroundWhit
color: color,
transparent: isOpacity,
opacity,
...otherPorps,
}) :
new THREE.MeshPhongMaterial({
color: color,
specular: 0xFFFFFF,
shininess,
...otherPorps,
});

var sphere = new THREE.Mesh(geometry, material);
sphere.name = 'Dot';
sphere.name = name;
if (viewer.model.children[0] && viewer.model.children[0].userData.recentered) {
sphere.position.set(
x - viewer.model.children[0].userData.centroid.x,
Expand Down

0 comments on commit 9adb8f5

Please sign in to comment.