summaryrefslogtreecommitdiff
path: root/src/particlesystem.h
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/particlesystem.h
parent7c0cd109b098b24279fb17b9a05ab846405d169b (diff)
texture particles
Diffstat (limited to 'src/particlesystem.h')
-rw-r--r--src/particlesystem.h17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/particlesystem.h b/src/particlesystem.h
index d3b0b8f..608e229 100644
--- a/src/particlesystem.h
+++ b/src/particlesystem.h
@@ -29,8 +29,7 @@ public:
particlesystem();
void update(double deltaTime);
- void draw(Shader *skybox_shader, Camera m_camera);
- void draw(Shader *shader, Camera m_camera, std::vector<Eigen::Vector3f> verts, Eigen::Matrix4f model);
+ void draw(Shader *shader, Camera m_camera, GLuint texture);
void init(std::vector<OceanSpray> verts);
@@ -60,12 +59,14 @@ private:
float d = 2.f;
std::vector<float> m_vertices = {
- -d, d,
- d,d,
- -d, -d,
- d, d,
- d, -d,
- -d, -d
+ -d, d, 0,1,
+ -d, -d, 0, 0,
+ d,d, 1,1,
+ //
+ d,d, 1,1,
+ -d, -d, 0, 0,
+
+ d, -d, 1, 0
};
GLuint VAO, VBO; // holds quad shape