summaryrefslogtreecommitdiff
path: root/src/arap.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/arap.h')
-rw-r--r--src/arap.h16
1 files changed, 15 insertions, 1 deletions
diff --git a/src/arap.h b/src/arap.h
index 2c768bb..39b2076 100644
--- a/src/arap.h
+++ b/src/arap.h
@@ -20,6 +20,9 @@ class ARAP
{
private:
Shape m_shape;
+ Shape m_foam_shape;
+
+
// OceanShape m_oceanShape;
void initCausticsShape(int res);
public:
@@ -43,6 +46,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 +98,7 @@ public:
ocean_alt m_ocean;
double m_time = 0.00;
- double m_timestep = 0.1;
+ double m_timestep = 0.3;
Eigen::Vector3f minCorner, maxCorner;