Merge pull request #3 from Seb-Park/foam2

Foam2 merge -- foam, skybox

1 files changed, 14 insertions, 2 deletions

diff --git a/src/arap.h b/src/arap.h
index 331cc3d..e5529d9 100644
--- a/src/arap.h
+++ b/src/arap.h
@@ -19,7 +19,8 @@ class ARAP
 {
 private:
     Shape m_shape;
-//    OceanShape m_oceanShape;
+    Shape m_foam_shape;
+
 
 public:
     ARAP();
@@ -43,6 +44,17 @@ public:
         m_shape.draw(shader, mode);
     }
 
+    void drawFoam(Shader *shader, GLenum mode)
+    {
+
+
+        m_foam_shape.draw(shader, mode);
+    }
+
+    double getTime() {
+        return m_time;
+    }
+
     void initGroundPlane(std::string texturePath, float depth, Shader* shader) {
         m_shape.initGroundPlane(texturePath, depth, shader);
     }
@@ -84,7 +96,7 @@ public:
 
     ocean_alt m_ocean;
         double m_time = 0.00;
-        double m_timestep = 0.03;
+        double m_timestep = 0.3;
 
     Eigen::Vector3f minCorner, maxCorner;
 };