X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Fhair.h;h=9ef5130499cba99497baf0d104f4d4491ba8d56e;hb=f6d33178841d379dc9fe111970aff926bde0793c;hp=5ef54d0462462d1a18897aa7a9847feb3ee86c81;hpb=b07896ffc92093a3e8adb4953d22927a5874e43d;p=hair

diff --git a/src/hair.h b/src/hair.h
index 5ef54d0..9ef5130 100644
--- a/src/hair.h
+++ b/src/hair.h
@@ -4,6 +4,7 @@
 #include <gmath/gmath.h>
 
 #include "mesh.h" 
+#include "object.h"
 
 struct HairStrand {
 	Vec3 pos;
@@ -17,6 +18,7 @@ private:
 	float hair_length;
 	std::vector<HairStrand> hair;
 	Mat4 xform;
+	std::vector<CollSphere *> colliders;
 
 public:
 	Hair();
@@ -27,6 +29,8 @@ public:
 
 	void set_transform(Mat4 &xform);
 	void update(float dt);
+	void add_collider(CollSphere *cobj);
+	Vec3 handle_collision(const Vec3 &v) const;
 };
 
 #endif //PARTICLES_H_