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

Merge branch 'master' of https://github.com/j3oss/evol-assets

Browse Source
This commit is contained in:
Robear Selwans
2021-06-27 01:26:27 +02:00
parent 3678ea4b9f a0fa214b6b
commit 85dbdb57f3
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/shaders/default.frag
+2
View File
@@ -5,6 +5,8 @@ struct Material {
vec4 baseColor; vec4 baseColor;
uint albedoTexture; uint albedoTexture;
uint normalTexture;
float metallicFactor; float metallicFactor;
float roughnessFactor; float roughnessFactor;
uint metallicRoughnessTexture; uint metallicRoughnessTexture;
assets/shaders/default.vert
+9 -1
View File
@@ -5,6 +5,8 @@ struct Material {
vec4 baseColor; vec4 baseColor;
uint albedoTexture; uint albedoTexture;
uint normalTexture;
float metallicFactor; float metallicFactor;
float roughnessFactor; float roughnessFactor;
uint metallicRoughnessTexture; uint metallicRoughnessTexture;
@@ -72,8 +74,14 @@ 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.albedoTexture],vertex.uv[0]).xyz; color = texture(texSampler[material.albedoTexture], vertex.uv[0]).xyz;
if(material.normalTexture != 0) {
normal = texture(texSampler[material.normalTexture], vertex.uv[0]).xyz;
}
else {
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);
} }