zincjs 2.2.0 → 2.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/zinc.js +3 -3
- package/build/zinc.js.map +1 -1
- package/package.json +6 -2
- package/src/primitives/glyphset.js +1 -1
- package/src/primitives/label.js +6 -1
- package/src/sceneLoader.js +8 -2
- package/src/utilities.js +2 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "zincjs",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.3.0",
|
|
4
4
|
"description": "ZincJS (Web-based-Zinc-Visualisation)",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "build/zinc.js",
|
|
@@ -46,7 +46,11 @@
|
|
|
46
46
|
},
|
|
47
47
|
"homepage": "http://alan-wu.github.io/ZincJS/",
|
|
48
48
|
"engines": {
|
|
49
|
-
"node": "
|
|
49
|
+
"node": "24.20.0"
|
|
50
|
+
},
|
|
51
|
+
"allowScripts": {
|
|
52
|
+
"gl@8.1.6": true,
|
|
53
|
+
"msw@2.14.6": true
|
|
50
54
|
},
|
|
51
55
|
"devDependencies": {
|
|
52
56
|
"@vitest/coverage-v8": "^4.1.11",
|
|
@@ -461,7 +461,7 @@ const Glyphset = function () {
|
|
|
461
461
|
this.morph.add(glyph.getGroup());
|
|
462
462
|
}
|
|
463
463
|
//Only display labels if the label list is available
|
|
464
|
-
if (labels && displayLabels) {
|
|
464
|
+
if (labels && labels.length > 0 && displayLabels) {
|
|
465
465
|
this.showLabel();
|
|
466
466
|
}
|
|
467
467
|
//Update the transformation of the glyphs.
|
package/src/primitives/label.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import * as THREE from 'three';
|
|
1
2
|
import SpriteTextModule from 'three-spritetext';
|
|
2
3
|
const SpriteText = SpriteTextModule.default || SpriteTextModule;
|
|
3
4
|
|
|
@@ -24,8 +25,12 @@ const Label = function (textIn, colourIn) {
|
|
|
24
25
|
else
|
|
25
26
|
sprite = new SpriteText(text, 0.012);
|
|
26
27
|
sprite.fontFace = "Asap";
|
|
28
|
+
sprite.fontSize = 90;
|
|
27
29
|
sprite.fontWeight = fontWeight;
|
|
28
|
-
sprite.material.map.generateMipmaps =
|
|
30
|
+
sprite.material.map.generateMipmaps = true;
|
|
31
|
+
sprite.material.map.anisotropy = 4;
|
|
32
|
+
sprite.material.minFilter = THREE.LinearMipmapLinearFilter; // Smooth downscaling
|
|
33
|
+
sprite.material.magFilter = THREE.LinearFilter;
|
|
29
34
|
sprite.material.sizeAttenuation = false;
|
|
30
35
|
sprite.center.x = -0.05;
|
|
31
36
|
sprite.center.y = 0;
|
package/src/sceneLoader.js
CHANGED
|
@@ -284,7 +284,10 @@ const SceneLoader = function (sceneIn) {
|
|
|
284
284
|
}
|
|
285
285
|
let isInline = (options && options.isInline) ? options.isInline : undefined;
|
|
286
286
|
let anatomicalId = (options && options.anatomicalId) ? options.anatomicalId : undefined;
|
|
287
|
-
let displayLabels = options?.displayLabels
|
|
287
|
+
let displayLabels = options?.displayLabels;
|
|
288
|
+
if (displayLabels === undefined) {
|
|
289
|
+
displayLabels = true;
|
|
290
|
+
}
|
|
288
291
|
let renderOrder = (options && "renderOrder" in options) ? options.renderOrder : undefined;
|
|
289
292
|
const newGlyphset = new Glyphset();
|
|
290
293
|
newGlyphset.setDuration(scene.getDuration());
|
|
@@ -760,7 +763,10 @@ const SceneLoader = function (sceneIn) {
|
|
|
760
763
|
} else {
|
|
761
764
|
newGeometryURL = item.Inline.GlyphGeometriesURL;
|
|
762
765
|
}
|
|
763
|
-
options.displayLabels = item.
|
|
766
|
+
options.displayLabels = item.DisplayLabels;
|
|
767
|
+
if (options.displayLabels === undefined) {
|
|
768
|
+
options.displayLabels = true;
|
|
769
|
+
}
|
|
764
770
|
options.loaderOptions.isGlyphsets = true;
|
|
765
771
|
this.loadGlyphsetURL(region, newURL, newGeometryURL, groupName, finishCallback, options);
|
|
766
772
|
break;
|
package/src/utilities.js
CHANGED
|
@@ -732,10 +732,11 @@ function getCircularTexture() {
|
|
|
732
732
|
|
|
733
733
|
function createNewSpriteText(text, height, colour, font, pixel, weight) {
|
|
734
734
|
const sprite = new SpriteText(text, height, colour, font, pixel, weight);
|
|
735
|
+
sprite.canvasScale = 4;
|
|
735
736
|
sprite.fontFace = font;
|
|
736
737
|
sprite.fontSize = pixel;
|
|
737
738
|
sprite.fontWeight = weight;
|
|
738
|
-
sprite.material.map.generateMipmaps =
|
|
739
|
+
sprite.material.map.generateMipmaps = true;
|
|
739
740
|
sprite.material.map.anisotropy = 4;
|
|
740
741
|
sprite.material.sizeAttenuation = false;
|
|
741
742
|
sprite.material.alphaTest = 0.5;
|