Skip to content
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

refactor: optimize color calculations in MToon0xSingleShader #1510

Merged
merged 1 commit into from
Jan 2, 2025
Merged

refactor: optimize color calculations in MToon0xSingleShader #1510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 7 deletions src/webgl/shaderity_shaders/MToon0xSingleShader/MToon0xSingleShader.frag.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,9 @@ void main (){
float lightColorAttenuation = get_lightColorAttenuation(materialSID, 0);

vec3 shadeColorFactor = get_shadeColor(materialSID, 0);
vec3 shadeColor = shadeColorFactor * texture(u_shadeColorTexture, mainUv).xyz;
shadeColor.xyz = srgbToLinear(shadeColor.xyz);

vec3 litColor = litColorFactor.xyz * litTextureColor.xyz;
litColor.xyz = srgbToLinear(litColor.xyz);
vec3 shadeColor = shadeColorFactor * srgbToLinear(texture(u_shadeColorTexture, mainUv).xyz);

vec3 litColor = litColorFactor.xyz * srgbToLinear(litTextureColor.xyz);

float shadeShift = get_shadeShift(materialSID, 0);
float shadeToony = get_shadeToony(materialSID, 0);
Expand Down Expand Up @@ -230,7 +227,7 @@ void main (){
#ifdef RN_MTOON_IS_OUTLINE
#ifdef RN_MTOON_OUTLINE_COLOR_MIXED
vec3 outlineColor = get_outlineColor(materialSID, 0);
outlineColor = srgbToLinear(outlineColor);
// outlineColor = srgbToLinear(outlineColor);
float outlineLightingMix = get_outlineLightingMix(materialSID, 0);
rt0.xyz = outlineColor * mix(vec3(1.0), rt0.xyz, outlineLightingMix);
#endif
Expand All @@ -239,7 +236,7 @@ void main (){
float rimLift = get_rimLift(materialSID, 0);
vec3 rimColorFactor = get_rimColor(materialSID, 0);
vec3 rimTextureColor = texture(u_rimTexture, mainUv).xyz;
vec3 rimColor = srgbToLinear(rimColorFactor * rimTextureColor);
vec3 rimColor = rimColorFactor * srgbToLinear(rimTextureColor);
vec3 rim = pow(clamp(1.0 - dot(normal_inWorld, viewDirection) + rimLift, 0.0, 1.0), rimFresnelPower) * rimColor;

float staticRimLighting = 1.0;
Expand Down
11 changes: 4 additions & 7 deletions src/webgpu/shaderity_shaders/MToon0xSingleShader/MToon0xSingleShader.frag.wgsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,9 @@ fn main (
let lightColorAttenuation: f32 = get_lightColorAttenuation(materialSID, 0);

let shadeColorFactor: vec3f = get_shadeColor(materialSID, 0);
var shadeColor: vec3f = shadeColorFactor * textureSample(shadeColorTexture, shadeColorSampler, mainUv).xyz;
shadeColor = srgbToLinear(shadeColor.xyz);

var litColor: vec3f = litColorFactor.xyz * litTextureColor.xyz;
litColor = srgbToLinear(litColor.xyz);
var shadeColor: vec3f = shadeColorFactor * srgbToLinear(textureSample(shadeColorTexture, shadeColorSampler, mainUv).xyz);

var litColor: vec3f = litColorFactor.xyz * srgbToLinear(litTextureColor.xyz);

let shadeShift: f32 = get_shadeShift(materialSID, 0);
let shadeToony: f32 = get_shadeToony(materialSID, 0);
Expand Down Expand Up @@ -217,7 +214,7 @@ fn main (
#ifdef RN_MTOON_IS_OUTLINE
#ifdef RN_MTOON_OUTLINE_COLOR_MIXED
var outlineColor: vec3f = get_outlineColor(materialSID, 0);
outlineColor = srgbToLinear(outlineColor);
// outlineColor = srgbToLinear(outlineColor);
let outlineLightingMix: f32 = get_outlineLightingMix(materialSID, 0);
rt0 = vec4f(outlineColor * mix(vec3f(1.0), rt0.xyz, outlineLightingMix), rt0.w);
#endif
Expand All @@ -226,7 +223,7 @@ fn main (
let rimLift: f32 = get_rimLift(materialSID, 0);
let rimColorFactor: vec3f = get_rimColor(materialSID, 0);
let rimTextureColor: vec3f = textureSample(rimTexture, rimSampler, mainUv).xyz;
let rimColor: vec3f = srgbToLinear(rimColorFactor * rimTextureColor);
let rimColor: vec3f = rimColorFactor * srgbToLinear(rimTextureColor);
let rim: vec3f = pow(clamp(1.0 - dot(normal_inWorld, viewDirection) + rimLift, 0.0, 1.0), rimFresnelPower) * rimColor;

var staticRimLighting = 1.0;
Expand Down
Loading