From 3f0c7eb0a59d0404e6e12bf7f7ec7b3873993ccb Mon Sep 17 00:00:00 2001 From: FMS-Cat Date: Mon, 15 Mar 2021 12:41:30 +0900 Subject: [PATCH] aesthetics: mm --- src/shaders/cube.frag | 11 +++-------- src/shaders/rings.frag | 8 ++++---- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/shaders/cube.frag b/src/shaders/cube.frag index 1f02dd0..56a9650 100644 --- a/src/shaders/cube.frag +++ b/src/shaders/cube.frag @@ -27,15 +27,10 @@ float fbm( vec4 p ) { } void main() { - float rough = smoothstep( -0.6, 0.6, fbm( vPositionWithoutModel ) ); - // vec3 ndisp = rough * 0.2 * vec3( - // fbm( 1.577 + 4.0 * vPosition ), - // fbm( 12.577 + 4.0 * vPosition ), - // fbm( 27.577 + 4.0 * vPosition ) - // ); + float rough = sin( 14.0 * fbm( vPositionWithoutModel ) ); fragPosition = vPosition; fragNormal = vec4( normalize( vNormal ), 1.0 ); - fragColor = vec4( vec3( 0.5 - 0.3 * rough ), 1.0 ); - fragWTF = vec4( vec3( 0.3 + 0.2 * rough, 0.9, 0.0 ), MTL_PBR ); + fragColor = vec4( vec3( 0.5 ), 1.0 ); + fragWTF = vec4( vec3( 0.2 + 0.03 * rough, 0.17, 0.0 ), MTL_PBR ); } diff --git a/src/shaders/rings.frag b/src/shaders/rings.frag index 75082c9..defa278 100644 --- a/src/shaders/rings.frag +++ b/src/shaders/rings.frag @@ -2,7 +2,7 @@ precision highp float; -const int MTL_UNLIT = 1; +const int MTL_PBR = 2; in float vLife; in vec4 vPosition; @@ -17,7 +17,7 @@ uniform float time; void main() { fragPosition = vPosition; - fragNormal = vec4( vNormal, 1.0 ); - fragColor = vec4( 0.6, 1.8, 1.2, 1.0 ); - fragWTF = vec4( vec3( 0.0, 0.0, 0.0 ), MTL_UNLIT ); + fragNormal = vec4( normalize( vNormal ), 1.0 ); + fragColor = vec4( 0.2, 0.9, 0.5, 1.0 ); + fragWTF = vec4( vec3( 0.2, 0.2, 4.0 ), MTL_PBR ); }