浏览代码

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

David Catuhe 7 年之前
父节点
当前提交
68abab25b2

+ 1 - 1
dist/preview release/what's new.md

@@ -13,7 +13,7 @@
 - Added [VideoDome](http://doc.babylonjs.com/how_to/360videodome) class to easily support 360 videos. Demo [here](https://www.babylonjs-playground.com/frame.html#1E9JQ8#7) ([DavidHGillen](https://github.com/DavidHGillen))
 - Added [VideoDome](http://doc.babylonjs.com/how_to/360videodome) class to easily support 360 videos. Demo [here](https://www.babylonjs-playground.com/frame.html#1E9JQ8#7) ([DavidHGillen](https://github.com/DavidHGillen))
 - Added [GlowLayer](https://doc.babylonjs.com/how_to/glow_layer) to easily support glow from emissive materials. Demo [here](http://www.babylonjs.com/demos/GlowLayer/) ([sebavan](https://github.com/sebavan))
 - Added [GlowLayer](https://doc.babylonjs.com/how_to/glow_layer) to easily support glow from emissive materials. Demo [here](http://www.babylonjs.com/demos/GlowLayer/) ([sebavan](https://github.com/sebavan))
 - New [AssetContainer](http://doc.babylonjs.com/how_to/how_to_use_assetcontainer) class and loading methods ([trevordev](https://github.com/trevordev))
 - New [AssetContainer](http://doc.babylonjs.com/how_to/how_to_use_assetcontainer) class and loading methods ([trevordev](https://github.com/trevordev))
-- Added [depth of field](https://www.babylonjs-playground.com/frame.html#8F5HYV#9), [sharpening, MSAA, chromatic aberration and grain effect](https://www.babylonjs-playground.com/frame.html#Y3C0HQ#144) to the default pipeline ([trevordev](https://github.com/trevordev))
+- Added [depth of field](https://www.babylonjs-playground.com/frame.html#8F5HYV#9), [sharpening, MSAA, chromatic aberration and grain effect](https://www.babylonjs-playground.com/#Y3C0HQ#146) to the default pipeline ([trevordev](https://github.com/trevordev))
 - Added support for [animation weights](http://doc.babylonjs.com/babylon101/animations#animation-weights). Demo [here](https://www.babylonjs-playground.com/#IQN716#9) ([deltakosh](https://github.com/deltakosh))
 - Added support for [animation weights](http://doc.babylonjs.com/babylon101/animations#animation-weights). Demo [here](https://www.babylonjs-playground.com/#IQN716#9) ([deltakosh](https://github.com/deltakosh))
 - Added [sub emitters for particle system](http://doc.babylonjs.com/babylon101/particles#sub-emitters) which will spawn new particle systems when particles dies. Demo [here](https://www.babylonjs-playground.com/frame.html#9NHBCC#1) ([IbraheemOsama](https://github.com/IbraheemOsama))
 - Added [sub emitters for particle system](http://doc.babylonjs.com/babylon101/particles#sub-emitters) which will spawn new particle systems when particles dies. Demo [here](https://www.babylonjs-playground.com/frame.html#9NHBCC#1) ([IbraheemOsama](https://github.com/IbraheemOsama))
 - New [Babylon.js](http://doc.babylonjs.com/resources/maya) and [glTF](http://doc.babylonjs.com/resources/maya_to_gltf) exporter for Autodesk Maya ([Noalak](https://github.com/Noalak))
 - New [Babylon.js](http://doc.babylonjs.com/resources/maya) and [glTF](http://doc.babylonjs.com/resources/maya_to_gltf) exporter for Autodesk Maya ([Noalak](https://github.com/Noalak))

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

@@ -277,7 +277,7 @@ void main(void) {
 
 
 #if !defined(LINKREFRACTIONTOTRANSPARENCY) && !defined(ALPHAFRESNEL)
 #if !defined(LINKREFRACTIONTOTRANSPARENCY) && !defined(ALPHAFRESNEL)
 	#ifdef ALPHATEST
 	#ifdef ALPHATEST
-		if (alpha <= ALPHATESTVALUE)
+		if (alpha < ALPHATESTVALUE)
 			discard;
 			discard;
 
 
 		#ifndef ALPHABLEND
 		#ifndef ALPHABLEND
@@ -405,7 +405,7 @@ void main(void) {
 			alpha = fresnelSchlickEnvironmentGGX(clamp(dot(viewDirectionW, normalForward), 0.0, 1.0), vec3(opacity0), vec3(opacity90), sqrt(microSurface)).x;
 			alpha = fresnelSchlickEnvironmentGGX(clamp(dot(viewDirectionW, normalForward), 0.0, 1.0), vec3(opacity0), vec3(opacity90), sqrt(microSurface)).x;
 
 
 			#ifdef ALPHATEST
 			#ifdef ALPHATEST
-				if (alpha <= ALPHATESTVALUE)
+				if (alpha < ALPHATESTVALUE)
 					discard;
 					discard;
 
 
 				#ifndef ALPHABLEND
 				#ifndef ALPHABLEND

二进制
tests/validation/ReferenceImages/gltfBufferInterleaved.png


二进制
tests/validation/ReferenceImages/gltfMaterial.png


二进制
tests/validation/ReferenceImages/gltfMaterialAlpha.png


二进制
tests/validation/ReferenceImages/gltfMaterialAlphaBack.png


二进制
tests/validation/ReferenceImages/gltfMaterialAlphaBlend.png


二进制
tests/validation/ReferenceImages/gltfMaterialAlphaMask.png


二进制
tests/validation/ReferenceImages/gltfMaterialDoubleSided.png


二进制
tests/validation/ReferenceImages/gltfMaterialMetallicRoughness.png


二进制
tests/validation/ReferenceImages/gltfMaterialMixed.png


二进制
tests/validation/ReferenceImages/gltfMaterialSpecularGlossiness.png


二进制
tests/validation/ReferenceImages/gltfMeshPrimitiveMode.png


二进制
tests/validation/ReferenceImages/gltfMeshPrimitiveVertexColor.png


二进制
tests/validation/ReferenceImages/gltfMeshPrimitives.png


二进制
tests/validation/ReferenceImages/gltfMeshPrimitivesUV.png


二进制
tests/validation/ReferenceImages/gltfPrimitiveAttribute.png


二进制
tests/validation/ReferenceImages/gltfTextureSampler.png


+ 36 - 6
tests/validation/config.json

@@ -183,6 +183,12 @@
       "referenceImage": "customRTT.png"
       "referenceImage": "customRTT.png"
     },
     },
     {
     {
+      "title": "GLTF Buffer Interleaved",
+      "scriptToRun": "/Demos/GLTFTests/index.js",
+      "functionToCall": "createBufferInterleavedScene",
+      "referenceImage": "gltfBufferInterleaved.png"
+    },
+    {
       "title": "GLTF Normals",
       "title": "GLTF Normals",
       "scriptToRun": "/Demos/GLTFNormals/index.js",
       "scriptToRun": "/Demos/GLTFNormals/index.js",
       "functionToCall": "createScene",
       "functionToCall": "createScene",
@@ -195,16 +201,28 @@
       "referenceImage": "gltfMaterial.png"
       "referenceImage": "gltfMaterial.png"
     },
     },
     {
     {
-      "title": "GLTF Material Alpha",
+      "title": "GLTF Material Alpha Blend",
+      "scriptToRun": "/Demos/GLTFTests/index.js",
+      "functionToCall": "createMaterialAlphaBlendScene",
+      "referenceImage": "gltfMaterialAlphaBlend.png"
+    },
+    {
+      "title": "GLTF Material Alpha Mask",
       "scriptToRun": "/Demos/GLTFTests/index.js",
       "scriptToRun": "/Demos/GLTFTests/index.js",
-      "functionToCall": "createMaterialAlphaScene",
-      "referenceImage": "gltfMaterialAlpha.png"
+      "functionToCall": "createMaterialAlphaMaskScene",
+      "referenceImage": "gltfMaterialAlphaMask.png"
     },
     },
     {
     {
-      "title": "GLTF Material Alpha (Back)",
+      "title": "GLTF Material Double Sided",
       "scriptToRun": "/Demos/GLTFTests/index.js",
       "scriptToRun": "/Demos/GLTFTests/index.js",
-      "functionToCall": "createMaterialAlphaFlippedScene",
-      "referenceImage": "gltfMaterialAlphaBack.png"
+      "functionToCall": "createMaterialDoubleSidedScene",
+      "referenceImage": "gltfMaterialDoubleSided.png"
+    },
+    {
+      "title": "GLTF Material Mixed",
+      "scriptToRun": "/Demos/GLTFTests/index.js",
+      "functionToCall": "createMaterialMixedScene",
+      "referenceImage": "gltfMaterialMixed.png"
     },
     },
     {
     {
       "title": "GLTF Mesh Primitives",
       "title": "GLTF Mesh Primitives",
@@ -213,6 +231,18 @@
       "referenceImage": "gltfMeshPrimitives.png"
       "referenceImage": "gltfMeshPrimitives.png"
     },
     },
     {
     {
+      "title": "GLTF Mesh Primitive Mode",
+      "scriptToRun": "/Demos/GLTFTests/index.js",
+      "functionToCall": "createMeshPrimitiveModeScene",
+      "referenceImage": "gltfMeshPrimitiveMode.png"
+    },
+    {
+      "title": "GLTF Mesh Primitive Vertex Color",
+      "scriptToRun": "/Demos/GLTFTests/index.js",
+      "functionToCall": "createPrimitiveVertexColorScene",
+      "referenceImage": "gltfMeshPrimitiveVertexColor.png"
+    },
+    {
       "title": "GLTF Mesh Primitives UV",
       "title": "GLTF Mesh Primitives UV",
       "scriptToRun": "/Demos/GLTFTests/index.js",
       "scriptToRun": "/Demos/GLTFTests/index.js",
       "functionToCall": "createMeshPrimitivesUVScene",
       "functionToCall": "createMeshPrimitivesUVScene",