formatting
This commit is contained in:
parent
a6a5e27cb9
commit
16c5e2620e
@ -243,10 +243,10 @@
|
||||
#define Stringize(x) Stringize1(x)
|
||||
|
||||
//- Sizes
|
||||
#define Kibi(n) (n*1024ULL)
|
||||
#define Mebi(n) (n*Kibi(1024ULL))
|
||||
#define Gibi(n) (n*Mebi(1024ULL))
|
||||
#define Tebi(n) (n*Gibi(1024ULL))
|
||||
#define Kibi(n) ((n) * (1ULL << 10))
|
||||
#define Mebi(n) ((n) * (1ULL << 20))
|
||||
#define Gibi(n) ((n) * (1ULL << 30))
|
||||
#define Tebi(n) ((n) * (1ULL << 40))
|
||||
|
||||
//- Time
|
||||
#define NsFromSeconds(s) ((i64)((s) * 1000000000.0))
|
||||
|
||||
@ -294,6 +294,8 @@ ComputeShader(V_SimParticlesCS, 64)
|
||||
////////////////////////////////////////////////////////////
|
||||
//~ Shade
|
||||
|
||||
// TODO: Remove this
|
||||
|
||||
ComputeShader2D(V_ShadeCS, 8, 8)
|
||||
{
|
||||
V_SharedFrame frame = G_Dereference<V_SharedFrame>(V_ShaderConst_Frame)[0];
|
||||
@ -314,15 +316,10 @@ ComputeShader2D(V_ShadeCS, 8, 8)
|
||||
Vec2 half_world_dims = Vec2(P_WorldPitch, P_WorldPitch) * 0.5;
|
||||
b32 is_in_world = all(cell_pos >= 0) && all(cell_pos < countof(stains));
|
||||
|
||||
//////////////////////////////
|
||||
//- Compute albedo
|
||||
|
||||
Vec4 albedo = 0;
|
||||
|
||||
//////////////////////////////
|
||||
//- Compute result
|
||||
|
||||
Vec4 result = albedo;
|
||||
Vec4 result = 0;
|
||||
|
||||
//////////////////////////////
|
||||
//- Write result
|
||||
@ -639,6 +636,7 @@ PixelShader(V_CompositePS, V_CompositePSOutput, V_CompositePSInput input)
|
||||
// TODO: Remove this
|
||||
|
||||
Vec4 crosshair_color = 0;
|
||||
if (!frame.is_editing)
|
||||
{
|
||||
f32 dist = length(frame.screen_crosshair - screen_pos);
|
||||
if (dist < 4)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user