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

Reverted key mapping change since Andrzej fixed the underlying problem.

Browse source
This commit is contained in:
Philip Rosedale 2013-12-19 10:02:43 -08:00
parent 77751df992
commit c287e37691
2 changed files with 3 additions and 1 deletions
interface/src/avatar
Hand.cpp
libraries/particles/src
ParticleCollisionSystem.cpp

2
interface/src/avatar/Hand.cpp
View file

@ -17,7 +17,7 @@
#include "Util.h"
#include "renderer/ProgramObject.h"
//#define DEBUG_HAND
#define DEBUG_HAND
using namespace std;

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

@ -77,6 +77,7 @@ void ParticleCollisionSystem::updateCollisionWithVoxels(Particle* particle) {
if (_voxels->findSpherePenetration(center, radius, penetration, &penetratedVoxel)) {
penetration /= (float)TREE_SCALE;
updateCollisionSound(particle, penetration, VOXEL_COLLISION_FREQUENCY);
//qDebug("voxel collision\n");
applyHardCollision(particle, penetration, VOXEL_ELASTICITY, VOXEL_DAMPING);
}
}
@ -92,6 +93,7 @@ void ParticleCollisionSystem::updateCollisionWithParticles(Particle* particle) {
if (_particles->findSpherePenetration(center, radius, penetration, &penetratedElement)) {
penetration /= (float)TREE_SCALE;
updateCollisionSound(particle, penetration, VOXEL_COLLISION_FREQUENCY);
qDebug("particle collision\n");
applyHardCollision(particle, penetration, VOXEL_ELASTICITY, VOXEL_DAMPING);
}
}