浏览代码

Merge pull request #2847 from bghgary/bump-updates

Normal map math and validation reference image updates
David Catuhe 8 年之前
父节点
当前提交
b4c8d73728
共有 28 个文件被更改,包括 1 次插入2 次删除
  1. 1 2
      src/Shaders/ShadersInclude/bumpFragmentFunctions.fx
  2. 二进制
      tests/validation/ReferenceImages/Espilit.png
  3. 二进制
      tests/validation/ReferenceImages/Flat2009.png
  4. 二进制
      tests/validation/ReferenceImages/Heart.png
  5. 二进制
      tests/validation/ReferenceImages/Hillvalley.png
  6. 二进制
      tests/validation/ReferenceImages/PBRMetallicRoughnessMaterial.png
  7. 二进制
      tests/validation/ReferenceImages/PBRSpecularGlossinessMaterial.png
  8. 二进制
      tests/validation/ReferenceImages/SpaceDeK.png
  9. 二进制
      tests/validation/ReferenceImages/Sponza.png
  10. 二进制
      tests/validation/ReferenceImages/TheCar.png
  11. 二进制
      tests/validation/ReferenceImages/Viper.png
  12. 二进制
      tests/validation/ReferenceImages/WCafe.png
  13. 二进制
      tests/validation/ReferenceImages/bones.png
  14. 二进制
      tests/validation/ReferenceImages/displacementMap.png
  15. 二进制
      tests/validation/ReferenceImages/fresnel.png
  16. 二进制
      tests/validation/ReferenceImages/gltfnormals.png
  17. 二进制
      tests/validation/ReferenceImages/highlights.png
  18. 二进制
      tests/validation/ReferenceImages/lens.png
  19. 二进制
      tests/validation/ReferenceImages/lod.png
  20. 二进制
      tests/validation/ReferenceImages/mansion.png
  21. 二进制
      tests/validation/ReferenceImages/normals.png
  22. 二进制
      tests/validation/ReferenceImages/pbr.png
  23. 二进制
      tests/validation/ReferenceImages/pbrglossy.png
  24. 二进制
      tests/validation/ReferenceImages/pbrrough.png
  25. 二进制
      tests/validation/ReferenceImages/pointLightShadows.png
  26. 二进制
      tests/validation/ReferenceImages/retail.png
  27. 二进制
      tests/validation/ReferenceImages/selfShadowing.png
  28. 二进制
      tests/validation/ReferenceImages/softShadows.png

+ 1 - 2
src/Shaders/ShadersInclude/bumpFragmentFunctions.fx

@@ -41,8 +41,7 @@
 	vec3 perturbNormal(mat3 cotangentFrame, vec2 uv)
 	{
 		vec3 map = texture2D(bumpSampler, uv).xyz;
-
-		map = map * 255. / 127. - 128. / 127.;
+		map = map * 2.0 - 1.0;
 
 		#ifdef NORMALXYSCALE
 			map = normalize(map * vec3(vBumpInfos.y, vBumpInfos.y, 1.0));

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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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