handle font styles in gl-scatter3d

Author: archmoj

src/traces/scatter3d/convert.js

@@ -296,11 +296,11 @@ function convertPlotlyOptions(scene, data) {
         params.textOffset = calculateTextOffset(data.textposition);
         params.textColor = formatColor(data.textfont, 1, len);
         params.textSize = formatParam(data.textfont.size, len, Lib.identity, 12);
-        params.textFont = data.textfont.family;  // arrayOk === false
-        params.textWeight = data.textfont.weight;  // arrayOk === false
-        params.textStyle = data.textfont.style;  // arrayOk === false
-        params.textStretch = data.textfont.stretch;  // arrayOk === false
-        params.textVariant = data.textfont.variant;  // arrayOk === false
+        params.textFontFamily = data.textfont.family;  // arrayOk === false
+        params.textFontWeight = data.textfont.weight;  // arrayOk === false
+        params.textFontStyle = data.textfont.style;  // arrayOk === false
+        params.textFontStretch = data.textfont.stretch;  // arrayOk === false
+        params.textFontVariant = data.textfont.variant;  // arrayOk === false
         params.textAngle = 0;
     }
 
@@ -449,7 +449,11 @@ proto.update = function(data) {
         size: options.textSize,
         angle: options.textAngle,
         alignment: options.textOffset,
-        font: options.textFont,
+        font: options.textFontFamily,
+        fontWeight: options.textFontWeight,
+        fontStyle: options.textFontStyle,
+        fontStretch: options.textFontStretch,
+        fontVariant: options.textFontVariant,
         orthographic: true,
         lineWidth: 0,
         project: false,

stackgl_modules/index.js

@@ -21493,9 +21493,17 @@ module.exports = getGlyph
 var GLYPH_CACHE = {}
 
 function getGlyph(symbol, font, pixelRatio) {
-  var fontCache = GLYPH_CACHE[font]
+  var fontKey = [
+    font.style,
+    font.weight,
+    font.stretch,
+    font.variant,
+    font.family
+  ].join('_')
+
+  var fontCache = GLYPH_CACHE[fontKey]
   if(!fontCache) {
-    fontCache = GLYPH_CACHE[font] = {}
+    fontCache = GLYPH_CACHE[fontKey] = {}
   }
   if(symbol in fontCache) {
     return fontCache[symbol]
@@ -21505,7 +21513,11 @@ function getGlyph(symbol, font, pixelRatio) {
     textAlign: "center",
     textBaseline: "middle",
     lineHeight: 1.0,
-    font: font,
+    font: font.family,
+    fontStyle: font.style,
+    fontWeight: font.weight,
+    fontStretch: font.stretch,
+    fontVariant: font.variant,
     lineSpacing: 1.25,
     styletags: {
       breaklines:true,
@@ -22133,7 +22145,14 @@ proto.update = function(options) {
   var points = options.position
 
   //Text font
-  var font      = options.font      || 'normal'
+  var font = {
+    family: options.font || 'normal',
+    style: options.fontStyle || 'normal',
+    weight: options.fontWeight || 'normal',
+    stretch: options.fontStretch || 'normal',
+    variant: options.fontVariant || 'normal'
+  }
+
   var alignment = options.alignment || [0,0]
 
   var alignmentX;

stackgl_modules/package-lock.json

@@ -22,7 +22,7 @@
     "gl-plot2d": "^1.4.5",
     "gl-plot3d": "^2.4.7",
     "gl-pointcloud2d": "^1.0.3",
-    "gl-scatter3d": "^1.2.3",
+    "gl-scatter3d": "github:gl-vis/gl-scatter3d#eeb947a712fc6a17fa0dc1775397976de926887a",
     "gl-select-box": "^1.0.4",
     "gl-shader": "4.3.1",
     "gl-spikes2d": "^1.0.2",