Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 16:09:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

More springy, more damp. Removed unused variable.

Browse source
This commit is contained in:
Andrzej Kapolka 2013-10-08 11:26:15 -07:00
parent acaf7d4f88
commit 506f667083
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/avatar/BlendFace.cpp
View file

@ -57,7 +57,6 @@ void BlendFace::simulate(float deltaTime) {
// set up world vertices on first simulate after load
const FBXGeometry& geometry = _geometry->getFBXGeometry();
bool first = false;
if (_meshStates.isEmpty()) {
QVector<glm::vec3> vertices;
foreach (const FBXMesh& mesh, geometry.meshes) {
@ -115,8 +114,8 @@ void BlendFace::simulate(float deltaTime) {
_resetStates = false;
} else {
const float SPRINGINESS_MULTIPLIER = 20.0f;
const float DAMPING = 1.0f;
const float SPRINGINESS_MULTIPLIER = 200.0f;
const float DAMPING = 5.0f;
for (int j = 0; j < vertexCount; j++) {
destVelocities[j] += ((glm::vec3(baseTransform * glm::vec4(sourceVertices[j], 1.0f)) - destVertices[j]) *
mesh.springiness * SPRINGINESS_MULTIPLIER - destVelocities[j] * DAMPING) * deltaTime;