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

Merge pull request #4875 from howard-stearns/collision-sound-tuning

Browse source 
collision sound tuning
This commit is contained in:
Philip Rosedale 2015-05-14 15:30:34 -07:00
commit 1318a3d6e9
1 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
libraries/entities-renderer/src/EntityTreeRenderer.cpp
View file

@ -1119,27 +1119,27 @@ void EntityTreeRenderer::playEntityCollisionSound(const QUuid& myNodeID, EntityT
if (collisionSoundURL.isEmpty()) { if (collisionSoundURL.isEmpty()) {
return; return;
} }
SharedSoundPointer sound = DependencyManager::get<SoundCache>().data()->getSound(QUrl(collisionSoundURL));
if (!sound->isReady()) {
return;
}
const float mass = entity->computeMass(); const float mass = entity->computeMass();
const float COLLISION_PENTRATION_TO_VELOCITY = 50; // as a subsitute for RELATIVE entity->getVelocity() const float COLLISION_PENTRATION_TO_VELOCITY = 50; // as a subsitute for RELATIVE entity->getVelocity()
const float linearVelocity = glm::length(collision.penetration) * COLLISION_PENTRATION_TO_VELOCITY; const float linearVelocity = glm::length(collision.penetration) * COLLISION_PENTRATION_TO_VELOCITY;
const float energy = mass * linearVelocity * linearVelocity / 2.0f; const float energy = mass * linearVelocity * linearVelocity / 2.0f;
const glm::vec3 position = collision.contactPoint; const glm::vec3 position = collision.contactPoint;
const float COLLISION_ENERGY_AT_FULL_VOLUME = 10.0f; const float COLLISION_ENERGY_AT_FULL_VOLUME = 1.0f;
const float COLLISION_MINIMUM_VOLUME = 0.01f; const float COLLISION_MINIMUM_VOLUME = 0.001f;
const float energyPercentOfFull = fmin(1.0f, energy / COLLISION_ENERGY_AT_FULL_VOLUME); const float energyFactorOfFull = fmin(1.0f, energy / COLLISION_ENERGY_AT_FULL_VOLUME);
//qCDebug(entitiesrenderer) << energyPercentOfFull << energy << " " << " " << linearVelocity << " " << mass; if (energyFactorOfFull < COLLISION_MINIMUM_VOLUME) {
if (energyPercentOfFull < COLLISION_MINIMUM_VOLUME) {
return; return;
} }
// This is a hack. Quiet sound aren't really heard at all, so we compress everything to the range 0.5-1.0, if we play it all.
const float COLLISION_SOUND_COMPRESSION = 0.5f; SharedSoundPointer sound = DependencyManager::get<SoundCache>().data()->getSound(QUrl(collisionSoundURL));
const float volume = (energyPercentOfFull * COLLISION_SOUND_COMPRESSION) + (1.0f - COLLISION_SOUND_COMPRESSION); if (!sound->isReady()) {
//qCDebug(entitiesrenderer) << collisionSoundURL << " " << volume << " " << position << " " << sound->isStereo(); return;
}
// This is a hack. Quiet sound aren't really heard at all, so we compress everything to the range [1-c, 1], if we play it all.
const float COLLISION_SOUND_COMPRESSION_RANGE = 0.95f;
float volume = energyFactorOfFull;
volume = (volume * COLLISION_SOUND_COMPRESSION_RANGE) + (1.0f - COLLISION_SOUND_COMPRESSION_RANGE);
// This is quite similar to AudioScriptingInterface::playSound() and should probably be refactored. // This is quite similar to AudioScriptingInterface::playSound() and should probably be refactored.
AudioInjectorOptions options; AudioInjectorOptions options;
@ -1166,13 +1166,19 @@ void EntityTreeRenderer::entityCollisionWithEntity(const EntityItemID& idA, cons
if (!_tree || _shuttingDown) { if (!_tree || _shuttingDown) {
return; return;
} }
// Don't respond to small continuous contacts. It causes deadlocks when locking the entityTree.
// Note that any entity script is likely to Entities.getEntityProperties(), which locks the tree.
const float COLLISION_MINUMUM_PENETRATION = 0.001;
if ((collision.type != CONTACT_EVENT_TYPE_START) && (glm::length(collision.penetration) < COLLISION_MINUMUM_PENETRATION)) {
return;
}
// See if we should play sounds // See if we should play sounds
EntityTree* entityTree = static_cast<EntityTree*>(_tree); EntityTree* entityTree = static_cast<EntityTree*>(_tree);
if (!entityTree->tryLockForRead()) { if (!entityTree->tryLockForRead()) {
// I don't know why this can happen, but if it does, // I don't know why this can happen, but if it does,
// the consequences are a deadlock, so bail. // the consequences are a deadlock, so bail.
qCDebug(entitiesrenderer) << "NOTICE: skipping collision."; qCDebug(entitiesrenderer) << "NOTICE: skipping collision type " << collision.type << " penetration " << glm::length(collision.penetration);
return; return;
} }
const QUuid& myNodeID = DependencyManager::get<NodeList>()->getSessionUUID(); const QUuid& myNodeID = DependencyManager::get<NodeList>()->getSessionUUID();