hlsl shaders

data/models/demolevel/demolevel.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/world_grid.shd"
+shader "/pipelines/world_grid.hlsl"
 backface_culling true
 layer "default"
 

data/models/pistol/darkermetal.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/standard.shd"
+shader "/pipelines/standard.hlsl"
 backface_culling true
 layer "default"
 

data/models/pistol/magazine.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/standard.shd"
+shader "/pipelines/standard.hlsl"
 backface_culling true
 layer "default"
 

data/models/pistol/material_003.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/standard.shd"
+shader "/pipelines/standard.hlsl"
 backface_culling true
 layer "default"
 

data/models/pistol/metal.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/standard.shd"
+shader "/pipelines/standard.hlsl"
 backface_culling true
 layer "default"
 

data/models/pistol/muzzle.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/standard.shd"
+shader "/pipelines/standard.hlsl"
 backface_culling true
 layer "default"
 

data/models/pistol/wood.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/standard.shd"
+shader "/pipelines/standard.hlsl"
 backface_culling true
 layer "default"
 

data/models/shapes/cone.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/standard.shd"
+shader "/pipelines/standard.hlsl"
 backface_culling true
 layer "default"
 

data/models/shapes/cube.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/standard.shd"
+shader "/pipelines/standard.hlsl"
 backface_culling true
 layer "default"
 

data/models/shapes/cylinder.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/standard.shd"
+shader "/pipelines/standard.hlsl"
 backface_culling true
 layer "default"
 

data/models/shapes/material.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/standard.shd"
+shader "/pipelines/standard.hlsl"
 texture ""
 texture ""
 texture ""

data/models/shapes/monkey.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/standard.shd"
+shader "/pipelines/standard.hlsl"
 texture ""
 texture ""
 texture ""

data/models/shapes/plane.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/world_grid.shd"
+shader "/pipelines/world_grid.hlsl"
 backface_culling false
 layer "default"
 

data/models/shapes/sphere.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/standard.shd"
+shader "/pipelines/standard.hlsl"
 backface_culling true
 layer "default"
 

data/models/shapes/sphere_metal.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/standard.shd"
+shader "/pipelines/standard.hlsl"
 backface_culling true
 layer "default"
 

data/models/shapes/torus.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/standard.shd"
+shader "/pipelines/standard.hlsl"
 backface_culling true
 layer "default"
 texture ""

data/models/shapes/x.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/standard.shd"
+shader "/pipelines/standard.hlsl"
 texture ""
 texture ""
 texture ""

data/models/shapes/y.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/standard.shd"
+shader "/pipelines/standard.hlsl"
 texture ""
 texture ""
 texture ""

data/models/shapes/z.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/standard.shd"
+shader "/pipelines/standard.hlsl"
 texture ""
 texture ""
 texture ""

data/models/snake/darkgreen.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/standard.shd"
+shader "/pipelines/standard.hlsl"
 texture ""
 texture ""
 texture ""

data/models/snake/darkred.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/standard.shd"
+shader "/pipelines/standard.hlsl"
 texture ""
 texture ""
 texture ""

data/models/snake/lightgreen.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/standard.shd"
+shader "/pipelines/standard.hlsl"
 texture ""
 texture ""
 texture ""

data/models/snake/purple.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/standard.shd"
+shader "/pipelines/standard.hlsl"
 texture ""
 texture ""
 texture ""

data/models/snake/red.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/standard.shd"
+shader "/pipelines/standard.hlsl"
 texture ""
 texture ""
 texture ""

data/models/snake/teeth.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/standard.shd"
+shader "/pipelines/standard.hlsl"
 texture ""
 texture ""
 texture ""

data/models/snake/yellow.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/standard.shd"
+shader "/pipelines/standard.hlsl"
 texture ""
 texture ""
 texture ""

data/models/ybot/alpha_body_mat.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/standard.shd"
+shader "/pipelines/standard.hlsl"
 backface_culling true
 layer "default"
 

data/models/ybot/alpha_joints_mat.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/standard.shd"
+shader "/pipelines/standard.hlsl"
 backface_culling true
 layer "default"
 

data/models/ybot/material.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/standard.shd"
+shader "/pipelines/standard.hlsl"
 texture ""
 texture ""
 texture ""

data/models/ybot/material_001.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/standard.shd"
+shader "/pipelines/standard.hlsl"
 texture ""
 texture ""
 texture ""

data/particles/demo/demo.mat

@@ -1,4 +1,4 @@
-shader "/pipelines/particles.shd"
+shader "/pipelines/particles.hlsl"
 backface_culling true
 layer "transparent"
 

