summaryrefslogtreecommitdiff
path: root/src/glwidget.cpp
diff options
context:
space:
mode:
authorjjesswan <jessica_wan@brown.edu>2024-05-10 04:24:54 -0400
committerjjesswan <jessica_wan@brown.edu>2024-05-10 04:24:54 -0400
commit690670c920549828733fddc12e45bae34271aff4 (patch)
tree77fb560ce868de0b16634a33034722721cdeeb7a /src/glwidget.cpp
parent7c0cd109b098b24279fb17b9a05ab846405d169b (diff)
texture particles
Diffstat (limited to 'src/glwidget.cpp')
-rwxr-xr-xsrc/glwidget.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/glwidget.cpp b/src/glwidget.cpp
index f8547a6..cbc6971 100755
--- a/src/glwidget.cpp
+++ b/src/glwidget.cpp
@@ -104,6 +104,8 @@ void GLWidget::initializeGL()
m_halftone_tex = loadTextureFromFile(":resources/images/halftone.png").textureID;
m_foam_tex = loadTextureFromFile(":resources/images/foam3.png").textureID;
+ m_particle_tex = loadTextureFromFile(":resources/images/particle.png").textureID;
+
m_causticsShader = new Shader(":resources/shaders/caustics.vert", ":resources/shaders/caustics.frag");
@@ -464,7 +466,7 @@ void GLWidget::paintGL()
m_skybox.draw(m_skyboxShader, m_camera);
- m_particles.draw(m_particleShader, m_camera);
+ m_particles.draw(m_particleShader, m_camera, m_particle_tex);