David Catuhe 7 年之前
父節點
當前提交
85f2e8ee35

文件差異過大導致無法顯示
+ 11378 - 11378
Playground/babylon.d.txt


文件差異過大導致無法顯示
+ 9751 - 9751
dist/preview release/babylon.d.ts


文件差異過大導致無法顯示
+ 3 - 3
dist/preview release/babylon.js


+ 4 - 3
dist/preview release/babylon.max.js

@@ -9403,14 +9403,15 @@ var BABYLON;
                 return returnedValue;
             }
             catch (e) {
-                this._reject(e);
+                this._reject(e, true);
             }
             return null;
         };
-        InternalPromise.prototype._reject = function (reason) {
+        InternalPromise.prototype._reject = function (reason, onLocalThrow) {
+            if (onLocalThrow === void 0) { onLocalThrow = false; }
             this._state = PromiseStates.Rejected;
             this._reason = reason;
-            if (this._onRejected) {
+            if (this._onRejected && !onLocalThrow) {
                 try {
                     this._onRejected(reason);
                     this._rejectWasConsumed = true;

文件差異過大導致無法顯示
+ 3 - 3
dist/preview release/babylon.worker.js


文件差異過大導致無法顯示
+ 10529 - 10529
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.d.ts


文件差異過大導致無法顯示
+ 3 - 3
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.js


+ 4 - 3
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.max.js

@@ -9403,14 +9403,15 @@ var BABYLON;
                 return returnedValue;
             }
             catch (e) {
-                this._reject(e);
+                this._reject(e, true);
             }
             return null;
         };
-        InternalPromise.prototype._reject = function (reason) {
+        InternalPromise.prototype._reject = function (reason, onLocalThrow) {
+            if (onLocalThrow === void 0) { onLocalThrow = false; }
             this._state = PromiseStates.Rejected;
             this._reason = reason;
-            if (this._onRejected) {
+            if (this._onRejected && !onLocalThrow) {
                 try {
                     this._onRejected(reason);
                     this._rejectWasConsumed = true;

+ 4 - 3
dist/preview release/customConfigurations/minimalGLTFViewer/es6.js

@@ -9389,14 +9389,15 @@ var BABYLON;
                 return returnedValue;
             }
             catch (e) {
-                this._reject(e);
+                this._reject(e, true);
             }
             return null;
         };
-        InternalPromise.prototype._reject = function (reason) {
+        InternalPromise.prototype._reject = function (reason, onLocalThrow) {
+            if (onLocalThrow === void 0) { onLocalThrow = false; }
             this._state = PromiseStates.Rejected;
             this._reason = reason;
-            if (this._onRejected) {
+            if (this._onRejected && !onLocalThrow) {
                 try {
                     this._onRejected(reason);
                     this._rejectWasConsumed = true;

+ 4 - 3
dist/preview release/es6.js

@@ -9389,14 +9389,15 @@ var BABYLON;
                 return returnedValue;
             }
             catch (e) {
-                this._reject(e);
+                this._reject(e, true);
             }
             return null;
         };
-        InternalPromise.prototype._reject = function (reason) {
+        InternalPromise.prototype._reject = function (reason, onLocalThrow) {
+            if (onLocalThrow === void 0) { onLocalThrow = false; }
             this._state = PromiseStates.Rejected;
             this._reason = reason;
-            if (this._onRejected) {
+            if (this._onRejected && !onLocalThrow) {
                 try {
                     this._onRejected(reason);
                     this._rejectWasConsumed = true;

文件差異過大導致無法顯示
+ 45 - 45
dist/preview release/viewer/babylon.viewer.js


+ 3 - 3
src/Tools/babylon.promise.ts

@@ -122,17 +122,17 @@ module BABYLON {
 
                 return returnedValue;
             } catch (e) {
-                this._reject(e);
+                this._reject(e, true);
             }
 
             return null;
         }
 
-        private _reject(reason: any): void {
+        private _reject(reason: any, onLocalThrow = false): void {
             this._state = PromiseStates.Rejected;
             this._reason = reason;
 
-            if (this._onRejected) {
+            if (this._onRejected && !onLocalThrow) {
                 try {
                     this._onRejected(reason);
                     this._rejectWasConsumed = true;