Explorar el Código

Merge branch 'master' of https://github.com/BabylonJS/Babylon.js into master

David Catuhe hace 4 años
padre
commit
22b2619a01

+ 2 - 2
src/Engines/Processors/shaderCodeInliner.ts

@@ -425,7 +425,7 @@ export class ShaderCodeInliner {
                     this._sourceCode = partBefore + type + " " + retParamName + ";\n" + funcBody + "\n" + partBetween + retParamName + partAfter;
 
                     if (this.debug) {
-                        console.log(`Replace function call by code. Function '${name}' (type=${type}). injectDeclarationIndex=${injectDeclarationIndex}`);
+                        console.log(`Replace function call by code. Function '${name}' (type=${type}). injectDeclarationIndex=${injectDeclarationIndex}, call parameters=${paramNames}`);
                     }
                 } else {
                     // simple case where the return value of the function is "void"
@@ -434,7 +434,7 @@ export class ShaderCodeInliner {
                     startIndex += funcBody.length - (callParamsEndIndex + 1 - functionCallIndex);
 
                     if (this.debug) {
-                        console.log(`Replace function call by code. Function '${name}' (type=${type}). functionCallIndex=${functionCallIndex}`);
+                        console.log(`Replace function call by code. Function '${name}' (type=${type}). functionCallIndex=${functionCallIndex}, call parameters=${paramNames}`);
                     }
                 }
 

+ 1 - 1
src/Materials/Node/Blocks/PBR/clearCoatBlock.ts

@@ -314,7 +314,7 @@ export class ClearCoatBlock extends NodeMaterialBlock {
                 #endif
             #endif
             #if defined(CLEARCOAT_BUMP) || defined(TWOSIDEDLIGHTING)
-                gl_FrontFacing ? 1. : -1.,
+                (gl_FrontFacing ? 1. : -1.),
             #endif
                 clearcoatOut
             );

+ 1 - 1
src/Shaders/pbr.fragment.fx

@@ -423,7 +423,7 @@ void main(void) {
             #endif
         #endif
         #if defined(CLEARCOAT_BUMP) || defined(TWOSIDEDLIGHTING)
-            gl_FrontFacing ? 1. : -1.,
+            (gl_FrontFacing ? 1. : -1.),
         #endif
             clearcoatOut
         );