diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/shader.frag | 6 | ||||
| -rw-r--r-- | src/vksetup.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/shader.frag b/src/shader.frag index 0b45743..cba9365 100644 --- a/src/shader.frag +++ b/src/shader.frag @@ -17,9 +17,9 @@ layout(binding = 0) uniform UniformBufferObject { } ubo; void main() { - float pulse = sin(ubo.time * 20) * .5 + .5; - outColor = vec4(fragColor * texture(texSampler, fragTexCoord).rgb , 1.0); - //outColor = texture(texSampler, fragTexCoord); + float pulse = sin(ubo.time * 2) * .5 + .5; + // outColor = vec4(fragColor * texture(texSampler, fragTexCoord).rgb , 1.0); + outColor = texture(texSampler, fragTexCoord); //outColor = vec4(fragColor, 1); //float repeat = 10; //float f = zmod(ubo.time, repeat); diff --git a/src/vksetup.h b/src/vksetup.h index a659136..715fef7 100644 --- a/src/vksetup.h +++ b/src/vksetup.h @@ -46,7 +46,7 @@ #include <shaderc/shaderc.h> -#define VMA_DEBUG_LOG(...) printf(__VA_ARGS__) +#define VMA_DEBUG_LOG(...) printf(__VA_ARGS__); printf("\n") #define VMA_DEBUG_INITIALIZE_ALLOCATIONS 1 #define VMA_DEBUG_MARGIN 16 #include "vk_mem_alloc.h" |