diff options
| author | jjesswan <90643397+jjesswan@users.noreply.github.com> | 2024-05-09 15:13:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-09 15:13:41 -0400 |
| commit | f846ddba00aee29675f0bd4f5dbc87a94a422368 (patch) | |
| tree | 65a857125b91502974bceb40e24c1c7eff4bad59 /src/arap.cpp | |
| parent | 72bcf6a346dfcaeaac9520d8c524711192e77c3d (diff) | |
| parent | 675391d07f50d0067e7bab983433c6d86f5f8256 (diff) | |
Merge pull request #3 from Seb-Park/foam2
Foam2 merge -- foam, skybox
Diffstat (limited to 'src/arap.cpp')
| -rw-r--r-- | src/arap.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/arap.cpp b/src/arap.cpp index 2f10849..9bfbd27 100644 --- a/src/arap.cpp +++ b/src/arap.cpp @@ -38,6 +38,8 @@ void ARAP::init vertices = m_ocean.get_vertices(); triangles = m_ocean.get_faces(); m_shape.init(vertices, triangles); + m_foam_shape.init(vertices, triangles); + m_shape.setColor(0.27f, .803f, .96f); // Students, please don't touch this code: get min and max for viewport stuff @@ -104,8 +106,11 @@ void ARAP::update(double seconds) // the last update m_ocean.fft_prime(m_time); - // m_shape.setVertices_and_Normals(m_ocean.get_vertices(), m_ocean.getNormals()); - m_shape.setVertices(m_ocean.get_vertices()); + // m_shape.setVertices_and_Normals(m_ocean.get_vertices(), m_ocean.getNormals()); + m_shape.setVertices(m_ocean.get_vertices()); + + FoamConstants foam = m_ocean.getFoamConstants(); + m_foam_shape.setFoamInputs(m_shape.getVertices(), foam.wavelengths, foam.k_vectors, foam.texCoords); m_time += m_timestep; |