Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 00:29:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Got some actual damped oscillation going.

Browse source
This commit is contained in:
Andrzej Kapolka 2013-10-07 18:02:03 -07:00
parent 3448ceccd2
commit b0bc122a48
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -64,6 +64,7 @@ void BlendFace::simulate(float deltaTime) {
MeshState state;
if (mesh.springiness > 0.0f) {
state.worldSpaceVertices.resize(mesh.vertices.size());
state.vertexVelocities.resize(mesh.vertices.size());
state.worldSpaceNormals.resize(mesh.vertices.size());
}
_meshStates.append(state);
@ -82,6 +83,7 @@ void BlendFace::simulate(float deltaTime) {
continue;
}
glm::vec3* destVertices = state.worldSpaceVertices.data();
glm::vec3* destVelocities = state.vertexVelocities.data();
glm::vec3* destNormals = state.worldSpaceNormals.data();
const FBXMesh& mesh = geometry.meshes.at(i);
const glm::vec3* sourceVertices = mesh.vertices.constData();
@ -108,16 +110,21 @@ void BlendFace::simulate(float deltaTime) {
if (_resetStates) {
for (int j = 0; j < vertexCount; j++) {
destVertices[j] = glm::vec3(baseTransform * glm::vec4(sourceVertices[j], 1.0f));
destVelocities[j] = glm::vec3();
}
_resetStates = false;
} else {
const float SPRINGINESS_MULTIPLIER = 20.0f;
const float DAMPING = 1.0f;
for (int j = 0; j < vertexCount; j++) {
destVertices[j] = glm::mix(destVertices[j], glm::vec3(baseTransform * glm::vec4(sourceVertices[j], 1.0f)), 0.25f);
destVelocities[j] += ((glm::vec3(baseTransform * glm::vec4(sourceVertices[j], 1.0f)) - destVertices[j]) *
mesh.springiness * SPRINGINESS_MULTIPLIER - destVelocities[j] * DAMPING) * deltaTime;
destVertices[j] += destVelocities[j] * deltaTime;
}
}
for (int j = 0; j < vertexCount; j++) {
destNormals[j] = glm::vec3(0.0f, 0.0f, 0.0f);
destNormals[j] = glm::vec3();
const glm::vec3& middle = destVertices[j];
for (QVarLengthArray<QPair<int, int>, 4>::const_iterator connection = mesh.vertexConnections.at(j).constBegin();

1
interface/src/avatar/BlendFace.h
View file

@ -55,6 +55,7 @@ private:
class MeshState {
public:
QVector<glm::vec3> worldSpaceVertices;
QVector<glm::vec3> vertexVelocities;
QVector<glm::vec3> worldSpaceNormals;
};