Skip to content

Add desaturation functionality to Unshaded.j3md #1449

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
stephengold merged 6 commits into from
Dec 21, 2020
Merged

Add desaturation functionality to Unshaded.j3md #1449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dcf7ced
Update Unshaded.frag
yaRnMcDonuts Dec 8, 2020
4be95dc
Update Unshaded.j3md
yaRnMcDonuts Dec 8, 2020
0b170e0
Update Unshaded.frag
yaRnMcDonuts Dec 8, 2020
75e49cd
Update Unshaded.frag
yaRnMcDonuts Dec 19, 2020
1c0560d
Update Unshaded.frag
yaRnMcDonuts Dec 20, 2020
9c3daa7
Update Unshaded.j3md
yaRnMcDonuts Dec 20, 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: 10 additions & 1 deletion jme3-core/src/main/resources/Common/MatDefs/Misc/Unshaded.frag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ uniform vec4 m_Color;
uniform sampler2D m_ColorMap;
uniform sampler2D m_LightMap;

#ifdef DESATURATION
uniform float m_DesaturationValue;
#endif

varying vec2 texCoord1;
varying vec2 texCoord2;

Expand Down Expand Up @@ -45,6 +49,11 @@ void main(){
discard;
}
#endif

#ifdef DESATURATION
vec3 gray = vec3(dot(vec3(0.2126,0.7152,0.0722), color.rgb));
color.rgb = vec3(mix(color.rgb, gray, m_DesaturationValue));
#endif

gl_FragColor = color;
}
}
6 changes: 5 additions & 1 deletion jme3-core/src/main/resources/Common/MatDefs/Misc/Unshaded.j3md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ MaterialDef Unshaded {
Float ShadowMapSize

Boolean BackfaceShadows: true

// 1.0 indicates 100% desaturation
Float DesaturationValue
}

Technique {
Expand All @@ -82,7 +85,8 @@ MaterialDef Unshaded {
NUM_BONES : NumberOfBones
DISCARD_ALPHA : AlphaDiscardThreshold
NUM_MORPH_TARGETS: NumberOfMorphTargets
NUM_TARGETS_BUFFERS: NumberOfTargetsBuffers
NUM_TARGETS_BUFFERS: NumberOfTargetsBuffers
DESATURATION : DesaturationValue
}
}

Expand Down