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

added metallic and roughness

Browse Source
This commit is contained in:
J3oss
2021-06-27 00:00:48 +02:00
parent 32678e3422
commit 806ebcb0d6
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/shaders/default.frag
+6 -2
View File
@@ -2,8 +2,12 @@
#extension GL_EXT_nonuniform_qualifier : require #extension GL_EXT_nonuniform_qualifier : require
struct Material { struct Material {
vec3 baseColor; vec4 baseColor;
uint index; uint albedoTexture;
float metallicFactor;
float roughnessFactor;
uint metallicRoughnessTexture;
}; };
struct Light { struct Light {
assets/shaders/default.vert
+7 -3
View File
@@ -2,8 +2,12 @@
#extension GL_EXT_nonuniform_qualifier : require #extension GL_EXT_nonuniform_qualifier : require
struct Material { struct Material {
vec3 baseColor; vec4 baseColor;
uint index; uint albedoTexture;
float metallicFactor;
float roughnessFactor;
uint metallicRoughnessTexture;
}; };
struct Vertex { struct Vertex {
@@ -68,7 +72,7 @@ void main()
uint index = IndexBuffers[ PushConstants.indexBufferIndex ].indices[gl_VertexIndex]; uint index = IndexBuffers[ PushConstants.indexBufferIndex ].indices[gl_VertexIndex];
Vertex vertex = VertexBuffers[ PushConstants.vertexBufferIndex ].vertices[ index ]; Vertex vertex = VertexBuffers[ PushConstants.vertexBufferIndex ].vertices[ index ];
color = texture(texSampler[material.index],vertex.uv[0]).xyz; color = texture(texSampler[material.albedoTexture],vertex.uv[0]).xyz;
normal = vertex.normal.xyz; normal = vertex.normal.xyz;
gl_Position = Camera.projection * Camera.view * PushConstants.render_matrix * vec4(vertex.position.xyz, 1.0); gl_Position = Camera.projection * Camera.view * PushConstants.render_matrix * vec4(vertex.position.xyz, 1.0);