projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mini world rendering adjustments
[carveJwlIkooP6JGAAIwe30JlM.git]
/
shaders
/
scene_override.fs
diff --git
a/shaders/scene_override.fs
b/shaders/scene_override.fs
index 6d10a408dd8cb6632ebcd90468c09dc2ebd17cb5..f7dff2b6fc647a27ca8703ac07adbb75d41be7f3 100644
(file)
--- a/
shaders/scene_override.fs
+++ b/
shaders/scene_override.fs
@@
-31,7
+31,7
@@
void main(){
compute_motion_vectors();
compute_motion_vectors();
- vec3 vfrag = vec3(0.
6
);
+ vec3 vfrag = vec3(0.
7
);
vec3 qnorm = aNorm.xyz;
qnorm = normalize(floor(aNorm.xyz*4.0)*0.25);
vec3 qnorm = aNorm.xyz;
qnorm = normalize(floor(aNorm.xyz*4.0)*0.25);
@@
-43,16
+43,13
@@
void main(){
discard;
}
else{
discard;
}
else{
- if( !gl_FrontFacing ){
- qnorm *= -1.0;
- }
}
}
- vfrag = scene_compute_lighting( vfrag, qnorm, aCo );
+ vfrag = scene_compute_lighting( vfrag, qnorm, a
World
Co );
// dots
// dots
- float d0 = distance( a
World
Co, uPlayerPos.xyz )*2.0;
- float d1 = distance( a
World
Co, uSpawnPos.xyz );
+ float d0 = distance( aCo, uPlayerPos.xyz )*2.0;
+ float d1 = distance( aCo, uSpawnPos.xyz );
vec2 dm = smin( d0, d1, 10.0 );
float dd = fract(dm.x*0.2-g_realtime*0.5) *
vec2 dm = smin( d0, d1, 10.0 );
float dd = fract(dm.x*0.2-g_realtime*0.5) *
@@
-62,11
+59,11
@@
void main(){
// line
vec3 v0 = (uSpawnPos.xyz-uPlayerPos.xyz)*uSpawnPos.w;
// line
vec3 v0 = (uSpawnPos.xyz-uPlayerPos.xyz)*uSpawnPos.w;
- float t = clamp( dot(a
World
Co-uPlayerPos.xyz,v0), 0.0, uPlayerPos.w );
+ float t = clamp( dot(aCo-uPlayerPos.xyz,v0), 0.0, uPlayerPos.w );
vec3 p0 = uPlayerPos.xyz + v0*t;
vec3 p0 = uPlayerPos.xyz + v0*t;
- float d3 = distance(p0,a
World
Co);
+ float d3 = distance(p0,aCo);
emit += vec3(fract(t*0.2-g_realtime+d3*0.2)*max(0.0,1.0-d3*0.2));
oColour = vec4( vfrag+emit, 1.0 );
emit += vec3(fract(t*0.2-g_realtime+d3*0.2)*max(0.0,1.0-d3*0.2));
oColour = vec4( vfrag+emit, 1.0 );
- oColour = vec4( vfrag, 1.0 );
+
//
oColour = vec4( vfrag, 1.0 );
}
}