formatting
This commit is contained in:
parent
9ca01a920d
commit
7e05e4292a
@ -824,7 +824,6 @@ ComputeShader2D(V_CompositeCS, 8, 8)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Premultiply
|
|
||||||
selection_color.rgb *= selection_color.a;
|
selection_color.rgb *= selection_color.a;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -886,7 +885,6 @@ ComputeShader2D(V_CompositeCS, 8, 8)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Premultiply
|
|
||||||
grid_color.rgb *= grid_color.a;
|
grid_color.rgb *= grid_color.a;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -914,7 +912,8 @@ ComputeShader2D(V_CompositeCS, 8, 8)
|
|||||||
{
|
{
|
||||||
crosshair_color = InvertColor(Color_White);
|
crosshair_color = InvertColor(Color_White);
|
||||||
}
|
}
|
||||||
crosshair_color = Premul(crosshair_color);
|
|
||||||
|
crosshair_color.rgb *= crosshair_color.a;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -979,7 +978,7 @@ ComputeShader2D(V_BloomDownCS, 8, 8)
|
|||||||
{
|
{
|
||||||
f32 luminance = LuminanceFromColor(src);
|
f32 luminance = LuminanceFromColor(src);
|
||||||
f32 max_rgb = max(max(src.r, src.g), src.b); // So that we can get bloom on colors with high rgb, not just high luminance
|
f32 max_rgb = max(max(src.r, src.g), src.b); // So that we can get bloom on colors with high rgb, not just high luminance
|
||||||
f32 bright = max(luminance, max_rgb * 0.5);
|
f32 bright = max(luminance, (max_rgb - 1.0) * 0.5);
|
||||||
if (bright > 0)
|
if (bright > 0)
|
||||||
{
|
{
|
||||||
f32 threshold = 1.0;
|
f32 threshold = 1.0;
|
||||||
|
|||||||
@ -228,7 +228,7 @@ Enum(V_ParticleFlag)
|
|||||||
/* Name */ Debris, \
|
/* Name */ Debris, \
|
||||||
/* Flags */ V_ParticleFlag_Ground | V_ParticleFlag_PruneWhenStill | V_ParticleFlag_StainWhenPruned, \
|
/* Flags */ V_ParticleFlag_Ground | V_ParticleFlag_PruneWhenStill | V_ParticleFlag_StainWhenPruned, \
|
||||||
/* Stain rate, pen chance */ 0, 0, \
|
/* Stain rate, pen chance */ 0, 0, \
|
||||||
/* Base color */ 2.0, 0.5, 0, 1 \
|
/* Base color */ 2, 0.5, 0, 1 \
|
||||||
) \
|
) \
|
||||||
\
|
\
|
||||||
/* Air particles */ \
|
/* Air particles */ \
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user