Home Explore Help
Register Sign In
zhangyupeng
/
Babylon.js
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Fix #4072

David Catuhe 7 years ago
parent
56b5ed7011
commit
b72331f20f
2 changed files with 12 additions and 7 deletions
Unified View Show Diff Stats
  1. 11 4
      src/Engine/babylon.engine.ts
  2. 1 3
      tests/validation/index.html

+ 11 - 4
src/Engine/babylon.engine.ts
View File 

@@ -6397,18 +6397,21 @@
 
                 channel = this._getCorrectTextureChannel(channel, internalTexture);

                 channel = this._getCorrectTextureChannel(channel, internalTexture);

             }

             }

 

 

+            let needToBind = true;

             if (this._boundTexturesCache[channel] === internalTexture) {

             if (this._boundTexturesCache[channel] === internalTexture) {

                 this._moveBoundTextureOnTop(internalTexture);

                 this._moveBoundTextureOnTop(internalTexture);

                 if (!isPartOfTextureArray) {

                 if (!isPartOfTextureArray) {

                     this._bindSamplerUniformToChannel(internalTexture._initialSlot, channel);

                     this._bindSamplerUniformToChannel(internalTexture._initialSlot, channel);

                 }

                 }

-                return false;

+                needToBind = false;

             }

             }

 

 

             this._activeChannel = channel;

             this._activeChannel = channel;

 

 

             if (internalTexture && internalTexture.is3D) {

             if (internalTexture && internalTexture.is3D) {

-                this._bindTextureDirectly(this._gl.TEXTURE_3D, internalTexture, isPartOfTextureArray);

+                if (needToBind) {

+                    this._bindTextureDirectly(this._gl.TEXTURE_3D, internalTexture, isPartOfTextureArray);

+                }

 

 

                 if (internalTexture && internalTexture._cachedWrapU !== texture.wrapU) {

                 if (internalTexture && internalTexture._cachedWrapU !== texture.wrapU) {

                     internalTexture._cachedWrapU = texture.wrapU;

                     internalTexture._cachedWrapU = texture.wrapU;

@@ -6459,7 +6462,9 @@
 
                 this._setAnisotropicLevel(this._gl.TEXTURE_3D, texture);

                 this._setAnisotropicLevel(this._gl.TEXTURE_3D, texture);

             }

             }

             else if (internalTexture && internalTexture.isCube) {

             else if (internalTexture && internalTexture.isCube) {

-                this._bindTextureDirectly(this._gl.TEXTURE_CUBE_MAP, internalTexture, isPartOfTextureArray);

+                if (needToBind) {

+                    this._bindTextureDirectly(this._gl.TEXTURE_CUBE_MAP, internalTexture, isPartOfTextureArray);

+                }

 

 

                 if (internalTexture._cachedCoordinatesMode !== texture.coordinatesMode) {

                 if (internalTexture._cachedCoordinatesMode !== texture.coordinatesMode) {

                     internalTexture._cachedCoordinatesMode = texture.coordinatesMode;

                     internalTexture._cachedCoordinatesMode = texture.coordinatesMode;

@@ -6471,7 +6476,9 @@
 
 

 

                 this._setAnisotropicLevel(this._gl.TEXTURE_CUBE_MAP, texture);

                 this._setAnisotropicLevel(this._gl.TEXTURE_CUBE_MAP, texture);

             } else {

             } else {

-                this._bindTextureDirectly(this._gl.TEXTURE_2D, internalTexture, isPartOfTextureArray);

+                if (needToBind) {               

+                    this._bindTextureDirectly(this._gl.TEXTURE_2D, internalTexture, isPartOfTextureArray);

+                }

 

 

                 if (internalTexture && internalTexture._cachedWrapU !== texture.wrapU) {

                 if (internalTexture && internalTexture._cachedWrapU !== texture.wrapU) {

                     internalTexture._cachedWrapU = texture.wrapU;

                     internalTexture._cachedWrapU = texture.wrapU;

+ 1 - 3
tests/validation/index.html
View File 

@@ -3,9 +3,7 @@
 
 <head>

 <head>

 	<title>BabylonJS - Build validation page</title>

 	<title>BabylonJS - Build validation page</title>

 	<link href="index.css" rel="stylesheet" />	

 	<link href="index.css" rel="stylesheet" />	

-    <script src="https://preview.babylonjs.com/draco_decoder.js" type="text/x-draco-decoder"></script>

-    <script src="https://preview.babylonjs.com/draco_decoder.wasm" type="text/x-draco-decoder-wasm-binary"></script>

-    <script src="https://preview.babylonjs.com/draco_wasm_wrapper.js" type="text/x-draco-decoder-wasm-wrapper"></script>

+    <script src="https://preview.babylonjs.com/draco_decoder.js"></script>

 	<script src="https://unpkg.com/earcut@2.1.1/dist/earcut.min.js"></script>

 	<script src="https://unpkg.com/earcut@2.1.1/dist/earcut.min.js"></script>

 	<script src="../../Tools/DevLoader/BabylonLoader.js"></script>

 	<script src="../../Tools/DevLoader/BabylonLoader.js"></script>

 </head>

 </head>