Browse Source

Merge remote-tracking branch 'BabylonJS/master' into viewer-missing-configuration-params

Raanan Weber 7 years ago
parent
commit
d30f5dec47

File diff suppressed because it is too large
+ 16525 - 16521
Playground/babylon.d.txt


File diff suppressed because it is too large
+ 7863 - 7863
dist/preview release/babylon.d.ts


File diff suppressed because it is too large
+ 46 - 46
dist/preview release/babylon.js


File diff suppressed because it is too large
+ 37 - 24
dist/preview release/babylon.max.js


File diff suppressed because it is too large
+ 46 - 46
dist/preview release/babylon.worker.js


File diff suppressed because it is too large
+ 6252 - 6252
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.d.ts


File diff suppressed because it is too large
+ 48 - 48
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.js


File diff suppressed because it is too large
+ 37 - 24
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.max.js


File diff suppressed because it is too large
+ 37 - 24
dist/preview release/customConfigurations/minimalGLTFViewer/es6.js


File diff suppressed because it is too large
+ 37 - 24
dist/preview release/es6.js


File diff suppressed because it is too large
+ 46 - 46
dist/preview release/viewer/babylon.viewer.js


+ 1 - 0
src/Engine/babylon.engine.ts

@@ -282,6 +282,7 @@
         public static ExceptionList = [
             { key: "Chrome/63.0", capture: "63\\.0\\.3239\\.(\\d+)", captureConstraint: 108, targets: ["uniformBuffer"] },
             { key: "Firefox/58", capture: null, captureConstraint: null, targets: ["uniformBuffer"] },
+            { key: "Firefox/59", capture: null, captureConstraint: null, targets: ["uniformBuffer"] },
             { key: "Macintosh", capture: null, captureConstraint: null, targets: ["textureBindingOptimization"] },
             { key: "iPhone", capture: null, captureConstraint: null, targets: ["textureBindingOptimization"] },
         ];

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

@@ -602,7 +602,7 @@ void main(void) {
 #endif
 
 #ifdef LIGHTMAP
-	vec3 lightmapColor = texture2D(lightmapSampler, vLightmapUV + uvOffset).rgb * vLightmapInfos.y;
+	vec3 lightmapColor = toLinearSpace(texture2D(lightmapSampler, vLightmapUV + uvOffset).rgb) * vLightmapInfos.y;
 #endif
 
 	lightingInfo info;