data/pipelines/atmo.hlsl

@@ -13,7 +13,7 @@ cbuffer Data : register (b4) {
 	float4 u_fog_scattering;
 	float u_fog_top;
 	float u_fog_enabled;
-	float u_godarys_enabled;
+	float u_godrays_enabled;
 	uint u_output;
 	uint u_optical_depth;
 	uint u_depth_buffer;
@@ -52,10 +52,11 @@ void main(uint3 thread_id : SV_DispatchThreadID) {
 	float3 sunlight = u_sunlight.rgb * u_sunlight.a;
 	float ndc_depth = bindless_textures[u_depth_buffer][thread_id.xy].r;
 	float2 uv = thread_id.xy / (float2)Global_framebuffer_size.xy;
-	float3 eyedir = getWorldNormal(uv);
+	float3 eyedir = getViewDirection(uv);
 	const float cos_theta = dot(eyedir, Global_light_dir.xyz);
 
 	if (ndc_depth > 0) {
+		// sky is hidden some object
 		float linear_depth = toLinearDepth(Global_inv_projection, ndc_depth);
 		float2 v = float2(
 			saturate(linear_depth / 50e3),
@@ -71,7 +72,8 @@ void main(uint3 thread_id : SV_DispatchThreadID) {
 			;
 	}
 	else {
-		float spot = smoothstep(0.0, 1000.0, phase(cos_theta, 0.9995)) * 200;
+		// sky is visible
+		float sun_spot = smoothstep(0.0, 1000.0, phase(cos_theta, 0.9995)) * 200;
 
 		float2 v = 1;
 		v.y = max(0, eyedir.y);
@@ -87,43 +89,43 @@ void main(uint3 thread_id : SV_DispatchThreadID) {
 		atmo.rgb = 
 			insc.aaa * miePhase(0.75, -cos_theta) * sunlight * u_scatter_mie.rgb
 			+ insc.rgb * rayleighPhase(-cos_theta) * sunlight * u_scatter_rayleigh.rgb
-			+ spot * exp(-opt_depth.x * extinction_rayleigh - opt_depth.y * extinction_mie) 
+			+ sun_spot * exp(-opt_depth.x * extinction_rayleigh - opt_depth.y * extinction_mie) 
 			;
 	}
 
 	if (u_fog_enabled > 0) {
-		const float3 fog_extinction = u_fog_scattering.rgb;
 		float linear_depth = ndc_depth > 0 ? toLinearDepth(Global_inv_projection, ndc_depth) : 1e5;
 		float dist = (linear_depth / dot(eyedir, Global_view_dir.xyz));
 		float3 p0 = Global_camera_world_pos.xyz;
 		float3 p1 = Global_camera_world_pos.xyz + eyedir * dist;
 		makeAscending(p0, p1);
 
-		if (p0.y < u_fog_top) {
-			if (p1.y > u_fog_top) {
+		const bool is_in_fog = p0.y < u_fog_top;
+		if (is_in_fog) {
+			const bool is_partially_in_fog = p1.y > u_fog_top;
+			if (is_partially_in_fog) {
+				// clip to top of fog
 				float3 dir = p1 - p0;
 				float3 diry1 =  dir / (abs(dir.y) < 1e-5 ? 1e-5 : dir.y);
 				p1 -= diry1 * (p1.y - u_fog_top);
 			}
 
-			float3 fog_transmittance = exp(-distanceInFog(p0, p1) * fog_extinction);
+			float3 fog_transmittance = exp(-distanceInFog(p0, p1) * u_fog_scattering.rgb);
 
 			float3 inscatter = 0;
 			{
-				const int STEP_COUNT = u_godarys_enabled > 0 ? 32 : 8;
+				const int STEP_COUNT = u_godrays_enabled > 0 ? 32 : 8;
 				float step_len = length(p1 - p0) / (STEP_COUNT + 1);
 				float offset = hash((float2)thread_id.xy * 0.05);
 				for (float f = (offset ) / STEP_COUNT; f < 1; f += 1.0 / (STEP_COUNT + 1)) {
 					float3 p = lerp(p0, p1, f);
 					float od = distanceInFog(p, p + Global_light_dir.xyz * 1e5); // TODO 1e5
 					od += distanceInFog(p, Global_camera_world_pos.xyz);
-					float shadow = u_godarys_enabled > 0 ? getShadowSimple(Global_shadowmap, p - Global_camera_world_pos.xyz) : 1;
-					inscatter += getFogDensity(p) * step_len * exp(-od * fog_extinction) * shadow;
+					float shadow = u_godrays_enabled > 0 ? getShadowSimple(Global_shadowmap, p - Global_camera_world_pos.xyz) : 1;
+					inscatter += getFogDensity(p) * step_len * exp(-od * u_fog_scattering.rgb) * shadow;
 				}
 			}
 
-			const float cos_theta = dot(eyedir, Global_light_dir.xyz);
-
 			scene.rgb = fog_transmittance;
 			atmo.rgb += inscatter * u_fog_scattering.rgb * sunlight * miePhase(0.25, -cos_theta);
 		}

data/pipelines/blit.hlsl

@@ -0,0 +1,25 @@
+//@include "pipelines/common.hlsli"
+
+cbuffer Drawcall : register(b4) {
+	float4 u_r_mask;
+	float4 u_g_mask;
+	float4 u_b_mask;
+	float4 u_a_mask;
+	float4 u_offsets;
+	uint2 u_position;
+	int2 u_scale;
+	uint u_input;
+	uint u_output;
+};
+
+[numthreads(16, 16, 1)]
+void main(uint3 thread_id : SV_DispatchThreadID) {
+	float4 value = bindless_textures[u_input][thread_id.xy];
+
+	bindless_rw_textures[u_output][thread_id.xy * u_scale + u_position] = float4(
+		dot(value, u_r_mask) + u_offsets.r,
+		dot(value, u_g_mask) + u_offsets.g,
+		dot(value, u_b_mask) + u_offsets.b,
+		dot(value, u_a_mask) + u_offsets.a
+	);
+}

data/pipelines/bloom_blur.hlsl

@@ -7,15 +7,15 @@ cbuffer Drawcall : register(b4) {
 	uint u_small;
 };
 
-struct Output {
+struct VSOutput {
 	float2 tc0 : TEXCOORD0;
 	float4 tc1 : TEXCOORD1;
 	float4 tc2 : TEXCOORD2;
 	float4 position : SV_POSITION;
 };
 
-Output mainVS(uint vertex_id : SV_VertexID) {
-	Output output;
+VSOutput mainVS(uint vertex_id : SV_VertexID) {
+	VSOutput output;
 	float2 uv;
 	output.position = fullscreenQuad(vertex_id, uv);
 	output.tc0 = uv;
@@ -41,14 +41,8 @@ Output mainVS(uint vertex_id : SV_VertexID) {
 	return output;
 }
 
-struct Input {
-	float2 tc0 : TEXCOORD0;
-	float4 tc1 : TEXCOORD1;
-	float4 tc2 : TEXCOORD2;
-};
-
 // blur bigger in one axis and merge with smaller (already blurred from previous step)
-float4 mainPS(Input input) : SV_Target {
+float4 mainPS(VSOutput input) : SV_Target {
 	return sampleBindless(LinearSamplerClamp, u_small, input.tc0.xy) * 0.5
 		+	((sampleBindless(LinearSamplerClamp, u_big, input.tc0.xy)) * 0.2270270270
 			+ (sampleBindless(LinearSamplerClamp, u_big, input.tc1.xy)) * 0.3162162162

data/pipelines/blur.hlsl

@@ -6,15 +6,15 @@ cbuffer Drawcall : register(b4) {
 	uint u_input;
 };
 
-struct Output {
+struct VSOutput {
 	float2 tc0 : TEXCOORD0;
 	float4 tc1 : TEXCOORD1;
 	float4 tc2 : TEXCOORD2;
 	float4 position : SV_POSITION;
 };
 
-Output mainVS(uint vertex_id : SV_VertexID) {
-	Output output;
+VSOutput mainVS(uint vertex_id : SV_VertexID) {
+	VSOutput output;
 	float2 uv;
 	output.position = fullscreenQuad(vertex_id, uv);
 	output.tc0 = uv;
@@ -40,13 +40,7 @@ Output mainVS(uint vertex_id : SV_VertexID) {
 	return output;
 }
 
-struct Input {
-	float2 tc0 : TEXCOORD0;
-	float4 tc1 : TEXCOORD1;
-	float4 tc2 : TEXCOORD2;
-};
-
-float4 mainPS(Input input) : SV_Target {
+float4 mainPS(VSOutput input) : SV_Target {
 	float2 uv0 = saturate(input.tc0.xy);
 	float2 uv1 = saturate(input.tc1.xy);
 	float2 uv2 = saturate(input.tc1.zw);