@@ -20144,7 +20144,7 @@ string getCoreVersion()
20144
20144
*/
20145
20145
20146
20146
function getCoreVersion(full) {
20147
- return (full ? 'Core: ' : '') + '2.30.5 ';
20147
+ return (full ? 'Core: ' : '') + '2.30.6 ';
20148
20148
}
20149
20149
20150
20150
@@ -23794,7 +23794,14 @@ InspectorStats.prototype.updateStatsPanel = function(stats) {
23794
23794
text2 += stats.debugStr + '<br/>';
23795
23795
}
23796
23796
23797
- let text3 = 'PixelRatio: ' + (window.devicePixelRatio || 1).toFixed(3) +'<br/>'+
23797
+ let device = "WebGL"
23798
+
23799
+ if (renderer.device == 2) {
23800
+ device = "Three"
23801
+ }
23802
+
23803
+ let text3 = 'Device: ' + device +'<br/>'+
23804
+ 'PixelRatio: ' + (window.devicePixelRatio || 1).toFixed(3) +'<br/>'+
23798
23805
'BFRate: ' + Math.round(1000 / (stats.frameTime+0.00001)) +'<br/><br/>';
23799
23806
23800
23807
const map = this.core.getMap();
@@ -27459,7 +27466,7 @@ MapDraw.prototype.getDrawCommandsGpuSize = function(commands) {
27459
27466
gpuNeeded += mesh.gpuSize;
27460
27467
}
27461
27468
27462
- if (texture) {
27469
+ if (texture && !(this.config.mapNoTextures || this.debug.drawWireframe) ) {
27463
27470
gpuNeeded += texture.getGpuSize();
27464
27471
}
27465
27472
}
@@ -27515,7 +27522,7 @@ MapDraw.prototype.areDrawCommandsReady = function(commands, priority, doNotLoad,
27515
27522
const texture = command.texture;
27516
27523
27517
27524
const meshReady = (mesh && mesh.isReady(doNotLoad, priority, checkGpu));
27518
- const textureReady = this.config.mapNoTextures ? true : (!texture || (texture && texture.isReady(doNotLoad, priority, checkGpu)));
27525
+ const textureReady = ( this.config.mapNoTextures || this.debug.drawWireframe) ? true : (!texture || (texture && texture.isReady(doNotLoad, priority, checkGpu)));
27519
27526
27520
27527
if (!(meshReady && textureReady) ) {
27521
27528
ready = false;
@@ -48927,7 +48934,7 @@ ThreeDevice.prototype.drawTileSubmesh = function (cameraPos, index, texture, typ
48927
48934
let drawWireframe = map.draw.debug.drawWireframe;
48928
48935
let gpuTexture = null, t = null;
48929
48936
48930
- if (texture) {
48937
+ if (texture && !(map.draw.config.mapNoTextures || drawWireframe) ) {
48931
48938
gpuTexture = texture.getGpuTexture();
48932
48939
t = texture.getTransform();
48933
48940
}
@@ -101418,23 +101425,27 @@ WebGLDevice.prototype.drawTileSubmesh = function (cameraPos, index, texture, typ
101418
101425
let gpuTexture;
101419
101426
101420
101427
if (texture) {
101421
- gpuTexture = texture.getGpuTexture();
101422
101428
101423
- if (gpuTexture) {
101424
- if (texture.statsCoutner != stats.counter) {
101425
- texture.statsCoutner = stats.counter;
101426
- stats.gpuRenderUsed += gpuTexture.getSize();
101427
- }
101429
+ if (!(draw.config.mapNoTextures || drawWireframe)) {
101430
+ gpuTexture = texture.getGpuTexture();
101428
101431
101429
- this.bindTexture(gpuTexture);
101432
+ if (gpuTexture) {
101433
+ if (texture.statsCoutner != stats.counter) {
101434
+ texture.statsCoutner = stats.counter;
101435
+ stats.gpuRenderUsed += gpuTexture.getSize();
101436
+ }
101430
101437
101431
- if (gpuMask) {
101432
- this.bindTexture(gpuMask, 1);
101433
- }
101438
+ this.bindTexture(gpuTexture);
101434
101439
101435
- } else {
101436
- return;
101440
+ if (gpuMask) {
101441
+ this.bindTexture(gpuMask, 1);
101442
+ }
101443
+
101444
+ } else {
101445
+ return;
101446
+ }
101437
101447
}
101448
+
101438
101449
} else if (type != 3 && type != 1 && type != 2) {
101439
101450
return;
101440
101451
}
0 commit comments