Failed hack for collision detection with a sphere.

[hair] / src / hair.h

diff --git a/src/hair.h b/src/hair.h
index 23aff83..9ef5130 100644 (file)
--- a/src/hair.h
+++ b/src/hair.h
@@ -4,12 +4,11 @@
 #include <gmath/gmath.h>
 
 #include "mesh.h" 
+#include "object.h"
 
 struct HairStrand {
        Vec3 pos;
        Vec3 velocity;
-       /* directions relative to the spawn point */
-       Vec3 anchor_dirs[3];
        Vec3 spawn_pt;
        Vec3 spawn_dir;
 };
@@ -19,6 +18,7 @@ private:
        float hair_length;
        std::vector<HairStrand> hair;
        Mat4 xform;
+       std::vector<CollSphere *> colliders;
 
 public:
        Hair();
@@ -28,6 +28,9 @@ public:
        void draw() const;
 
        void set_transform(Mat4 &xform);
+       void update(float dt);
+       void add_collider(CollSphere *cobj);
+       Vec3 handle_collision(const Vec3 &v) const;
 };
 
 #endif //PARTICLES_H_