evol3D/evol-assets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New meshes and tangents

Browse Source 
Signed-off-by: Robear Selwans <robear.selwans@outlook.com>
This commit is contained in:
Robear Selwans
2021-06-27 19:20:18 +02:00
parent 367c6f601b
commit 52fdd653ef
115 changed files with 312 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/shaders/default.frag
+41 -8
View File
@@ -21,7 +21,15 @@ struct Scene {
uint lightsCount;
};
vec3 directional_light = vec3(-1.0,-1.0,-1.0);
vec3 directional_light = vec3(1.0);
layout( push_constant ) uniform constants
{
mat4 render_matrix;
uint indexBufferIndex;
uint vertexBufferIndex;
uint materialBufferIndex;
} PushConstants;
layout(set = 0, binding = 0) uniform SceneData {
layout(align = 16) Scene mesh;
@@ -31,17 +39,42 @@ layout(set = 0, binding = 1) uniform LightBuffer {
layout(align = 16) Light lights[];
} LightsBuffers;
// layout(set = 2, binding = 4) uniform sampler2D texSampler[];
layout(set = 2, binding = 3) buffer MaterialBuffer {
layout(align = 16) Material materials[];
} MaterialBuffers;
layout(location = 0) in vec3 normal;
layout(location = 1) in vec3 color;
layout(location = 2) flat in Material material;
layout(set = 2, binding = 4) uniform sampler2D texSampler[];
layout(location = 0) in vec2 uv;
layout(location = 1) smooth in mat3 TBN;
layout(location = 0) out vec4 outColor;
void main() {
float intensity = ((dot(normalize(normal), normalize(directional_light)) +1)/2.0)+0.05;
Material material = MaterialBuffers.materials[ PushConstants.materialBufferIndex ];
mat3 normalMatrix = transpose(inverse(mat3(PushConstants.render_matrix)));
// outColor = vec4(color * intensity, 1.0);
outColor = vec4(color * intensity, 1.0);
vec3 out_normal;
// if(material.normalTexture == 0) {
// out_normal = normalize(normalMatrix * TBN[2].xyz);
// } else {
vec3 sampled_normal = texture(texSampler[material.normalTexture], uv).rgb;
sampled_normal = 2.0 * sampled_normal - vec3(1.0);
out_normal = normalize(normalMatrix * TBN * sampled_normal);
// }
float intensity = dot(out_normal, normalize(directional_light)) + 0.2;
vec3 inColor;
if(material.albedoTexture == 0) {
inColor = material.baseColor.xyz;
} else {
inColor = texture(texSampler[material.albedoTexture], uv).xyz;
}
// outColor = vec4(inColor * intensity, 1.0);
// outColor = vec4(inColor, 1.0);
// outColor = vec4(vec3(intensity), 1.0);
outColor = vec4(out_normal, 1.0);
}