Skip to content

Packing AO in the metallic roughness map #1403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 10, 2020
Merged

Packing AO in the metallic roughness map #1403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e8f341
Packing AO in the metallic roughness map
yaRnMcDonuts Oct 10, 2020
ede2c7a
Update PBRLighting.j3md
yaRnMcDonuts Oct 10, 2020
2c37f24
Update PBRLighting.frag
yaRnMcDonuts Oct 10, 2020
22cce94
Update PBRLighting.frag
yaRnMcDonuts Oct 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.frag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,12 @@ void main(){
vec4 albedo = Color;
#endif

//ao in r channel, roughness in green channel, metallic in blue channel!
vec3 aoRoughnessMetallicValue = vec3(1.0, 1.0, 0.0);
#ifdef USE_PACKED_MR
vec2 rm = texture2D(m_MetallicRoughnessMap, newTexCoord).gb;
float Roughness = rm.x * max(m_Roughness, 1e-4);
float Metallic = rm.y * max(m_Metallic, 0.0);
aoRoughnessMetallicValue = texture2D(m_MetallicRoughnessMap, newTexCoord).rgb;
float Roughness = aoRoughnessMetallicValue.g * max(m_Roughness, 1e-4);
float Metallic = aoRoughnessMetallicValue.b * max(m_Metallic, 0.0);
#else
#ifdef ROUGHNESSMAP
float Roughness = texture2D(m_RoughnessMap, newTexCoord).r * max(m_Roughness, 1e-4);
Expand Down Expand Up @@ -224,6 +226,9 @@ void main(){
specularColor.rgb *= lightMapColor;
#endif

#if defined(AO_PACKED_IN_MR_MAP) && defined(USE_PACKED_MR)
ao = aoRoughnessMetallicValue.rrr;
#endif

float ndotv = max( dot( normal, viewDir ),0.0);
for( int i = 0;i < NB_LIGHTS; i+=3){
Expand Down
3 changes: 2 additions & 1 deletion jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.j3md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ MaterialDef PBR Lighting {
Boolean SeparateTexCoord
// the light map is a gray scale ao map, on ly the r channel will be read.
Boolean LightMapAsAOMap

Boolean AoPackedInMRMap
//shadows
Int FilterMode
Boolean HardwareShadows
Expand Down Expand Up @@ -158,6 +158,7 @@ MaterialDef PBR Lighting {
NORMAL_TYPE: NormalType
VERTEX_COLOR : UseVertexColor
AO_MAP: LightMapAsAOMap
AO_PACKED_IN_MR_MAP : AoPackedInMRMap
NUM_MORPH_TARGETS: NumberOfMorphTargets
NUM_TARGETS_BUFFERS: NumberOfTargetsBuffers
HORIZON_FADE: HorizonFade
Expand Down