Skip to content

Commit 63ca1ef

Browse files
committed
Build 3.33.2-sm
1 parent 0e2d5da commit 63ca1ef

7 files changed

Lines changed: 38 additions & 108 deletions

File tree

dist/cytoscape.cjs.js

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -28903,9 +28903,7 @@ var deqNoDrawCost = 0.9; // % of avg frame time that can be used for dequeueing
2890328903
var deqFastCost = 0.9; // % of frame time to be used when >60fps
2890428904
var maxDeqSize = 1; // number of eles to dequeue and render at higher texture in each batch
2890528905
var invalidThreshold = 250; // time threshold for disabling b/c of invalidations
28906-
// SM customization: increased from 4000*4000 to 10000*10000 to support larger graphs
28907-
// without falling back to direct rendering (which is slower for complex scenes).
28908-
var maxLayerArea = 10000 * 10000; // layers can't be bigger than this
28906+
var maxLayerArea = 4000 * 4000; // layers can't be bigger than this
2890928907
var maxLayerDim = 32767; // maximum size for the width/height of layer canvases
2891028908
var useHighQualityEleTxrReqs = true; // whether to use high quality ele txr requests (generally faster and cheaper in the longterm)
2891128909

@@ -28917,9 +28915,6 @@ var LayeredTextureCache = function LayeredTextureCache(renderer) {
2891728915
var cy = r.cy;
2891828916
self.layersByLevel = {}; // e.g. 2 => [ layer1, layer2, ..., layerN ]
2891928917

28920-
// SM customization: persist the bounding box across getLayers() calls so it doesn't
28921-
// need to be recomputed from scratch each time. Cleared on invalidation.
28922-
self.bb = null;
2892328918
self.firstGet = true;
2892428919
self.lastInvalidationTime = performanceNow() - 2 * invalidThreshold;
2892528920
self.skipping = false;
@@ -28996,6 +28991,7 @@ LTCp.getLayers = function (eles, pxRatio, lvl) {
2899628991
var layersByLvl = self.layersByLevel;
2899728992
var scale = Math.pow(2, lvl);
2899828993
var layers = layersByLvl[lvl] = layersByLvl[lvl] || [];
28994+
var bb;
2899928995
var lvlComplete = self.levelIsComplete(lvl, eles);
2900028996
var tmpLayers;
2900128997
var checkTempLevels = function checkTempLevels() {
@@ -29036,30 +29032,19 @@ LTCp.getLayers = function (eles, pxRatio, lvl) {
2903629032
// log('level complete, using existing layers\n--');
2903729033
return layers;
2903829034
}
29039-
29040-
// SM customization: use self.bb (persistent across calls) instead of a local bb variable.
29041-
// Also adds early-exit if the accumulated layer area exceeds maxLayerArea during incremental
29042-
// bounding box computation, preventing massive texture allocation for very large graphs.
29043-
// The loop only runs when self.bb is null (first call or after invalidation).
29044-
function getBb() {
29045-
if (!self.bb) {
29046-
self.bb = makeBoundingBox();
29035+
var getBb = function getBb() {
29036+
if (!bb) {
29037+
bb = makeBoundingBox();
2904729038
for (var i = 0; i < eles.length; i++) {
29048-
var area = self.bb.w * scale * (self.bb.h * scale);
29049-
if (area > maxLayerArea) {
29050-
self.bb = null;
29051-
return null;
29052-
}
29053-
updateBoundingBox(self.bb, eles[i].boundingBox());
29039+
updateBoundingBox(bb, eles[i].boundingBox());
2905429040
}
2905529041
}
29056-
return self.bb;
29057-
}
29042+
return bb;
29043+
};
2905829044
var makeLayer = function makeLayer(opts) {
2905929045
opts = opts || {};
2906029046
var after = opts.after;
29061-
var bb = getBb();
29062-
if (!bb) return null;
29047+
getBb();
2906329048
var w = Math.ceil(bb.w * scale);
2906429049
var h = Math.ceil(bb.h * scale);
2906529050
if (w > maxLayerDim || h > maxLayerDim) {
@@ -29300,8 +29285,6 @@ LTCp.invalidateLayer = function (layer) {
2930029285
return;
2930129286
} // save cycles
2930229287

29303-
// SM customization: clear persistent BB so it's recomputed on next getLayers() call
29304-
this.bb = null;
2930529288
var lvl = layer.level;
2930629289
var eles = layer.eles;
2930729290
var layers = this.layersByLevel[lvl];

dist/cytoscape.esm.min.mjs

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

dist/cytoscape.esm.mjs

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -28901,9 +28901,7 @@ var deqNoDrawCost = 0.9; // % of avg frame time that can be used for dequeueing
2890128901
var deqFastCost = 0.9; // % of frame time to be used when >60fps
2890228902
var maxDeqSize = 1; // number of eles to dequeue and render at higher texture in each batch
2890328903
var invalidThreshold = 250; // time threshold for disabling b/c of invalidations
28904-
// SM customization: increased from 4000*4000 to 10000*10000 to support larger graphs
28905-
// without falling back to direct rendering (which is slower for complex scenes).
28906-
var maxLayerArea = 10000 * 10000; // layers can't be bigger than this
28904+
var maxLayerArea = 4000 * 4000; // layers can't be bigger than this
2890728905
var maxLayerDim = 32767; // maximum size for the width/height of layer canvases
2890828906
var useHighQualityEleTxrReqs = true; // whether to use high quality ele txr requests (generally faster and cheaper in the longterm)
2890928907

@@ -28915,9 +28913,6 @@ var LayeredTextureCache = function LayeredTextureCache(renderer) {
2891528913
var cy = r.cy;
2891628914
self.layersByLevel = {}; // e.g. 2 => [ layer1, layer2, ..., layerN ]
2891728915

28918-
// SM customization: persist the bounding box across getLayers() calls so it doesn't
28919-
// need to be recomputed from scratch each time. Cleared on invalidation.
28920-
self.bb = null;
2892128916
self.firstGet = true;
2892228917
self.lastInvalidationTime = performanceNow() - 2 * invalidThreshold;
2892328918
self.skipping = false;
@@ -28994,6 +28989,7 @@ LTCp.getLayers = function (eles, pxRatio, lvl) {
2899428989
var layersByLvl = self.layersByLevel;
2899528990
var scale = Math.pow(2, lvl);
2899628991
var layers = layersByLvl[lvl] = layersByLvl[lvl] || [];
28992+
var bb;
2899728993
var lvlComplete = self.levelIsComplete(lvl, eles);
2899828994
var tmpLayers;
2899928995
var checkTempLevels = function checkTempLevels() {
@@ -29034,30 +29030,19 @@ LTCp.getLayers = function (eles, pxRatio, lvl) {
2903429030
// log('level complete, using existing layers\n--');
2903529031
return layers;
2903629032
}
29037-
29038-
// SM customization: use self.bb (persistent across calls) instead of a local bb variable.
29039-
// Also adds early-exit if the accumulated layer area exceeds maxLayerArea during incremental
29040-
// bounding box computation, preventing massive texture allocation for very large graphs.
29041-
// The loop only runs when self.bb is null (first call or after invalidation).
29042-
function getBb() {
29043-
if (!self.bb) {
29044-
self.bb = makeBoundingBox();
29033+
var getBb = function getBb() {
29034+
if (!bb) {
29035+
bb = makeBoundingBox();
2904529036
for (var i = 0; i < eles.length; i++) {
29046-
var area = self.bb.w * scale * (self.bb.h * scale);
29047-
if (area > maxLayerArea) {
29048-
self.bb = null;
29049-
return null;
29050-
}
29051-
updateBoundingBox(self.bb, eles[i].boundingBox());
29037+
updateBoundingBox(bb, eles[i].boundingBox());
2905229038
}
2905329039
}
29054-
return self.bb;
29055-
}
29040+
return bb;
29041+
};
2905629042
var makeLayer = function makeLayer(opts) {
2905729043
opts = opts || {};
2905829044
var after = opts.after;
29059-
var bb = getBb();
29060-
if (!bb) return null;
29045+
getBb();
2906129046
var w = Math.ceil(bb.w * scale);
2906229047
var h = Math.ceil(bb.h * scale);
2906329048
if (w > maxLayerDim || h > maxLayerDim) {
@@ -29298,8 +29283,6 @@ LTCp.invalidateLayer = function (layer) {
2929829283
return;
2929929284
} // save cycles
2930029285

29301-
// SM customization: clear persistent BB so it's recomputed on next getLayers() call
29302-
this.bb = null;
2930329286
var lvl = layer.level;
2930429287
var eles = layer.eles;
2930529288
var layers = this.layersByLevel[lvl];

dist/cytoscape.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/cytoscape.umd.js

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -28907,9 +28907,7 @@ var printLayoutInfo;
2890728907
var deqFastCost = 0.9; // % of frame time to be used when >60fps
2890828908
var maxDeqSize = 1; // number of eles to dequeue and render at higher texture in each batch
2890928909
var invalidThreshold = 250; // time threshold for disabling b/c of invalidations
28910-
// SM customization: increased from 4000*4000 to 10000*10000 to support larger graphs
28911-
// without falling back to direct rendering (which is slower for complex scenes).
28912-
var maxLayerArea = 10000 * 10000; // layers can't be bigger than this
28910+
var maxLayerArea = 4000 * 4000; // layers can't be bigger than this
2891328911
var maxLayerDim = 32767; // maximum size for the width/height of layer canvases
2891428912
var useHighQualityEleTxrReqs = true; // whether to use high quality ele txr requests (generally faster and cheaper in the longterm)
2891528913

@@ -28921,9 +28919,6 @@ var printLayoutInfo;
2892128919
var cy = r.cy;
2892228920
self.layersByLevel = {}; // e.g. 2 => [ layer1, layer2, ..., layerN ]
2892328921

28924-
// SM customization: persist the bounding box across getLayers() calls so it doesn't
28925-
// need to be recomputed from scratch each time. Cleared on invalidation.
28926-
self.bb = null;
2892728922
self.firstGet = true;
2892828923
self.lastInvalidationTime = performanceNow() - 2 * invalidThreshold;
2892928924
self.skipping = false;
@@ -29000,6 +28995,7 @@ var printLayoutInfo;
2900028995
var layersByLvl = self.layersByLevel;
2900128996
var scale = Math.pow(2, lvl);
2900228997
var layers = layersByLvl[lvl] = layersByLvl[lvl] || [];
28998+
var bb;
2900328999
var lvlComplete = self.levelIsComplete(lvl, eles);
2900429000
var tmpLayers;
2900529001
var checkTempLevels = function checkTempLevels() {
@@ -29040,30 +29036,19 @@ var printLayoutInfo;
2904029036
// log('level complete, using existing layers\n--');
2904129037
return layers;
2904229038
}
29043-
29044-
// SM customization: use self.bb (persistent across calls) instead of a local bb variable.
29045-
// Also adds early-exit if the accumulated layer area exceeds maxLayerArea during incremental
29046-
// bounding box computation, preventing massive texture allocation for very large graphs.
29047-
// The loop only runs when self.bb is null (first call or after invalidation).
29048-
function getBb() {
29049-
if (!self.bb) {
29050-
self.bb = makeBoundingBox();
29039+
var getBb = function getBb() {
29040+
if (!bb) {
29041+
bb = makeBoundingBox();
2905129042
for (var i = 0; i < eles.length; i++) {
29052-
var area = self.bb.w * scale * (self.bb.h * scale);
29053-
if (area > maxLayerArea) {
29054-
self.bb = null;
29055-
return null;
29056-
}
29057-
updateBoundingBox(self.bb, eles[i].boundingBox());
29043+
updateBoundingBox(bb, eles[i].boundingBox());
2905829044
}
2905929045
}
29060-
return self.bb;
29061-
}
29046+
return bb;
29047+
};
2906229048
var makeLayer = function makeLayer(opts) {
2906329049
opts = opts || {};
2906429050
var after = opts.after;
29065-
var bb = getBb();
29066-
if (!bb) return null;
29051+
getBb();
2906729052
var w = Math.ceil(bb.w * scale);
2906829053
var h = Math.ceil(bb.h * scale);
2906929054
if (w > maxLayerDim || h > maxLayerDim) {
@@ -29304,8 +29289,6 @@ var printLayoutInfo;
2930429289
return;
2930529290
} // save cycles
2930629291

29307-
// SM customization: clear persistent BB so it's recomputed on next getLayers() call
29308-
this.bb = null;
2930929292
var lvl = layer.level;
2931029293
var eles = layer.eles;
2931129294
var layers = this.layersByLevel[lvl];

documentation/js/cytoscape.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/extensions/renderer/canvas/layered-texture-cache.mjs

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ var deqNoDrawCost = 0.9; // % of avg frame time that can be used for dequeueing
1717
var deqFastCost = 0.9; // % of frame time to be used when >60fps
1818
var maxDeqSize = 1; // number of eles to dequeue and render at higher texture in each batch
1919
var invalidThreshold = 250; // time threshold for disabling b/c of invalidations
20-
// SM customization: increased from 4000*4000 to 10000*10000 to support larger graphs
21-
// without falling back to direct rendering (which is slower for complex scenes).
22-
var maxLayerArea = 10000 * 10000; // layers can't be bigger than this
20+
var maxLayerArea = 4000 * 4000; // layers can't be bigger than this
2321
var maxLayerDim = 32767; // maximum size for the width/height of layer canvases
2422
var alwaysQueue = true; // never draw all the layers in a level on a frame; draw directly until all dequeued
2523
var useHighQualityEleTxrReqs = true; // whether to use high quality ele txr requests (generally faster and cheaper in the longterm)
@@ -35,10 +33,6 @@ var LayeredTextureCache = function( renderer ){
3533

3634
self.layersByLevel = {}; // e.g. 2 => [ layer1, layer2, ..., layerN ]
3735

38-
// SM customization: persist the bounding box across getLayers() calls so it doesn't
39-
// need to be recomputed from scratch each time. Cleared on invalidation.
40-
self.bb = null;
41-
4236
self.firstGet = true;
4337

4438
self.lastInvalidationTime = util.performanceNow() - 2*invalidThreshold;
@@ -183,34 +177,24 @@ LTCp.getLayers = function( eles, pxRatio, lvl ){
183177
return layers;
184178
}
185179

186-
// SM customization: use self.bb (persistent across calls) instead of a local bb variable.
187-
// Also adds early-exit if the accumulated layer area exceeds maxLayerArea during incremental
188-
// bounding box computation, preventing massive texture allocation for very large graphs.
189-
// The loop only runs when self.bb is null (first call or after invalidation).
190-
function getBb() {
191-
if( !self.bb ){
192-
self.bb = math.makeBoundingBox();
180+
var getBb = function(){
181+
if( !bb ){
182+
bb = math.makeBoundingBox();
193183

194184
for( var i = 0; i < eles.length; i++ ){
195-
var area = self.bb.w * scale * (self.bb.h * scale);
196-
if (area > maxLayerArea) {
197-
self.bb = null;
198-
return null;
199-
}
200-
math.updateBoundingBox(self.bb, eles[i].boundingBox() );
185+
math.updateBoundingBox( bb, eles[i].boundingBox() );
201186
}
202187
}
203188

204-
return self.bb;
205-
}
189+
return bb;
190+
};
206191

207192
var makeLayer = function( opts ){
208193
opts = opts || {};
209194

210195
var after = opts.after;
211196

212-
const bb = getBb();
213-
if (!bb) return null;
197+
getBb();
214198

215199
var w = Math.ceil( bb.w * scale );
216200
var h = Math.ceil( bb.h * scale );
@@ -473,9 +457,6 @@ LTCp.invalidateLayer = function( layer ){
473457

474458
if( layer.invalid ){ return; } // save cycles
475459

476-
// SM customization: clear persistent BB so it's recomputed on next getLayers() call
477-
this.bb = null;
478-
479460
var lvl = layer.level;
480461
var eles = layer.eles;
481462
var layers = this.layersByLevel[ lvl ];

0 commit comments

Comments
 (0)