瀏覽代碼

Rename IsReadyOrNotBlocking

sevan 8 年之前
父節點
當前提交
c198335293

+ 10 - 10
src/Materials/PBR/babylon.pbrBaseMaterial.ts

@@ -555,7 +555,7 @@
                 }
 
                 if (this._albedoTexture && StandardMaterial.DiffuseTextureEnabled) {
-                    if (!this._albedoTexture.isReadyOrNoneBlocking()) {
+                    if (!this._albedoTexture.isReadyOrNotBlocking()) {
                         return false;
                     }
 
@@ -564,7 +564,7 @@
                 }
 
                 if (this._ambientTexture && StandardMaterial.AmbientTextureEnabled) {
-                    if (!this._ambientTexture.isReadyOrNoneBlocking()) {
+                    if (!this._ambientTexture.isReadyOrNotBlocking()) {
                         return false;
                     }
 
@@ -574,7 +574,7 @@
                 }
 
                 if (this._opacityTexture && StandardMaterial.OpacityTextureEnabled) {
-                    if (!this._opacityTexture.isReadyOrNoneBlocking()) {
+                    if (!this._opacityTexture.isReadyOrNotBlocking()) {
                         return false;
                     }
                     
@@ -588,7 +588,7 @@
 
                 var reflectionTexture = this._reflectionTexture || scene.environmentTexture;
                 if (reflectionTexture && StandardMaterial.ReflectionTextureEnabled) {
-                    if (!reflectionTexture.isReadyOrNoneBlocking()) {
+                    if (!reflectionTexture.isReadyOrNotBlocking()) {
                         return false;
                     }
                     
@@ -641,7 +641,7 @@
                 }
 
                 if (this._lightmapTexture && StandardMaterial.LightmapTextureEnabled) {
-                    if (!this._lightmapTexture.isReadyOrNoneBlocking()) {
+                    if (!this._lightmapTexture.isReadyOrNotBlocking()) {
                         return false;
                     }
 
@@ -651,7 +651,7 @@
                 }
 
                 if (this._emissiveTexture && StandardMaterial.EmissiveTextureEnabled) {
-                    if (!this._emissiveTexture.isReadyOrNoneBlocking()) {
+                    if (!this._emissiveTexture.isReadyOrNotBlocking()) {
                         return false;
                     }
 
@@ -661,7 +661,7 @@
 
                 if (StandardMaterial.SpecularTextureEnabled) {
                     if (this._metallicTexture) {
-                        if (!this._metallicTexture.isReadyOrNoneBlocking()) {
+                        if (!this._metallicTexture.isReadyOrNotBlocking()) {
                             return false;
                         }
 
@@ -674,7 +674,7 @@
                         this._defines.AOSTOREINMETALMAPRED = this._useAmbientOcclusionFromMetallicTextureRed;
                     }
                     else if (this._reflectivityTexture) {
-                        if (!this._reflectivityTexture.isReadyOrNoneBlocking()) {
+                        if (!this._reflectivityTexture.isReadyOrNotBlocking()) {
                             return false;
                         }
 
@@ -685,7 +685,7 @@
                     }
 
                     if (this._microSurfaceTexture) {
-                        if (!this._microSurfaceTexture.isReadyOrNoneBlocking()) {
+                        if (!this._microSurfaceTexture.isReadyOrNotBlocking()) {
                             return false;
                         }
 
@@ -727,7 +727,7 @@
                 }
 
                 if (this._refractionTexture && StandardMaterial.RefractionTextureEnabled) {
-                    if (!this._refractionTexture.isReadyOrNoneBlocking()) {
+                    if (!this._refractionTexture.isReadyOrNotBlocking()) {
                         return false;
                     }
                     

+ 1 - 1
src/Materials/Textures/babylon.baseTexture.ts

@@ -116,7 +116,7 @@
             return this._texture;
         }
 
-        public isReadyOrNoneBlocking(): boolean {
+        public isReadyOrNotBlocking(): boolean {
             return !this.isBlocking || this.isReady();
         }
 

+ 8 - 8
src/Materials/babylon.standardMaterial.ts

@@ -379,7 +379,7 @@ module BABYLON {
                 defines._needUVs = false;
                 if (scene.texturesEnabled) {
                     if (this._diffuseTexture && StandardMaterial.DiffuseTextureEnabled) {
-                        if (!this._diffuseTexture.isReadyOrNoneBlocking()) {
+                        if (!this._diffuseTexture.isReadyOrNotBlocking()) {
                             return false;
                         } else {
                             defines._needUVs = true;
@@ -390,7 +390,7 @@ module BABYLON {
                     }
 
                     if (this._ambientTexture && StandardMaterial.AmbientTextureEnabled) {
-                        if (!this._ambientTexture.isReadyOrNoneBlocking()) {
+                        if (!this._ambientTexture.isReadyOrNotBlocking()) {
                             return false;
                         } else {
                             defines._needUVs = true;
@@ -401,7 +401,7 @@ module BABYLON {
                     }
 
                     if (this._opacityTexture && StandardMaterial.OpacityTextureEnabled) {
-                        if (!this._opacityTexture.isReadyOrNoneBlocking()) {
+                        if (!this._opacityTexture.isReadyOrNotBlocking()) {
                             return false;
                         } else {
                             defines._needUVs = true;
@@ -413,7 +413,7 @@ module BABYLON {
                     }
 
                     if (this._reflectionTexture && StandardMaterial.ReflectionTextureEnabled) {
-                        if (!this._reflectionTexture.isReadyOrNoneBlocking()) {
+                        if (!this._reflectionTexture.isReadyOrNotBlocking()) {
                             return false;
                         } else {
                             defines._needNormals = true;
@@ -460,7 +460,7 @@ module BABYLON {
                     }
 
                     if (this._emissiveTexture && StandardMaterial.EmissiveTextureEnabled) {
-                        if (!this._emissiveTexture.isReadyOrNoneBlocking()) {
+                        if (!this._emissiveTexture.isReadyOrNotBlocking()) {
                             return false;
                         } else {
                             defines._needUVs = true;
@@ -471,7 +471,7 @@ module BABYLON {
                     }
 
                     if (this._lightmapTexture && StandardMaterial.LightmapTextureEnabled) {
-                        if (!this._lightmapTexture.isReadyOrNoneBlocking()) {
+                        if (!this._lightmapTexture.isReadyOrNotBlocking()) {
                             return false;
                         } else {
                             defines._needUVs = true;
@@ -483,7 +483,7 @@ module BABYLON {
                     }
 
                     if (this._specularTexture && StandardMaterial.SpecularTextureEnabled) {
-                        if (!this._specularTexture.isReadyOrNoneBlocking()) {
+                        if (!this._specularTexture.isReadyOrNotBlocking()) {
                             return false;
                         } else {
                             defines._needUVs = true;
@@ -513,7 +513,7 @@ module BABYLON {
                     }
 
                     if (this._refractionTexture && StandardMaterial.RefractionTextureEnabled) {
-                        if (!this._refractionTexture.isReadyOrNoneBlocking()) {
+                        if (!this._refractionTexture.isReadyOrNotBlocking()) {
                             return false;
                         } else {
                             defines._needUVs = true;