Skip to content

Commit 5f7c072

Browse files
committed
Fix generateMip vs noMipMap
1 parent 5b1b392 commit 5f7c072

24 files changed

+10374
-10373
lines changed

dist/preview release/babylon.d.ts

Lines changed: 1712 additions & 1713 deletions
Large diffs are not rendered by default.

dist/preview release/babylon.js

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

dist/preview release/babylon.max.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9118,7 +9118,7 @@ var BABYLON;
91189118
}
91199119
scene._addPendingData(texture);
91209120
texture.url = url;
9121-
texture.noMipmap = noMipmap;
9121+
texture.generateMipMaps = !noMipmap;
91229122
texture.references = 1;
91239123
texture.samplingMode = samplingMode;
91249124
texture.onLoadedCallbacks = [];
@@ -9749,7 +9749,7 @@ var BABYLON;
97499749
texture.url = rootUrl;
97509750
texture.references = 1;
97519751
texture.onLoadedCallbacks = [];
9752-
texture.noMipmap = noMipmap;
9752+
texture.generateMipMaps = !noMipmap;
97539753
var isKTX = false;
97549754
var isDDS = false;
97559755
var lastDot = rootUrl.lastIndexOf('.');
@@ -9897,7 +9897,7 @@ var BABYLON;
98979897
var texture = gl.createTexture();
98989898
texture.isCube = true;
98999899
texture.references = 1;
9900-
texture.noMipmap = !generateMipMaps;
9900+
texture.generateMipMaps = generateMipMaps;
99019901
texture.format = format;
99029902
texture.type = type;
99039903
var textureType = this._getWebGLTextureType(type);
@@ -9917,7 +9917,6 @@ var BABYLON;
99179917
if (!isPot) {
99189918
generateMipMaps = false;
99199919
}
9920-
texture.generateMipMaps = generateMipMaps;
99219920
// Upload data if needed. The texture won t be ready until then.
99229921
if (data) {
99239922
this.updateRawCubeTexture(texture, data, format, type, invertY, compression);
@@ -19156,7 +19155,7 @@ var BABYLON;
1915619155
var texturesCache = this._scene.getEngine().getLoadedTexturesCache();
1915719156
for (var index = 0; index < texturesCache.length; index++) {
1915819157
var texturesCacheEntry = texturesCache[index];
19159-
if (texturesCacheEntry.url === url && texturesCacheEntry.noMipmap === noMipmap) {
19158+
if (texturesCacheEntry.url === url && texturesCacheEntry.generateMipMaps === !noMipmap) {
1916019159
texturesCache.splice(index, 1);
1916119160
return;
1916219161
}
@@ -19166,7 +19165,7 @@ var BABYLON;
1916619165
var texturesCache = this._scene.getEngine().getLoadedTexturesCache();
1916719166
for (var index = 0; index < texturesCache.length; index++) {
1916819167
var texturesCacheEntry = texturesCache[index];
19169-
if (texturesCacheEntry.url === url && texturesCacheEntry.noMipmap === noMipmap) {
19168+
if (texturesCacheEntry.url === url && texturesCacheEntry.generateMipMaps === !noMipmap) {
1917019169
if (!sampling || sampling === texturesCacheEntry.samplingMode) {
1917119170
texturesCacheEntry.references++;
1917219171
return texturesCacheEntry;

0 commit comments

Comments
 (0)