Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 21:03:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #10483 from AndrewMeadows/cap-velocities

Browse source 
cap scripted linear and angular velocity inputs
This commit is contained in:
Brad Hefta-Gaub 2017-05-17 16:15:42 -07:00 committed by GitHub
commit 0d3f7058ec
1 changed files with 36 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
libraries/entities/src/EntityItem.cpp
View file

@ -1691,14 +1691,20 @@ void EntityItem::updateVelocity(const glm::vec3& value) {
setLocalVelocity(Vectors::ZERO); setLocalVelocity(Vectors::ZERO);
} }
} else { } else {
const float MIN_LINEAR_SPEED = 0.001f; float speed = glm::length(value);
if (glm::length(value) < MIN_LINEAR_SPEED) { if (!isnan(speed)) {
velocity = ENTITY_ITEM_ZERO_VEC3; const float MIN_LINEAR_SPEED = 0.001f;
} else { const float MAX_LINEAR_SPEED = 270.0f; // 3m per step at 90Hz
velocity = value; if (speed < MIN_LINEAR_SPEED) {
velocity = ENTITY_ITEM_ZERO_VEC3;
} else if (speed > MAX_LINEAR_SPEED) {
velocity = (MAX_LINEAR_SPEED / speed) * value;
} else {
velocity = value;
}
setLocalVelocity(velocity);
_dirtyFlags |= Simulation::DIRTY_LINEAR_VELOCITY;
} }
setLocalVelocity(velocity);
_dirtyFlags |= Simulation::DIRTY_LINEAR_VELOCITY;
} }
} }
} }
@ -1723,8 +1729,16 @@ void EntityItem::updateGravity(const glm::vec3& value) {
if (getShapeType() == SHAPE_TYPE_STATIC_MESH) { if (getShapeType() == SHAPE_TYPE_STATIC_MESH) {
_gravity = Vectors::ZERO; _gravity = Vectors::ZERO;
} else { } else {
_gravity = value; float magnitude = glm::length(value);
_dirtyFlags |= Simulation::DIRTY_LINEAR_VELOCITY; if (!isnan(magnitude)) {
const float MAX_ACCELERATION_OF_GRAVITY = 10.0f * 9.8f; // 10g
if (magnitude > MAX_ACCELERATION_OF_GRAVITY) {
_gravity = (MAX_ACCELERATION_OF_GRAVITY / magnitude) * value;
} else {
_gravity = value;
}
_dirtyFlags |= Simulation::DIRTY_LINEAR_VELOCITY;
}
} }
} }
} }
@ -1735,14 +1749,20 @@ void EntityItem::updateAngularVelocity(const glm::vec3& value) {
if (getShapeType() == SHAPE_TYPE_STATIC_MESH) { if (getShapeType() == SHAPE_TYPE_STATIC_MESH) {
setLocalAngularVelocity(Vectors::ZERO); setLocalAngularVelocity(Vectors::ZERO);
} else { } else {
const float MIN_ANGULAR_SPEED = 0.0002f; float speed = glm::length(value);
if (glm::length(value) < MIN_ANGULAR_SPEED) { if (!isnan(speed)) {
angularVelocity = ENTITY_ITEM_ZERO_VEC3; const float MIN_ANGULAR_SPEED = 0.0002f;
} else { const float MAX_ANGULAR_SPEED = 9.0f * TWO_PI; // 1/10 rotation per step at 90Hz
angularVelocity = value; if (speed < MIN_ANGULAR_SPEED) {
angularVelocity = ENTITY_ITEM_ZERO_VEC3;
} else if (speed > MAX_ANGULAR_SPEED) {
angularVelocity = (MAX_ANGULAR_SPEED / speed) * value;
} else {
angularVelocity = value;
}
setLocalAngularVelocity(angularVelocity);
_dirtyFlags |= Simulation::DIRTY_ANGULAR_VELOCITY;
} }
setLocalAngularVelocity(angularVelocity);
_dirtyFlags |= Simulation::DIRTY_ANGULAR_VELOCITY;
} }
} }
} }