renamed brick to block, world gen stuff in separate file

This commit is contained in:
Piotrek
2021-04-25 16:22:24 +02:00
parent 9718ea68dd
commit 1bb45ec31b
15 changed files with 223 additions and 220 deletions
+9 -9
View File
@@ -1,10 +1,8 @@
/*
* Returns material albedo for given voxel
*/
vec3 getAlbedo(uint data)
{
return _Materials[data-1].albedo.rgb;
}
vec3 getAlbedo(uint data) { return _Materials[data-1].albedo.rgb; }
float getSpecular(uint data) { return _Materials[data-1].specular; }
/*
point: Hit point
@@ -14,12 +12,14 @@ vec3 getAlbedo(uint data)
vec3 applyLighting(vec3 hitPoint, vec3 view, vec3 normal, uint data)
{
// Lighting
vec3 light_color = vec3(1);
vec3 ambientColor = vec3(0.9, 0.9, 1.0);
vec3 ambient = ambientColor * 0.05;
vec3 sky = ambientColor * 0.1 * max(normal.y, 0);
vec3 ambient = light_color * 0.1;
vec3 diffuse = light_color * max(1.0-dot(normal, _SunDir), 0.0);
vec3 specular = light_color * pow(max(dot(view, reflect(_SunDir, normal)), 0.0), 32);
vec3 sunColor = vec3(1.0, 1.0, 0.9);
vec3 diffuse = sunColor * max(1.0-dot(normal, _SunDir), 0.0);
vec3 specular = sunColor * getSpecular(data) * pow(max(dot(view, reflect(_SunDir, normal)), 0.0), 32);
// Combine colors
return (ambient + diffuse + specular) * getAlbedo(data);
return (ambient + sky + diffuse + specular) * getAlbedo(data);
}