소스 검색

Nightly + pbr bug fix with glossiness

David Catuhe 8 년 전
부모
커밋
a001c6c2d6

BIN
Playground/textures/mr.jpg


BIN
Playground/textures/sg.png


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 5407 - 5407
dist/preview release/babylon.d.ts


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 13 - 13
dist/preview release/babylon.js


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

@@ -31934,7 +31934,7 @@ var BABYLON;
     /**
      * The PBR material of BJS following the metal roughness convention.
      *
-     * This fits to the define PBR convention in the GLTF definition:
+     * This fits to the PBR convention in the GLTF definition:
      * https://github.com/KhronosGroup/glTF/tree/2.0/specification/2.0
      */
     var PBRMetallicRoughnessMaterial = (function (_super) {
@@ -31947,6 +31947,7 @@ var BABYLON;
          */
         function PBRMetallicRoughnessMaterial(name, scene) {
             var _this = _super.call(this, name, scene) || this;
+            _this._useRoughnessFromMetallicTextureAlpha = false;
             _this._useRoughnessFromMetallicTextureGreen = true;
             _this._useMetallnessFromMetallicTextureBlue = true;
             return _this;
@@ -32026,7 +32027,7 @@ var BABYLON;
     /**
      * The PBR material of BJS following the specular glossiness convention.
      *
-     * This fits to the define PBR convention in the GLTF definition:
+     * This fits to the PBR convention in the GLTF definition:
      * https://github.com/KhronosGroup/glTF/tree/2.0/extensions/Khronos/KHR_materials_pbrSpecularGlossiness
      */
     var PBRSpecularGlossinessMaterial = (function (_super) {

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 5407 - 5407
dist/preview release/babylon.module.d.ts


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 13 - 13
dist/preview release/babylon.worker.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 6853 - 6853
dist/preview release/customConfigurations/minimalViewer/babylon.d.ts


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 4 - 4
dist/preview release/customConfigurations/minimalViewer/babylon.js


+ 3 - 2
dist/preview release/customConfigurations/minimalViewer/babylon.max.js

@@ -37022,7 +37022,7 @@ var BABYLON;
     /**
      * The PBR material of BJS following the metal roughness convention.
      *
-     * This fits to the define PBR convention in the GLTF definition:
+     * This fits to the PBR convention in the GLTF definition:
      * https://github.com/KhronosGroup/glTF/tree/2.0/specification/2.0
      */
     var PBRMetallicRoughnessMaterial = (function (_super) {
@@ -37035,6 +37035,7 @@ var BABYLON;
          */
         function PBRMetallicRoughnessMaterial(name, scene) {
             var _this = _super.call(this, name, scene) || this;
+            _this._useRoughnessFromMetallicTextureAlpha = false;
             _this._useRoughnessFromMetallicTextureGreen = true;
             _this._useMetallnessFromMetallicTextureBlue = true;
             return _this;
@@ -37114,7 +37115,7 @@ var BABYLON;
     /**
      * The PBR material of BJS following the specular glossiness convention.
      *
-     * This fits to the define PBR convention in the GLTF definition:
+     * This fits to the PBR convention in the GLTF definition:
      * https://github.com/KhronosGroup/glTF/tree/2.0/extensions/Khronos/KHR_materials_pbrSpecularGlossiness
      */
     var PBRSpecularGlossinessMaterial = (function (_super) {

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 6853 - 6853
dist/preview release/customConfigurations/minimalViewer/babylon.module.d.ts


+ 1 - 0
src/Materials/PBR/babylon.pbrMetallicRoughnessMaterial.ts

@@ -57,6 +57,7 @@
          */
         constructor(name: string, scene: Scene) {
             super(name, scene);
+            this._useRoughnessFromMetallicTextureAlpha = false;
             this._useRoughnessFromMetallicTextureGreen = true;
             this._useMetallnessFromMetallicTextureBlue = true;
         }