Merge pull request #5 from Seb-Park/new_parti

texture particles

4 files changed, 21 insertions, 16 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);
 
 
 
diff --git a/src/glwidget.h b/src/glwidget.h
index 50d6347..ac9b1d0 100755
--- a/src/glwidget.h
+++ b/src/glwidget.h
@@ -105,6 +105,7 @@ private:
     // FOAM
     GLuint m_halftone_tex;
     GLuint m_foam_tex;
+    GLuint m_particle_tex;
 
 
     // Timing
diff --git a/src/particlesystem.cpp b/src/particlesystem.cpp
index 566667f..65d61ac 100644
--- a/src/particlesystem.cpp
+++ b/src/particlesystem.cpp
@@ -63,7 +63,7 @@ void particlesystem::init(std::vector<OceanSpray> verts){
     for (auto v : m_verts){
         Particle p;
         p.pos = Eigen::Vector3f(v.height);
-        p.life = getRandomInRange(.1,1);
+        p.life = getRandomInRange(.6,1);
        // p.vel = v.slope*factor;
         //p.vel = getRandomInitialVel();
         p.vel = getInitVel(v);
@@ -80,7 +80,7 @@ void particlesystem::init(std::vector<OceanSpray> verts){
     glBindBuffer(GL_ARRAY_BUFFER, VBO);
     glBufferData(GL_ARRAY_BUFFER, m_vertices.size()*sizeof(float), m_vertices.data(), GL_STATIC_DRAW);
 
-    glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 2*sizeof(float), (void*)0);
+    glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, 4*sizeof(float), (void*)0);
 
     // unbind
     glEnableVertexAttribArray(0);
@@ -103,7 +103,7 @@ void particlesystem::update(double deltaTime){
     float dt = deltaTime;
     // update all particles values
     for (Particle &p : m_particles){
-       p.life -= deltaTime * getRandomInRange(.1f, .5f);
+       p.life -= deltaTime * getRandomInRange(.1f, .9f);
 
         // if particle is still alive, update pos
         if (p.life >= 0.f){
@@ -157,7 +157,7 @@ void particlesystem::respawn_particle(Particle &p, OceanSpray s){
 
 }
 
-void particlesystem::draw(Shader *shader, Camera  m_camera){
+void particlesystem::draw(Shader *shader, Camera  m_camera, GLuint texture){
 
     shader->bind();
 
@@ -165,9 +165,10 @@ void particlesystem::draw(Shader *shader, Camera  m_camera){
 
 
     // activate texture
-//    glActiveTexture(GL_TEXTURE10);
-//    glBindTexture(GL_TEXTURE_CUBE_MAP, skybox_tex);
-//    glUniform1i(glGetUniformLocation(shader->id(), "cubeMap"), 9); // bind texture at slot 9
+    glActiveTexture(GL_TEXTURE10);
+    glBindTexture(GL_TEXTURE_2D, texture);
+    glUniform1i(glGetUniformLocation(shader->id(), "particle_texture"), 10);
+
 
 
     // manually set view and projection, for non-translating view
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