Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2011-05-31 13:17:14 +0000
committerStijn Buys <ingar@osirion.org>2011-05-31 13:17:14 +0000
commitb7d62e90a7a0e4e404623af0c646495a3dd3fd2b (patch)
treea8c15b9a40428e5c7bb03138a9260f16f4e3daf4 /src/core/entity.cc
parent1c63cbf204b1d2c667ce9f821ccb197d0ffb0ac3 (diff)
Removed a forced recalculateLocalAabb for compound shapes,
semi-colon in chat messages doesn't truncate the chat text any more, changed chat prompt to "Command:" if the first character is a slash, small misc cleanups
Diffstat (limited to 'src/core/entity.cc')
-rw-r--r--src/core/entity.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/core/entity.cc b/src/core/entity.cc
index 6ce94a7..84f4de0 100644
--- a/src/core/entity.cc
+++ b/src/core/entity.cc
@@ -492,7 +492,6 @@ void Entity::frame(const unsigned long elapsed)
{
if (entity_collision_child_shapes.size() > 0) {
btCompoundShape *compoundshape = static_cast<btCompoundShape *> (entity_collision_shape);
- bool recalculate = false;
const float modelscale = radius() / model()->radius();
for (int n = 0; n < compoundshape->getNumChildShapes(); n++) {
@@ -524,9 +523,6 @@ void Entity::frame(const unsigned long elapsed)
compoundshape->updateChildTransform(n, child_transform);
}
}
-
- if (recalculate)
- compoundshape->recalculateLocalAabb();
}
}
}