瀏覽代碼

Merge remote-tracking branch 'upstream/master' into Env

sebastien 7 年之前
父節點
當前提交
2cbfb4cc11

二進制
Playground/textures/colorGrade-highContrast.png


二進制
Playground/textures/colorGrade-inverted.png


二進制
Playground/textures/colorGrade-posterize.png


+ 9 - 1
src/Materials/PBR/babylon.pbrBaseMaterial.ts

@@ -611,6 +611,14 @@
 
         /**
          * Sets the transparency mode of the material.
+         *
+         * | Value | Type                                | Description |
+         * | ----- | ----------------------------------- | ----------- |
+         * | 0     | OPAQUE                              |             |
+         * | 1     | ALPHATEST                           |             |
+         * | 2     | ALPHABLEND                          |             |
+         * | 3     | ALPHATESTANDBLEND                   |             |
+         *
          */
         public set transparencyMode(value: Nullable<number>) {
             if (this._transparencyMode === value) {
@@ -1761,4 +1769,4 @@
             super.dispose(forceDisposeEffect, forceDisposeTextures);
         }
     }
-}
+}