From 0d6b3ded83f583a858368b1bbceda60ba65453a2 Mon Sep 17 00:00:00 2001 From: sotech117 Date: Thu, 9 May 2024 15:29:13 -0400 Subject: fix spacing on wave, fix normals and displacement, add retiling --- src/arap.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src/arap.cpp') diff --git a/src/arap.cpp b/src/arap.cpp index 2f10849..729de07 100644 --- a/src/arap.cpp +++ b/src/arap.cpp @@ -34,7 +34,7 @@ void ARAP::init // if (MeshLoader::loadTriMesh(m_mesh_path, vertices, triangles)) { // m_shape.init(vertices, triangles); // } - + m_ocean.update_ocean(); vertices = m_ocean.get_vertices(); triangles = m_ocean.get_faces(); m_shape.init(vertices, triangles); @@ -102,10 +102,16 @@ void ARAP::update(double seconds) // Note that the "seconds" parameter represents the amount of time that has passed since // 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_ocean.fft_prime(m_time); + m_ocean.update_ocean(); + // std::cout << "updating ocean" << std::endl; + auto tmp = m_ocean.get_vertices(); + // print the vertex +// std::cout << "faces\t" << m_ocean.get_faces().size() << std::endl; +// std::cout << "noormals\t" << m_ocean.getNormals().size() << std::endl; +// std::cout << "vertices\t" << tmp.size() << std::endl; + m_shape.setVertices_and_Normals(m_ocean.get_vertices(), m_ocean.getNormals()); + // m_shape.setVertices(m_ocean.get_vertices()); m_time += m_timestep; -- cgit v1.2.3-70-g09d2