projects
/
hair
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Removed the calls to the 1st collision detection attempt
[hair]
/
src
/
hair.cc
diff --git
a/src/hair.cc
b/src/hair.cc
index
b99d133
..
ef93f2c
100644
(file)
--- a/
src/hair.cc
+++ b/
src/hair.cc
@@
-187,7
+187,7
@@
void Hair::update(float dt)
hair[i].velocity += ((-hair[i].velocity * DAMPING) + accel) * dt;
Vec3 new_pos = hair[i].pos + hair[i].velocity * dt;
- hair[i].pos = handle_collision(new_pos);
+ hair[i].pos = new_pos; //= handle_collision(new_pos);
dbg_force = force;
}