Skip to content

Shaders: Adhere to three.js nomenclature conventions #22263

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 1 commit into from
Aug 3, 2021
Merged

Shaders: Adhere to three.js nomenclature conventions #22263

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
4 changes: 2 additions & 2 deletions src/renderers/shaders/ShaderChunk/fog_fragment.glsl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ export default /* glsl */`

#ifdef FOG_EXP2

float fogFactor = 1.0 - exp( - fogDensity * fogDensity * fogDepth * fogDepth );
float fogFactor = 1.0 - exp( - fogDensity * fogDensity * vFogDepth * vFogDepth );

#else

float fogFactor = smoothstep( fogNear, fogFar, fogDepth );
float fogFactor = smoothstep( fogNear, fogFar, vFogDepth );

#endif

Expand Down
2 changes: 1 addition & 1 deletion src/renderers/shaders/ShaderChunk/fog_pars_fragment.glsl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export default /* glsl */`
#ifdef USE_FOG

uniform vec3 fogColor;
varying float fogDepth;
varying float vFogDepth;

#ifdef FOG_EXP2

Expand Down
2 changes: 1 addition & 1 deletion src/renderers/shaders/ShaderChunk/fog_pars_vertex.glsl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export default /* glsl */`
#ifdef USE_FOG

varying float fogDepth;
varying float vFogDepth;

#endif
`;
2 changes: 1 addition & 1 deletion src/renderers/shaders/ShaderChunk/fog_vertex.glsl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export default /* glsl */`
#ifdef USE_FOG

fogDepth = - mvPosition.z;
vFogDepth = - mvPosition.z;

#endif
`;