From afeffed93532c42540636c79cd9ae832656efef4 Mon Sep 17 00:00:00 2001 From: Sebastian Park Date: Tue, 23 Apr 2024 03:34:26 -0400 Subject: Add more textures. --- CMakeLists.txt | 2 ++ resources/images/anamorphic.jpg | Bin 0 -> 29950 bytes resources/images/caustic_sample.jpg | Bin 0 -> 87477 bytes resources/shaders/shader.frag | 2 +- src/glwidget.cpp | 2 +- 5 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 resources/images/anamorphic.jpg create mode 100644 resources/images/caustic_sample.jpg diff --git a/CMakeLists.txt b/CMakeLists.txt index cdacb7f..2a726bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,6 +86,8 @@ qt6_add_resources(${PROJECT_NAME} "Resources" resources/images/kitten.png resources/images/hello.png resources/images/sand_text.jpg + resources/images/caustic_sample.jpg + resources/images/anamorphic.jpg # resources/images/ground.png resources/shaders/shader.frag resources/shaders/shader.vert diff --git a/resources/images/anamorphic.jpg b/resources/images/anamorphic.jpg new file mode 100644 index 0000000..c3dceaf Binary files /dev/null and b/resources/images/anamorphic.jpg differ diff --git a/resources/images/caustic_sample.jpg b/resources/images/caustic_sample.jpg new file mode 100644 index 0000000..b6fec46 Binary files /dev/null and b/resources/images/caustic_sample.jpg differ diff --git a/resources/shaders/shader.frag b/resources/shaders/shader.frag index 2e4e780..970d443 100755 --- a/resources/shaders/shader.frag +++ b/resources/shaders/shader.frag @@ -64,7 +64,7 @@ void main() { vec4 diffuse = vec4(red * d, green * d, blue * d, 1.0f); vec4 specular = vec4(1, 1, 1, 1) * pow(spec, 10.f); // vec4 transmissive = vec4(vec3(refrUV, 1.f - refrUV.y), 1.f); - float waterBlurriness = 0.1f; + float waterBlurriness = 0.f; vec2 refrUVBlurry = (1 - beerAtt) * vec2(rand(refrUV), rand(vec4(pos, d))) * waterBlurriness + refrUV; vec4 transmissive = texture(sampler, vec2(refrUVBlurry)); diff --git a/src/glwidget.cpp b/src/glwidget.cpp index 472966b..5356bb3 100755 --- a/src/glwidget.cpp +++ b/src/glwidget.cpp @@ -81,7 +81,7 @@ void GLWidget::initializeGL() // INITIALIZE TEXTURE STUFF // Prepare filepath - QString kitten_filepath = QString(":/resources/images/kitten.png"); + QString kitten_filepath = QString(":/resources/images/anamorphic.jpg"); // TASK 1: Obtain image from filepath m_image = QImage(kitten_filepath); -- cgit v1.2.3-70-g09d2