diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/glwidget.cpp | 16 | ||||
| -rw-r--r-- | src/ocean/ocean_alt.h | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/glwidget.cpp b/src/glwidget.cpp index 7d56389..0bf15d5 100755 --- a/src/glwidget.cpp +++ b/src/glwidget.cpp @@ -189,14 +189,14 @@ void GLWidget::paintGL() glClear(GL_DEPTH_BUFFER_BIT); -// m_pointShader->bind(); -// m_pointShader->setUniform("proj", m_camera.getProjection()); -// m_pointShader->setUniform("view", m_camera.getView()); -// m_pointShader->setUniform("vSize", m_vSize); -// m_pointShader->setUniform("width", width()); -// m_pointShader->setUniform("height", height()); -// m_arap.draw(m_pointShader, GL_POINTS); -// m_pointShader->unbind(); + m_pointShader->bind(); + m_pointShader->setUniform("proj", m_camera.getProjection()); + m_pointShader->setUniform("view", m_camera.getView()); + m_pointShader->setUniform("vSize", m_vSize); + m_pointShader->setUniform("width", width()); + m_pointShader->setUniform("height", height()); + m_arap.draw(m_pointShader, GL_POINTS); + m_pointShader->unbind(); } void GLWidget::resizeGL(int w, int h) diff --git a/src/ocean/ocean_alt.h b/src/ocean/ocean_alt.h index 1a96e1e..5eb9df0 100644 --- a/src/ocean/ocean_alt.h +++ b/src/ocean/ocean_alt.h @@ -63,8 +63,8 @@ private: const double Lx = 32.0; const double Lz = 32.0; - const int num_rows = 32; - const int num_cols = 32; + const int num_rows = 256; + const int num_cols = 256w; const int N = num_rows*num_cols; // total number of grid points const double lambda = 0.4; // how much displacement matters |