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

Temporarily disabling DAMPING and non-unity ELASTICITY during particle-particle collisions

Browse source
This commit is contained in:
Andrew Meadows 2014-01-10 11:42:23 -08:00
parent 71e5de8420
commit c4c0c389ae
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/particles/src/ParticleCollisionSystem.cpp
View file

@ -90,8 +90,8 @@ void ParticleCollisionSystem::updateCollisionWithVoxels(Particle* particle) {
void ParticleCollisionSystem::updateCollisionWithParticles(Particle* particleA) {
glm::vec3 center = particleA->getPosition() * (float)TREE_SCALE;
float radius = particleA->getRadius() * (float)TREE_SCALE;
const float ELASTICITY = 0.4f;
const float DAMPING = 0.0f;
//const float ELASTICITY = 0.4f;
//const float DAMPING = 0.0f;
const float COLLISION_FREQUENCY = 0.5f;
glm::vec3 penetration;
Particle* particleB;