particlesss

6 files changed, 30 insertions, 16 deletions

diff --git a/resources/shaders/particles.frag b/resources/shaders/particles.frag
index 73a4eb4..99373e7 100644
--- a/resources/shaders/particles.frag
+++ b/resources/shaders/particles.frag
@@ -11,5 +11,5 @@ uniform float alpha;
 void main()
 {
    // color = (texture(sprite, TexCoords) * ParticleColor);
-    fragColor = vec4(0,1,0,alpha);
+    fragColor = vec4(1,1,1,alpha);
 }
diff --git a/resources/shaders/particles.vert b/resources/shaders/particles.vert
index 0905514..7b49a46 100644
--- a/resources/shaders/particles.vert
+++ b/resources/shaders/particles.vert
@@ -7,6 +7,8 @@ out vec4 ParticleColor;
 uniform mat4 view, projection, model;
 uniform vec3 offset;
 uniform vec4 color;
+uniform float alpha;
+
 
 void main()
 {
@@ -14,6 +16,6 @@ void main()
     //TexCoords = vertex.zw;
     ParticleColor = color;
    // gl_Position = projection *view* vec4((pos * scale) + vec2(offset), 0.0, 1.0);
-   gl_Position = (vec4(pos.x, pos.y, 0, 1) + projection*view*vec4(vec3(offset), 1))*scale;
+   gl_Position = (vec4(pos.x*alpha, pos.y*alpha, 0, 1) + projection*view*vec4(vec3(offset), 1))*scale;
 
 }
diff --git a/src/ocean/ocean_alt.cpp b/src/ocean/ocean_alt.cpp
index 9ead324..751fca5 100644
--- a/src/ocean/ocean_alt.cpp
+++ b/src/ocean/ocean_alt.cpp
@@ -386,6 +386,8 @@ void ocean_alt::update_ocean()
             OceanSpray s;
             s.height = v;
             s.slope = norm;
+            s.slope_vector = Eigen::Vector2f(m_slopes_x[i][0], m_slopes_z[i][0]);
+            //std::cout << s.slope_vector << std::endl;
                  m_heights.push_back(s);
         }
 
diff --git a/src/ocean/ocean_alt.h b/src/ocean/ocean_alt.h
index bbfce9a..7e293f9 100644
--- a/src/ocean/ocean_alt.h
+++ b/src/ocean/ocean_alt.h
@@ -30,6 +30,7 @@ struct FoamConstants{
 struct OceanSpray{
     Eigen::Vector3f height;
     Eigen::Vector3f slope;
+    Eigen::Vector2f slope_vector;
 
 };
 
@@ -79,8 +80,8 @@ private:
 	const double Lx = 512.0;
 	const double Lz = 512.0;
 
-    const int num_rows = 128;
-    const int num_cols = 128;
+    const int num_rows = 256;
+    const int num_cols = 256;
 
     const int num_tiles_x = 1;
     const int num_tiles_z = 1;
@@ -91,7 +92,7 @@ private:
 	const double lambda = .5; // how much displacement matters
 	const double spacing = 1.0; // spacing between grid points
 
-    const double A = 100; // numeric constant for the Phillips spectrum
+    const double A = 10000; // numeric constant for the Phillips spectrum
     const double V = 100; // wind speed
     const double gravity = 9.81;
     const double L = V*V/gravity;
diff --git a/src/particlesystem.cpp b/src/particlesystem.cpp
index b645929..566667f 100644
--- a/src/particlesystem.cpp
+++ b/src/particlesystem.cpp
@@ -35,6 +35,8 @@ float getRandomInRange(float max, float min){
 float getRandomY(){
     return getRandomInRange(.001,.2);
 }
+
+
 Eigen::Vector3f particlesystem::getRandomInitialVel(){
 
 
@@ -42,6 +44,16 @@ Eigen::Vector3f particlesystem::getRandomInitialVel(){
     return factor*Eigen::Vector3f(r.first, getRandomY(), r.second);
 }
 
+Eigen::Vector3f getInitVel(OceanSpray s){
+    float x = getRandomInRange(0,1);
+    float y = getRandomInRange(0.1, .9);
+    Eigen::Vector3f v = Eigen::Vector3f(s.slope_vector[0], y, s.slope_vector[1]) + Eigen::Vector3f(x,0,0);
+    return v*10.f;
+    //p.vel[1] = 0.1;
+
+
+}
+
 void particlesystem::init(std::vector<OceanSpray> verts){
     // make sure to set m_verts
     setVerts(verts);
@@ -51,10 +63,10 @@ void particlesystem::init(std::vector<OceanSpray> verts){
     for (auto v : m_verts){
         Particle p;
         p.pos = Eigen::Vector3f(v.height);
-        p.vel = v.slope*factor;
+        p.life = getRandomInRange(.1,1);
+       // p.vel = v.slope*factor;
         //p.vel = getRandomInitialVel();
-        p.vel = getRandomInitialVel().asDiagonal() * v.slope;
-        p.vel[1] = 0.1;
+        p.vel = getInitVel(v);
 
 
         m_particles.push_back(p);
@@ -95,7 +107,7 @@ void particlesystem::update(double deltaTime){
 
         // if particle is still alive, update pos
         if (p.life >= 0.f){
-            float r = getRandomInRange(.5, 1.f);
+            float r = getRandomInRange(.5, 1.6f);
             p.vel += gravity*dt*r;
             p.pos += p.vel * dt * 10.f;
 //            p.vel[1] -= (p.vel.dot(p.vel) / 2 + gravity[0]) * dt;
@@ -134,13 +146,10 @@ int particlesystem::getUnusedParticleIndex(){
     return -1;
 }
 
-void particlesystem::respawn_particle(Particle &p, OceanSpray new_pos){
+void particlesystem::respawn_particle(Particle &p, OceanSpray s){
 
-    p.pos = Eigen::Vector3f(new_pos.height);
-    p.vel = new_pos.slope*factor;
-    //p.vel = getRandomInitialVel();
-    p.vel = getRandomInitialVel().asDiagonal() * new_pos.slope;
-   p.vel[1] = .01;
+    p.pos = Eigen::Vector3f(s.height);
+    p.vel = getInitVel(s);
 
 
     // reset life
diff --git a/src/particlesystem.h b/src/particlesystem.h
index e2874dd..d3b0b8f 100644
--- a/src/particlesystem.h
+++ b/src/particlesystem.h
@@ -35,7 +35,7 @@ public:
     void init(std::vector<OceanSpray> verts);
 
     void setVerts(std::vector<OceanSpray> verts){
-        std::cout << "VERTS SIZE:" << verts.size() << std::endl;
+        //std::cout << "VERTS SIZE:" << verts.size() << std::endl;
         m_verts = verts;
 
     }