Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 01:44:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

debug off

Browse source
This commit is contained in:
Philip Rosedale 2013-12-19 23:16:04 -08:00
parent b6ac73bb57
commit cf3dc47c18
1 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,8 +17,6 @@
#include "Util.h" #include "Util.h"
#include "renderer/ProgramObject.h" #include "renderer/ProgramObject.h"
#define DEBUG_HAND
using namespace std; using namespace std;
const float FINGERTIP_VOXEL_SIZE = 0.05; const float FINGERTIP_VOXEL_SIZE = 0.05;
@ -111,9 +109,6 @@ void Hand::simulateToyBall(PalmData& palm, const glm::vec3& fingerTipPosition, f
glm::vec3 newVelocity = NO_VELOCITY; glm::vec3 newVelocity = NO_VELOCITY;
// update the particle with it's new state... // update the particle with it's new state...
#ifdef DEBUG_HAND
qDebug("Caught!\n");
#endif
caughtParticle->updateParticle(newPosition, caughtParticle->updateParticle(newPosition,
closestParticle->getRadius(), closestParticle->getRadius(),
closestParticle->getXColor(), closestParticle->getXColor(),
@ -153,9 +148,6 @@ void Hand::simulateToyBall(PalmData& palm, const glm::vec3& fingerTipPosition, f
if ((palm.getControllerButtons() & NEW_BALL_BUTTON) && (_toyBallInHand[handID] == false)) { if ((palm.getControllerButtons() & NEW_BALL_BUTTON) && (_toyBallInHand[handID] == false)) {
_toyBallInHand[handID] = true; _toyBallInHand[handID] = true;
// Create a particle on the particle server // Create a particle on the particle server
#ifdef DEBUG_HAND
qDebug("Created New Ball\n");
#endif
glm::vec3 ballPosition = ballFromHand ? palm.getPosition() : fingerTipPosition; glm::vec3 ballPosition = ballFromHand ? palm.getPosition() : fingerTipPosition;
_ballParticleEditHandles[handID] = app->makeParticle( _ballParticleEditHandles[handID] = app->makeParticle(
ballPosition / (float)TREE_SCALE, ballPosition / (float)TREE_SCALE,
@ -201,9 +193,6 @@ void Hand::simulateToyBall(PalmData& palm, const glm::vec3& fingerTipPosition, f
ballVelocity = avatarRotation * ballVelocity; ballVelocity = avatarRotation * ballVelocity;
ballVelocity *= THROWN_VELOCITY_SCALING; ballVelocity *= THROWN_VELOCITY_SCALING;
#ifdef DEBUG_HAND
qDebug("Threw ball, v = %.3f\n", glm::length(ballVelocity));
#endif
uint32_t particleInHandID = _ballParticleEditHandles[handID]->getID(); uint32_t particleInHandID = _ballParticleEditHandles[handID]->getID();
const Particle* particleInHand = particles->findParticleByID(particleInHandID); const Particle* particleInHand = particles->findParticleByID(particleInHandID);
xColor colorForParticleInHand = particleInHand ? particleInHand->getXColor() xColor colorForParticleInHand = particleInHand ? particleInHand->getXColor()