Merge branch 'shaders'

1 files changed, 6 insertions, 2 deletions

diff --git a/src/arap.h b/src/arap.h
index e5529d9..39b2076 100644
--- a/src/arap.h
+++ b/src/arap.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "graphics/shape.h"
+//#include "graphics/simpleshape.h"
 //#include "graphics/oceanshape.h"
 #include "Eigen/StdList"
 #include "Eigen/StdVector"
@@ -22,6 +23,8 @@ private:
     Shape m_foam_shape;
 
 
+//    OceanShape m_oceanShape;
+    void initCausticsShape(int res);
 public:
     ARAP();
 
@@ -39,8 +42,7 @@ public:
 
     void draw(Shader *shader, GLenum mode)
     {
-
-
+//        m_causticsShape.draw(shader, mode);
         m_shape.draw(shader, mode);
     }
 
@@ -99,5 +101,7 @@ public:
         double m_timestep = 0.3;
 
     Eigen::Vector3f minCorner, maxCorner;
+
+    Shape m_causticsShape;
 };