Skip to content

Commit 1097e34

Browse files
archmojarchmoj
committed
remove stretch in gl-axes3d gl-plot2d and text-cache
1 parent 673b33e commit 1097e34

File tree

3 files changed

+21
-43
lines changed

3 files changed

+21
-43
lines changed

‎stackgl_modules/index.js‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11927,7 +11927,6 @@ function Axes(gl) {
1192711927
this.tickFont = [ 'sans-serif', 'sans-serif', 'sans-serif' ]
1192811928
this.tickFontStyle = [ 'normal', 'normal', 'normal' ]
1192911929
this.tickFontWeight = [ 'normal', 'normal', 'normal' ]
11930-
this.tickFontStretch = [ 'normal', 'normal', 'normal' ]
1193111930
this.tickFontVariant = [ 'normal', 'normal', 'normal' ]
1193211931
this.tickSize = [ 12, 12, 12 ]
1193311932
this.tickAngle = [ 0, 0, 0 ]
@@ -11945,7 +11944,6 @@ function Axes(gl) {
1194511944
this.labelFont = [ 'sans-serif', 'sans-serif', 'sans-serif' ]
1194611945
this.labelFontStyle = [ 'normal', 'normal', 'normal' ]
1194711946
this.labelFontWeight = [ 'normal', 'normal', 'normal' ]
11948-
this.labelFontStretch = [ 'normal', 'normal', 'normal' ]
1194911947
this.labelFontVariant = [ 'normal', 'normal', 'normal' ]
1195011948
this.labelSize = [ 20, 20, 20 ]
1195111949
this.labelAngle = [ 0, 0, 0 ]
@@ -12088,7 +12086,6 @@ i_loop:
1208812086
if(STRING('tickFont')) ticksUpdate = true
1208912087
if(STRING('tickFontStyle')) ticksUpdate = true
1209012088
if(STRING('tickFontWeight')) ticksUpdate = true
12091-
if(STRING('tickFontStretch')) ticksUpdate = true
1209212089
if(STRING('tickFontVariant')) ticksUpdate = true
1209312090

1209412091
NUMBER('tickSize')
@@ -12102,7 +12099,6 @@ i_loop:
1210212099
if(STRING('labelFont')) labelUpdate = true
1210312100
if(STRING('labelFontStyle')) labelUpdate = true
1210412101
if(STRING('labelFontWeight')) labelUpdate = true
12105-
if(STRING('labelFontStretch')) labelUpdate = true
1210612102
if(STRING('labelFontVariant')) labelUpdate = true
1210712103

1210812104
BOOLEAN('labelEnable')
@@ -12142,21 +12138,18 @@ i_loop:
1214212138
family: this.labelFont[0],
1214312139
style: this.labelFontStyle[0],
1214412140
weight: this.labelFontWeight[0],
12145-
stretch: this.labelFontStretch[0],
1214612141
variant: this.labelFontVariant[0],
1214712142
},
1214812143
{
1214912144
family: this.labelFont[1],
1215012145
style: this.labelFontStyle[1],
1215112146
weight: this.labelFontWeight[1],
12152-
stretch: this.labelFontStretch[1],
1215312147
variant: this.labelFontVariant[1],
1215412148
},
1215512149
{
1215612150
family: this.labelFont[2],
1215712151
style: this.labelFontStyle[2],
1215812152
weight: this.labelFontWeight[2],
12159-
stretch: this.labelFontStretch[2],
1216012153
variant: this.labelFontVariant[2],
1216112154
}
1216212155
]
@@ -12166,21 +12159,18 @@ i_loop:
1216612159
family: this.tickFont[0],
1216712160
style: this.tickFontStyle[0],
1216812161
weight: this.tickFontWeight[0],
12169-
stretch: this.tickFontStretch[0],
1217012162
variant: this.tickFontVariant[0],
1217112163
},
1217212164
{
1217312165
family: this.tickFont[1],
1217412166
style: this.tickFontStyle[1],
1217512167
weight: this.tickFontWeight[1],
12176-
stretch: this.tickFontStretch[1],
1217712168
variant: this.tickFontVariant[1],
1217812169
},
1217912170
{
1218012171
family: this.tickFont[2],
1218112172
style: this.tickFontStyle[2],
1218212173
weight: this.tickFontWeight[2],
12183-
stretch: this.tickFontStretch[2],
1218412174
variant: this.tickFontVariant[2],
1218512175
}
1218612176
]
@@ -13251,7 +13241,6 @@ proto.update = function(bounds, labels, labelFont, ticks, tickFont) {
1325113241
var fontKey = [
1325213242
font.style,
1325313243
font.weight,
13254-
font.stretch,
1325513244
font.variant,
1325613245
font.family
1325713246
].join('_')
@@ -13267,7 +13256,6 @@ proto.update = function(bounds, labels, labelFont, ticks, tickFont) {
1326713256
font: font.family,
1326813257
fontStyle: font.style,
1326913258
fontWeight: font.weight,
13270-
fontStretch: font.stretch,
1327113259
fontVariant: font.variant,
1327213260
textAlign: 'center',
1327313261
textBaseline: 'middle',
@@ -13325,7 +13313,6 @@ proto.update = function(bounds, labels, labelFont, ticks, tickFont) {
1332513313
family: ticks[d][i].font || tickFont[d].family,
1332613314
style: tickFont[d].fontStyle || tickFont[d].style,
1332713315
weight: tickFont[d].fontWeight || tickFont[d].weight,
13328-
stretch: tickFont[d].fontStretch || tickFont[d].stretch,
1332913316
variant: tickFont[d].fontVariant || tickFont[d].variant,
1333013317
}
1333113318

@@ -19352,7 +19339,6 @@ proto.update = function(options) {
1935219339
var font = tick.font || 'sans-serif'
1935319340
var fontStyle = tick.fontStyle || 'normal'
1935419341
var fontWeight = tick.fontWeight || 'normal'
19355-
var fontStretch = tick.fontStretch || 'normal'
1935619342
var fontVariant = tick.fontVariant || 'normal'
1935719343
scale = (tick.fontSize || 12)
1935819344

@@ -19364,7 +19350,6 @@ proto.update = function(options) {
1936419350
data = getText(font, rows[r], {
1936519351
fontStyle: fontStyle,
1936619352
fontWeight: fontWeight,
19367-
fontStretch: fontStretch,
1936819353
fontVariant: fontVariant
1936919354
}).data
1937019355
for (j = 0; j < data.length; j += 2) {
@@ -19390,7 +19375,6 @@ proto.update = function(options) {
1939019375
data = getText(options.labelFont[dimension], options.labels[dimension], {
1939119376
fontStyle: options.labelFontStyle[dimension],
1939219377
fontWeight: options.labelFontWeight[dimension],
19393-
fontStretch: options.labelFontStretch[dimension],
1939419378
fontVariant: options.labelFontVariant[dimension],
1939519379
textAlign: 'center'
1939619380
}).data
@@ -19409,7 +19393,6 @@ proto.update = function(options) {
1940919393
data = getText(options.titleFont, options.title, {
1941019394
fontStyle: options.titleFontStyle,
1941119395
fontWeight: options.titleFontWeight,
19412-
fontStretch: options.titleFontStretch,
1941319396
fontVariant: options.titleFontVariant,
1941419397
}).data
1941519398
scale = options.titleSize
@@ -19950,15 +19933,13 @@ proto.update = function(options) {
1995019933
labelFont: options.labelFont || ['sans-serif', 'sans-serif'],
1995119934
labelFontStyle: options.labelFontStyle || ['normal', 'normal'],
1995219935
labelFontWeight: options.labelFontWeight || ['normal', 'normal'],
19953-
labelFontStretch: options.labelFontStretch || ['normal', 'normal'],
1995419936
labelFontVariant: options.labelFontVariant || ['normal', 'normal'],
1995519937

1995619938
title: options.title || '',
1995719939
titleSize: options.titleSize || 18,
1995819940
titleFont: options.titleFont || 'sans-serif',
1995919941
titleFontStyle: options.titleFontStyle || 'normal',
1996019942
titleFontWeight: options.titleFontWeight || 'normal',
19961-
titleFontStretch: options.titleFontStretch || 'normal',
1996219943
titleFontVariant: options.titleFontVariant || 'normal'
1996319944
})
1996419945

@@ -40257,13 +40238,11 @@ function textGet(font, text, opts) {
4025740238

4025840239
var fontStyle = opts.fontStyle || 'normal'
4025940240
var fontWeight = opts.fontWeight || 'normal'
40260-
var fontStretch = opts.fontStretch || 'normal'
4026140241
var fontVariant = opts.fontVariant || 'normal'
4026240242

4026340243
var fontKey = [
4026440244
fontStyle,
4026540245
fontWeight,
40266-
fontStretch,
4026740246
fontVariant,
4026840247
font
4026940248
].join('_')
@@ -40285,7 +40264,6 @@ function textGet(font, text, opts) {
4028540264
font: font,
4028640265
fontStyle: fontStyle,
4028740266
fontWeight: fontWeight,
40288-
fontStretch: fontStretch,
4028940267
fontVariant: fontVariant,
4029040268
textAlign: opts.textAlign || 'left',
4029140269
textBaseline: 'alphabetic',

‎stackgl_modules/package-lock.json‎

Lines changed: 19 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎stackgl_modules/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
"box-intersect": "plotly/box-intersect#v1.1.0",
1414
"convex-hull": "^1.0.3",
1515
"delaunay-triangulate": "^1.1.6",
16-
"gl-axes3d": "github:gl-vis/gl-axes3d#445a7aad8fe75ea791ac98a1960cff2dab4412c3",
16+
"gl-axes3d": "github:gl-vis/gl-axes3d#dae56c2e455a3f754f7dfe9aa74389a109df08a9",
1717
"gl-cone3d": "^1.6.0",
1818
"gl-error3d": "^1.0.16",
1919
"gl-heatmap2d": "^1.1.1",
2020
"gl-line3d": "1.2.1",
2121
"gl-mesh3d": "^2.3.1",
22-
"gl-plot2d": "github:gl-vis/gl-plot2d#bb6788ee546f4da8550faf2cc4be3632fbb4a11d",
22+
"gl-plot2d": "github:gl-vis/gl-plot2d#ac02a12ec9fa5283a79c042b900dfd0707c43891",
2323
"gl-plot3d": "^2.4.7",
2424
"gl-pointcloud2d": "^1.0.3",
2525
"gl-scatter3d": "github:gl-vis/gl-scatter3d#eeb947a712fc6a17fa0dc1775397976de926887a",

0 commit comments

Comments
 (0)