summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Park <SebPark03@gmail.com>2024-04-23 03:34:26 -0400
committerSebastian Park <SebPark03@gmail.com>2024-04-23 03:34:26 -0400
commitafeffed93532c42540636c79cd9ae832656efef4 (patch)
treec8c296dde035c0eef74561cd27d9e5898c24393a
parentf2d61fc06387ccb22ecb5cb6c42210736ac64c9f (diff)
Add more textures.
-rw-r--r--CMakeLists.txt2
-rw-r--r--resources/images/anamorphic.jpgbin0 -> 29950 bytes
-rw-r--r--resources/images/caustic_sample.jpgbin0 -> 87477 bytes
-rwxr-xr-xresources/shaders/shader.frag2
-rwxr-xr-xsrc/glwidget.cpp2
5 files changed, 4 insertions, 2 deletions
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
--- /dev/null
+++ b/resources/images/anamorphic.jpg
Binary files differ
diff --git a/resources/images/caustic_sample.jpg b/resources/images/caustic_sample.jpg
new file mode 100644
index 0000000..b6fec46
--- /dev/null
+++ b/resources/images/caustic_sample.jpg
Binary files 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);