Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 21:36:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

update physics stats names

Browse source
This commit is contained in:
Andrew Meadows 2014-07-31 13:33:46 -07:00
parent fc1d805d54
commit 9d2744296e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/shared/src/PhysicsSimulation.cpp
View file

@ -158,7 +158,7 @@ void PhysicsSimulation::stepForward(float deltaTime, float minError, int maxIter
resolveCollisions(); resolveCollisions();
{ // enforce constraints { // enforce constraints
PerformanceTimer perfTimer("4-enforce"); PerformanceTimer perfTimer("5-enforce");
error = 0.0f; error = 0.0f;
for (int i = 0; i < numDolls; ++i) { for (int i = 0; i < numDolls; ++i) {
error = glm::max(error, _dolls[i]->enforceRagdollConstraints()); error = glm::max(error, _dolls[i]->enforceRagdollConstraints());
@ -220,7 +220,7 @@ void PhysicsSimulation::computeCollisions() {
} }
void PhysicsSimulation::resolveCollisions() { void PhysicsSimulation::resolveCollisions() {
PerformanceTimer perfTimer("3-resolve"); PerformanceTimer perfTimer("4-resolve");
// walk all collisions, accumulate movement on shapes, and build a list of affected shapes // walk all collisions, accumulate movement on shapes, and build a list of affected shapes
QSet<Shape*> shapes; QSet<Shape*> shapes;
int numCollisions = _collisions.size(); int numCollisions = _collisions.size();
@ -268,7 +268,7 @@ void PhysicsSimulation::enforceContacts() {
} }
void PhysicsSimulation::updateContacts() { void PhysicsSimulation::updateContacts() {
PerformanceTimer perfTimer("3.5-updateContacts"); PerformanceTimer perfTimer("3-updateContacts");
int numCollisions = _collisions.size(); int numCollisions = _collisions.size();
for (int i = 0; i < numCollisions; ++i) { for (int i = 0; i < numCollisions; ++i) {
CollisionInfo* collision = _collisions.getCollision(i); CollisionInfo* collision = _collisions.getCollision(i);