From ee3a4d6073421fd9e17e832dc9d10e151e6029ea Mon Sep 17 00:00:00 2001 From: tylermurphy534 Date: Sun, 25 Sep 2022 23:08:03 -0400 Subject: remove color vertex data, mipmapping --- res/image/dirt.jpg | Bin 0 -> 5956 bytes res/shaders/simple_shader.frag | 2 +- res/shaders/simple_shader.vert | 7 +++---- 3 files changed, 4 insertions(+), 5 deletions(-) create mode 100644 res/image/dirt.jpg (limited to 'res') diff --git a/res/image/dirt.jpg b/res/image/dirt.jpg new file mode 100644 index 0000000..c3a679d Binary files /dev/null and b/res/image/dirt.jpg differ diff --git a/res/shaders/simple_shader.frag b/res/shaders/simple_shader.frag index a4e2b7e..f3ae526 100755 --- a/res/shaders/simple_shader.frag +++ b/res/shaders/simple_shader.frag @@ -23,5 +23,5 @@ layout(push_constant) uniform Push { } push; void main() { - outColor = mix(texture(texSampler, fragUv), vec4(fragColor, 1.0), .5); + outColor = mix(texture(texSampler, fragUv), vec4(fragColor, 1.0), .1); } \ No newline at end of file diff --git a/res/shaders/simple_shader.vert b/res/shaders/simple_shader.vert index 04b603e..30e7a79 100755 --- a/res/shaders/simple_shader.vert +++ b/res/shaders/simple_shader.vert @@ -1,9 +1,8 @@ #version 450 layout (location = 0) in vec3 position; -layout (location = 1) in vec3 color; -layout (location = 2) in vec3 normal; -layout (location = 3) in vec2 uv; +layout (location = 1) in vec3 normal; +layout (location = 2) in vec2 uv; layout (location = 0) out vec3 fragColor; layout (location = 1) out vec2 fragUv; @@ -32,6 +31,6 @@ void main() { float lightIntensity = AMBIENT + max(dot(normalWorldSpace, ubo.directionToLight), 0); - fragColor = lightIntensity * vec3(1/position.y,position.y,clamp(sin(position.x - position.z), 0, 1)); + fragColor = lightIntensity * vec3(1); fragUv = uv; } \ No newline at end of file -- cgit v1.2.3-freya