Royi Bernthal 8 年之前
父節點
當前提交
25ac3e3daf
共有 2 個文件被更改,包括 4 次插入11 次删除
  1. 3 5
      src/Materials/Textures/babylon.texture.ts
  2. 1 6
      src/babylon.engine.ts

+ 3 - 5
src/Materials/Textures/babylon.texture.ts

@@ -132,17 +132,17 @@
                 }
             }
 
-            if (!url) {
+            if (!this.url) {
                 this._delayedOnLoad = load;
                 this._delayedOnError = onError;
                 return;
             }
 
-            this._texture = this._getFromCache(url, noMipmap, samplingMode);
+            this._texture = this._getFromCache(this.url, noMipmap, samplingMode);
 
             if (!this._texture) {
                 if (!scene.useDelayedTextureLoading) {
-                    this._texture = scene.getEngine().createTexture(url, noMipmap, invertY, scene, this._samplingMode, load, onError, this._buffer, null, this._format);
+                    this._texture = scene.getEngine().createTexture(this.url, noMipmap, invertY, scene, this._samplingMode, load, onError, this._buffer, null, this._format);
                     if (deleteBuffer) {
                         delete this._buffer;
                     }
@@ -159,8 +159,6 @@
                     this._texture.onLoadedObservable.add(load);
                 }
             }
-
-            scene.getEngine().onAfterTextureInitObservable.notifyObservers(this);
         }
 
         public updateURL(url: string): void {

+ 1 - 6
src/babylon.engine.ts

@@ -562,12 +562,7 @@
         /**
          * Observable event triggered before each texture is initialized
          */
-        public onBeforeTextureInitObservable = new Observable<Texture>();  
-
-        /**
-         * Observable event triggered after each texture is initialized
-         */
-        public onAfterTextureInitObservable = new Observable<Texture>();  
+        public onBeforeTextureInitObservable = new Observable<Texture>();
 
         //WebVR