David Catuhe 5 年之前
父節點
當前提交
e4dfa06f88

+ 137 - 0
dist/preview release/babylon.d.ts

@@ -1183,6 +1183,10 @@ declare module BABYLON {
         isTrue(preprocessors: {
             [key: string]: string;
         }): boolean;
+        private static OperatorPriority;
+        private static Stack;
+        static postfixToInfix(postfix: string[]): string;
+        static infixToPostfix(infix: string): string[];
     }
 }
 declare module BABYLON {
@@ -51203,6 +51207,139 @@ declare module BABYLON {
 }
 declare module BABYLON {
     /** @hidden */
+    export var pbrBlockAlbedoOpacity: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockReflectivity: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockAmbientOcclusion: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockAlphaFresnel: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockAnisotropic: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockReflection: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockSheen: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockClearcoat: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockSubSurface: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockNormalGeometric: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockNormalFinal: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockGeometryInfo: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockReflectance0: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockReflectance: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockDirectLighting: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockFinalLitComponents: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockFinalUnlitComponents: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockFinalColorComposition: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockImageProcessing: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
     export var pbrDebug: {
         name: string;
         shader: string;

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


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


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


+ 293 - 0
dist/preview release/babylon.module.d.ts

@@ -1193,6 +1193,10 @@ declare module "babylonjs/Engines/Processors/Expressions/shaderDefineExpression"
         isTrue(preprocessors: {
             [key: string]: string;
         }): boolean;
+        private static OperatorPriority;
+        private static Stack;
+        static postfixToInfix(postfix: string[]): string;
+        static infixToPostfix(infix: string): string[];
     }
 }
 declare module "babylonjs/Engines/Processors/shaderCodeTestNode" {
@@ -53340,6 +53344,139 @@ declare module "babylonjs/Shaders/ShadersInclude/pbrIBLFunctions" {
         shader: string;
     };
 }
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockAlbedoOpacity" {
+    /** @hidden */
+    export var pbrBlockAlbedoOpacity: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockReflectivity" {
+    /** @hidden */
+    export var pbrBlockReflectivity: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockAmbientOcclusion" {
+    /** @hidden */
+    export var pbrBlockAmbientOcclusion: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockAlphaFresnel" {
+    /** @hidden */
+    export var pbrBlockAlphaFresnel: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockAnisotropic" {
+    /** @hidden */
+    export var pbrBlockAnisotropic: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockReflection" {
+    /** @hidden */
+    export var pbrBlockReflection: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockSheen" {
+    /** @hidden */
+    export var pbrBlockSheen: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockClearcoat" {
+    /** @hidden */
+    export var pbrBlockClearcoat: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockSubSurface" {
+    /** @hidden */
+    export var pbrBlockSubSurface: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockNormalGeometric" {
+    /** @hidden */
+    export var pbrBlockNormalGeometric: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockNormalFinal" {
+    /** @hidden */
+    export var pbrBlockNormalFinal: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockGeometryInfo" {
+    /** @hidden */
+    export var pbrBlockGeometryInfo: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockReflectance0" {
+    /** @hidden */
+    export var pbrBlockReflectance0: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockReflectance" {
+    /** @hidden */
+    export var pbrBlockReflectance: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockDirectLighting" {
+    /** @hidden */
+    export var pbrBlockDirectLighting: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockFinalLitComponents" {
+    /** @hidden */
+    export var pbrBlockFinalLitComponents: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockFinalUnlitComponents" {
+    /** @hidden */
+    export var pbrBlockFinalUnlitComponents: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockFinalColorComposition" {
+    /** @hidden */
+    export var pbrBlockFinalColorComposition: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockImageProcessing" {
+    /** @hidden */
+    export var pbrBlockImageProcessing: {
+        name: string;
+        shader: string;
+    };
+}
 declare module "babylonjs/Shaders/ShadersInclude/pbrDebug" {
     /** @hidden */
     export var pbrDebug: {
@@ -53370,12 +53507,31 @@ declare module "babylonjs/Shaders/pbr.fragment" {
     import "babylonjs/Shaders/ShadersInclude/pbrIBLFunctions";
     import "babylonjs/Shaders/ShadersInclude/bumpFragmentFunctions";
     import "babylonjs/Shaders/ShadersInclude/reflectionFunction";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockAlbedoOpacity";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockReflectivity";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockAmbientOcclusion";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockAlphaFresnel";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockAnisotropic";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockReflection";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockSheen";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockClearcoat";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockSubSurface";
     import "babylonjs/Shaders/ShadersInclude/clipPlaneFragment";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockNormalGeometric";
     import "babylonjs/Shaders/ShadersInclude/bumpFragment";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockNormalFinal";
     import "babylonjs/Shaders/ShadersInclude/depthPrePass";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockGeometryInfo";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockReflectance0";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockReflectance";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockDirectLighting";
     import "babylonjs/Shaders/ShadersInclude/lightFragment";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockFinalLitComponents";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockFinalUnlitComponents";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockFinalColorComposition";
     import "babylonjs/Shaders/ShadersInclude/logDepthFragment";
     import "babylonjs/Shaders/ShadersInclude/fogFragment";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockImageProcessing";
     import "babylonjs/Shaders/ShadersInclude/pbrDebug";
     /** @hidden */
     export var pbrPixelShader: {
@@ -75305,6 +75461,10 @@ declare module BABYLON {
         isTrue(preprocessors: {
             [key: string]: string;
         }): boolean;
+        private static OperatorPriority;
+        private static Stack;
+        static postfixToInfix(postfix: string[]): string;
+        static infixToPostfix(infix: string): string[];
     }
 }
 declare module BABYLON {
@@ -125325,6 +125485,139 @@ declare module BABYLON {
 }
 declare module BABYLON {
     /** @hidden */
+    export var pbrBlockAlbedoOpacity: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockReflectivity: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockAmbientOcclusion: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockAlphaFresnel: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockAnisotropic: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockReflection: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockSheen: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockClearcoat: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockSubSurface: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockNormalGeometric: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockNormalFinal: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockGeometryInfo: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockReflectance0: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockReflectance: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockDirectLighting: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockFinalLitComponents: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockFinalUnlitComponents: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockFinalColorComposition: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockImageProcessing: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
     export var pbrDebug: {
         name: string;
         shader: string;

+ 137 - 0
dist/preview release/documentation.d.ts

@@ -1183,6 +1183,10 @@ declare module BABYLON {
         isTrue(preprocessors: {
             [key: string]: string;
         }): boolean;
+        private static OperatorPriority;
+        private static Stack;
+        static postfixToInfix(postfix: string[]): string;
+        static infixToPostfix(infix: string): string[];
     }
 }
 declare module BABYLON {
@@ -51203,6 +51207,139 @@ declare module BABYLON {
 }
 declare module BABYLON {
     /** @hidden */
+    export var pbrBlockAlbedoOpacity: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockReflectivity: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockAmbientOcclusion: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockAlphaFresnel: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockAnisotropic: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockReflection: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockSheen: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockClearcoat: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockSubSurface: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockNormalGeometric: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockNormalFinal: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockGeometryInfo: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockReflectance0: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockReflectance: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockDirectLighting: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockFinalLitComponents: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockFinalUnlitComponents: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockFinalColorComposition: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockImageProcessing: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
     export var pbrDebug: {
         name: string;
         shader: string;

+ 2 - 0
dist/preview release/loaders/babylon.glTF2FileLoader.js

@@ -2605,7 +2605,9 @@ var GLTFLoader = /** @class */ (function () {
             }));
         }
         else {
+            this._babylonScene._blockEntityCollection = this._forAssetContainer;
             node._babylonTransformNode = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["TransformNode"](name, this._babylonScene);
+            this._babylonScene._blockEntityCollection = false;
             node._primitiveBabylonMeshes = [];
             for (var _i = 0, primitives_1 = primitives; _i < primitives_1.length; _i++) {
                 var primitive = primitives_1[_i];

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


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


+ 2 - 0
dist/preview release/loaders/babylon.glTFFileLoader.js

@@ -5185,7 +5185,9 @@ var GLTFLoader = /** @class */ (function () {
             }));
         }
         else {
+            this._babylonScene._blockEntityCollection = this._forAssetContainer;
             node._babylonTransformNode = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["TransformNode"](name, this._babylonScene);
+            this._babylonScene._blockEntityCollection = false;
             node._primitiveBabylonMeshes = [];
             for (var _i = 0, primitives_1 = primitives; _i < primitives_1.length; _i++) {
                 var primitive = primitives_1[_i];

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


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


+ 2 - 0
dist/preview release/loaders/babylonjs.loaders.js

@@ -6565,7 +6565,9 @@ var GLTFLoader = /** @class */ (function () {
             }));
         }
         else {
+            this._babylonScene._blockEntityCollection = this._forAssetContainer;
             node._babylonTransformNode = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["TransformNode"](name, this._babylonScene);
+            this._babylonScene._blockEntityCollection = false;
             node._primitiveBabylonMeshes = [];
             for (var _i = 0, primitives_1 = primitives; _i < primitives_1.length; _i++) {
                 var primitive = primitives_1[_i];

文件差異過大導致無法顯示
+ 1 - 1
dist/preview release/loaders/babylonjs.loaders.js.map


文件差異過大導致無法顯示
+ 2 - 2
dist/preview release/loaders/babylonjs.loaders.min.js


+ 1 - 1
dist/preview release/packagesSizeBaseLine.json

@@ -1 +1 @@
-{"thinEngineOnly":113465,"engineOnly":150094,"sceneOnly":507272,"minGridMaterial":639135,"minStandardMaterial":779955}
+{"thinEngineOnly":114605,"engineOnly":151234,"sceneOnly":508412,"minGridMaterial":640273,"minStandardMaterial":781344}

+ 293 - 0
dist/preview release/viewer/babylon.module.d.ts

@@ -1193,6 +1193,10 @@ declare module "babylonjs/Engines/Processors/Expressions/shaderDefineExpression"
         isTrue(preprocessors: {
             [key: string]: string;
         }): boolean;
+        private static OperatorPriority;
+        private static Stack;
+        static postfixToInfix(postfix: string[]): string;
+        static infixToPostfix(infix: string): string[];
     }
 }
 declare module "babylonjs/Engines/Processors/shaderCodeTestNode" {
@@ -53340,6 +53344,139 @@ declare module "babylonjs/Shaders/ShadersInclude/pbrIBLFunctions" {
         shader: string;
     };
 }
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockAlbedoOpacity" {
+    /** @hidden */
+    export var pbrBlockAlbedoOpacity: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockReflectivity" {
+    /** @hidden */
+    export var pbrBlockReflectivity: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockAmbientOcclusion" {
+    /** @hidden */
+    export var pbrBlockAmbientOcclusion: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockAlphaFresnel" {
+    /** @hidden */
+    export var pbrBlockAlphaFresnel: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockAnisotropic" {
+    /** @hidden */
+    export var pbrBlockAnisotropic: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockReflection" {
+    /** @hidden */
+    export var pbrBlockReflection: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockSheen" {
+    /** @hidden */
+    export var pbrBlockSheen: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockClearcoat" {
+    /** @hidden */
+    export var pbrBlockClearcoat: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockSubSurface" {
+    /** @hidden */
+    export var pbrBlockSubSurface: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockNormalGeometric" {
+    /** @hidden */
+    export var pbrBlockNormalGeometric: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockNormalFinal" {
+    /** @hidden */
+    export var pbrBlockNormalFinal: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockGeometryInfo" {
+    /** @hidden */
+    export var pbrBlockGeometryInfo: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockReflectance0" {
+    /** @hidden */
+    export var pbrBlockReflectance0: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockReflectance" {
+    /** @hidden */
+    export var pbrBlockReflectance: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockDirectLighting" {
+    /** @hidden */
+    export var pbrBlockDirectLighting: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockFinalLitComponents" {
+    /** @hidden */
+    export var pbrBlockFinalLitComponents: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockFinalUnlitComponents" {
+    /** @hidden */
+    export var pbrBlockFinalUnlitComponents: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockFinalColorComposition" {
+    /** @hidden */
+    export var pbrBlockFinalColorComposition: {
+        name: string;
+        shader: string;
+    };
+}
+declare module "babylonjs/Shaders/ShadersInclude/pbrBlockImageProcessing" {
+    /** @hidden */
+    export var pbrBlockImageProcessing: {
+        name: string;
+        shader: string;
+    };
+}
 declare module "babylonjs/Shaders/ShadersInclude/pbrDebug" {
     /** @hidden */
     export var pbrDebug: {
@@ -53370,12 +53507,31 @@ declare module "babylonjs/Shaders/pbr.fragment" {
     import "babylonjs/Shaders/ShadersInclude/pbrIBLFunctions";
     import "babylonjs/Shaders/ShadersInclude/bumpFragmentFunctions";
     import "babylonjs/Shaders/ShadersInclude/reflectionFunction";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockAlbedoOpacity";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockReflectivity";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockAmbientOcclusion";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockAlphaFresnel";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockAnisotropic";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockReflection";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockSheen";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockClearcoat";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockSubSurface";
     import "babylonjs/Shaders/ShadersInclude/clipPlaneFragment";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockNormalGeometric";
     import "babylonjs/Shaders/ShadersInclude/bumpFragment";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockNormalFinal";
     import "babylonjs/Shaders/ShadersInclude/depthPrePass";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockGeometryInfo";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockReflectance0";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockReflectance";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockDirectLighting";
     import "babylonjs/Shaders/ShadersInclude/lightFragment";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockFinalLitComponents";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockFinalUnlitComponents";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockFinalColorComposition";
     import "babylonjs/Shaders/ShadersInclude/logDepthFragment";
     import "babylonjs/Shaders/ShadersInclude/fogFragment";
+    import "babylonjs/Shaders/ShadersInclude/pbrBlockImageProcessing";
     import "babylonjs/Shaders/ShadersInclude/pbrDebug";
     /** @hidden */
     export var pbrPixelShader: {
@@ -75305,6 +75461,10 @@ declare module BABYLON {
         isTrue(preprocessors: {
             [key: string]: string;
         }): boolean;
+        private static OperatorPriority;
+        private static Stack;
+        static postfixToInfix(postfix: string[]): string;
+        static infixToPostfix(infix: string): string[];
     }
 }
 declare module BABYLON {
@@ -125325,6 +125485,139 @@ declare module BABYLON {
 }
 declare module BABYLON {
     /** @hidden */
+    export var pbrBlockAlbedoOpacity: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockReflectivity: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockAmbientOcclusion: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockAlphaFresnel: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockAnisotropic: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockReflection: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockSheen: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockClearcoat: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockSubSurface: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockNormalGeometric: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockNormalFinal: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockGeometryInfo: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockReflectance0: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockReflectance: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockDirectLighting: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockFinalLitComponents: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockFinalUnlitComponents: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockFinalColorComposition: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
+    export var pbrBlockImageProcessing: {
+        name: string;
+        shader: string;
+    };
+}
+declare module BABYLON {
+    /** @hidden */
     export var pbrDebug: {
         name: string;
         shader: string;

+ 29 - 29
dist/preview release/viewer/babylon.viewer.d.ts

@@ -3,35 +3,35 @@
 /// <reference path="./babylonjs.loaders.module.d.ts"/>
 // Generated by dts-bundle v0.7.3
 // Dependencies for this module:
-//   ../../../../../Tools/Gulp/babylonjs
-//   ../../../../../Tools/Gulp/babylonjs-loaders
-//   ../../../../../Tools/Gulp/babylonjs/Misc/observable
-//   ../../../../../Tools/Gulp/babylonjs/Engines/engine
-//   ../../../../../Tools/Gulp/babylonjs/Loading/sceneLoader
-//   ../../../../../Tools/Gulp/babylonjs/scene
-//   ../../../../../Tools/Gulp/babylonjs/Meshes/abstractMesh
-//   ../../../../../Tools/Gulp/babylonjs/Particles/IParticleSystem
-//   ../../../../../Tools/Gulp/babylonjs/Bones/skeleton
-//   ../../../../../Tools/Gulp/babylonjs/Animations/animationGroup
-//   ../../../../../Tools/Gulp/babylonjs/Animations/index
-//   ../../../../../Tools/Gulp/babylonjs/types
-//   ../../../../../Tools/Gulp/babylonjs/Materials/material
-//   ../../../../../Tools/Gulp/babylonjs-gltf2interface
-//   ../../../../../Tools/Gulp/babylonjs/Maths/math.vector
-//   ../../../../../Tools/Gulp/babylonjs-loaders/glTF/glTFFileLoader
-//   ../../../../../Tools/Gulp/babylonjs/Materials/Textures/baseTexture
-//   ../../../../../Tools/Gulp/babylonjs/Engines/thinEngine
-//   ../../../../../Tools/Gulp/babylonjs/Maths/math
-//   ../../../../../Tools/Gulp/babylonjs/Misc/sceneOptimizer
-//   ../../../../../Tools/Gulp/babylonjs/Cameras/arcRotateCamera
-//   ../../../../../Tools/Gulp/babylonjs/Lights/light
-//   ../../../../../Tools/Gulp/babylonjs/Helpers/environmentHelper
-//   ../../../../../Tools/Gulp/babylonjs/Cameras/VR/vrExperienceHelper
-//   ../../../../../Tools/Gulp/babylonjs/PostProcesses/RenderPipeline/Pipelines/defaultRenderingPipeline
-//   ../../../../../Tools/Gulp/babylonjs/Lights/shadowLight
-//   ../../../../../Tools/Gulp/babylonjs-loaders/glTF/2.0/glTFLoaderExtension
-//   ../../../../../Tools/Gulp/babylonjs/PostProcesses/depthOfFieldEffect
-//   ../../../../../Tools/Gulp/babylonjs/Materials/Textures/cubeTexture
+//   ../../../../../tools/Gulp/babylonjs
+//   ../../../../../tools/Gulp/babylonjs-loaders
+//   ../../../../../tools/Gulp/babylonjs/Misc/observable
+//   ../../../../../tools/Gulp/babylonjs/Engines/engine
+//   ../../../../../tools/Gulp/babylonjs/Loading/sceneLoader
+//   ../../../../../tools/Gulp/babylonjs/scene
+//   ../../../../../tools/Gulp/babylonjs/Meshes/abstractMesh
+//   ../../../../../tools/Gulp/babylonjs/Particles/IParticleSystem
+//   ../../../../../tools/Gulp/babylonjs/Bones/skeleton
+//   ../../../../../tools/Gulp/babylonjs/Animations/animationGroup
+//   ../../../../../tools/Gulp/babylonjs/Animations/index
+//   ../../../../../tools/Gulp/babylonjs/types
+//   ../../../../../tools/Gulp/babylonjs/Materials/material
+//   ../../../../../tools/Gulp/babylonjs-gltf2interface
+//   ../../../../../tools/Gulp/babylonjs/Maths/math.vector
+//   ../../../../../tools/Gulp/babylonjs-loaders/glTF/glTFFileLoader
+//   ../../../../../tools/Gulp/babylonjs/Materials/Textures/baseTexture
+//   ../../../../../tools/Gulp/babylonjs/Engines/thinEngine
+//   ../../../../../tools/Gulp/babylonjs/Maths/math
+//   ../../../../../tools/Gulp/babylonjs/Misc/sceneOptimizer
+//   ../../../../../tools/Gulp/babylonjs/Cameras/arcRotateCamera
+//   ../../../../../tools/Gulp/babylonjs/Lights/light
+//   ../../../../../tools/Gulp/babylonjs/Helpers/environmentHelper
+//   ../../../../../tools/Gulp/babylonjs/Cameras/VR/vrExperienceHelper
+//   ../../../../../tools/Gulp/babylonjs/PostProcesses/RenderPipeline/Pipelines/defaultRenderingPipeline
+//   ../../../../../tools/Gulp/babylonjs/Lights/shadowLight
+//   ../../../../../tools/Gulp/babylonjs-loaders/glTF/2.0/glTFLoaderExtension
+//   ../../../../../tools/Gulp/babylonjs/PostProcesses/depthOfFieldEffect
+//   ../../../../../tools/Gulp/babylonjs/Materials/Textures/cubeTexture
 declare module BabylonViewer {
     /**
         * BabylonJS Viewer

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


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


+ 29 - 29
dist/preview release/viewer/babylon.viewer.module.d.ts

@@ -4,35 +4,35 @@
 
 // Generated by dts-bundle v0.7.3
 // Dependencies for this module:
-//   ../../../../../Tools/Gulp/babylonjs
-//   ../../../../../Tools/Gulp/babylonjs-loaders
-//   ../../../../../Tools/Gulp/babylonjs/Misc/observable
-//   ../../../../../Tools/Gulp/babylonjs/Engines/engine
-//   ../../../../../Tools/Gulp/babylonjs/Loading/sceneLoader
-//   ../../../../../Tools/Gulp/babylonjs/scene
-//   ../../../../../Tools/Gulp/babylonjs/Meshes/abstractMesh
-//   ../../../../../Tools/Gulp/babylonjs/Particles/IParticleSystem
-//   ../../../../../Tools/Gulp/babylonjs/Bones/skeleton
-//   ../../../../../Tools/Gulp/babylonjs/Animations/animationGroup
-//   ../../../../../Tools/Gulp/babylonjs/Animations/index
-//   ../../../../../Tools/Gulp/babylonjs/types
-//   ../../../../../Tools/Gulp/babylonjs/Materials/material
-//   ../../../../../Tools/Gulp/babylonjs-gltf2interface
-//   ../../../../../Tools/Gulp/babylonjs/Maths/math.vector
-//   ../../../../../Tools/Gulp/babylonjs-loaders/glTF/glTFFileLoader
-//   ../../../../../Tools/Gulp/babylonjs/Materials/Textures/baseTexture
-//   ../../../../../Tools/Gulp/babylonjs/Engines/thinEngine
-//   ../../../../../Tools/Gulp/babylonjs/Maths/math
-//   ../../../../../Tools/Gulp/babylonjs/Misc/sceneOptimizer
-//   ../../../../../Tools/Gulp/babylonjs/Cameras/arcRotateCamera
-//   ../../../../../Tools/Gulp/babylonjs/Lights/light
-//   ../../../../../Tools/Gulp/babylonjs/Helpers/environmentHelper
-//   ../../../../../Tools/Gulp/babylonjs/Cameras/VR/vrExperienceHelper
-//   ../../../../../Tools/Gulp/babylonjs/PostProcesses/RenderPipeline/Pipelines/defaultRenderingPipeline
-//   ../../../../../Tools/Gulp/babylonjs/Lights/shadowLight
-//   ../../../../../Tools/Gulp/babylonjs-loaders/glTF/2.0/glTFLoaderExtension
-//   ../../../../../Tools/Gulp/babylonjs/PostProcesses/depthOfFieldEffect
-//   ../../../../../Tools/Gulp/babylonjs/Materials/Textures/cubeTexture
+//   ../../../../../tools/Gulp/babylonjs
+//   ../../../../../tools/Gulp/babylonjs-loaders
+//   ../../../../../tools/Gulp/babylonjs/Misc/observable
+//   ../../../../../tools/Gulp/babylonjs/Engines/engine
+//   ../../../../../tools/Gulp/babylonjs/Loading/sceneLoader
+//   ../../../../../tools/Gulp/babylonjs/scene
+//   ../../../../../tools/Gulp/babylonjs/Meshes/abstractMesh
+//   ../../../../../tools/Gulp/babylonjs/Particles/IParticleSystem
+//   ../../../../../tools/Gulp/babylonjs/Bones/skeleton
+//   ../../../../../tools/Gulp/babylonjs/Animations/animationGroup
+//   ../../../../../tools/Gulp/babylonjs/Animations/index
+//   ../../../../../tools/Gulp/babylonjs/types
+//   ../../../../../tools/Gulp/babylonjs/Materials/material
+//   ../../../../../tools/Gulp/babylonjs-gltf2interface
+//   ../../../../../tools/Gulp/babylonjs/Maths/math.vector
+//   ../../../../../tools/Gulp/babylonjs-loaders/glTF/glTFFileLoader
+//   ../../../../../tools/Gulp/babylonjs/Materials/Textures/baseTexture
+//   ../../../../../tools/Gulp/babylonjs/Engines/thinEngine
+//   ../../../../../tools/Gulp/babylonjs/Maths/math
+//   ../../../../../tools/Gulp/babylonjs/Misc/sceneOptimizer
+//   ../../../../../tools/Gulp/babylonjs/Cameras/arcRotateCamera
+//   ../../../../../tools/Gulp/babylonjs/Lights/light
+//   ../../../../../tools/Gulp/babylonjs/Helpers/environmentHelper
+//   ../../../../../tools/Gulp/babylonjs/Cameras/VR/vrExperienceHelper
+//   ../../../../../tools/Gulp/babylonjs/PostProcesses/RenderPipeline/Pipelines/defaultRenderingPipeline
+//   ../../../../../tools/Gulp/babylonjs/Lights/shadowLight
+//   ../../../../../tools/Gulp/babylonjs-loaders/glTF/2.0/glTFLoaderExtension
+//   ../../../../../tools/Gulp/babylonjs/PostProcesses/depthOfFieldEffect
+//   ../../../../../tools/Gulp/babylonjs/Materials/Textures/cubeTexture
 
 declare module 'babylonjs-viewer' {
     import { mapperManager } from 'babylonjs-viewer/configuration/mappers';