From 53f7f7490ffd603b714d338245cd703a5f6f859b Mon Sep 17 00:00:00 2001 From: Nehon Date: Mon, 19 Mar 2018 20:15:00 +0100 Subject: [PATCH] Some clean up in PBR j3MD --- .../Common/MatDefs/Light/PBRLighting.j3md | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.j3md b/jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.j3md index 2a0849439..a21ce6804 100644 --- a/jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.j3md +++ b/jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.j3md @@ -28,6 +28,9 @@ MaterialDef PBR Lighting { Texture2D RoughnessMap -LINEAR //Metallic and Roughness are packed respectively in the b and g channel of a single map + // r: unspecified + // g: Roughness + // b: Metallic Texture2D MetallicRoughnessMap -LINEAR // Texture of the emissive parts of the material @@ -47,17 +50,6 @@ MaterialDef PBR Lighting { Color Specular : 1.0 1.0 1.0 1.0 Float Glossiness : 1.0 - Vector4 ProbeData - - // Prefiltered Env Map for indirect specular lighting - TextureCubeMap PrefEnvMap -LINEAR - - // Irradiance map for indirect diffuse lighting - TextureCubeMap IrradianceMap -LINEAR - - //integrate BRDF map for indirect Lighting - Texture2D IntegrateBRDF -LINEAR - // Parallax/height map Texture2D ParallaxMap -LINEAR