Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 04:39:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

implement catching of particles

Browse source
This commit is contained in:
ZappoMan 2013-12-16 20:29:28 -08:00
parent 8f1fbec057
commit e969331f5c
2 changed files with 26 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -1534,7 +1534,7 @@ void Application::shootParticle() {
// Caller is responsible for managing this EditableParticle // Caller is responsible for managing this EditableParticle
ParticleEditHandle* Application::newParticleEditHandle(uint32_t id) { ParticleEditHandle* Application::newParticleEditHandle(uint32_t id) {
ParticleEditHandle* particleEditHandle = new ParticleEditHandle(&_particleEditSender, _particles.getTree()); ParticleEditHandle* particleEditHandle = new ParticleEditHandle(&_particleEditSender, _particles.getTree(), id);
return particleEditHandle; return particleEditHandle;
} }

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

@ -74,55 +74,45 @@ void Hand::reset() {
void Hand::simulateToyBall(PalmData& palm, const glm::vec3& fingerTipPosition, float deltaTime) { void Hand::simulateToyBall(PalmData& palm, const glm::vec3& fingerTipPosition, float deltaTime) {
bool ballFromHand = Menu::getInstance()->isOptionChecked(MenuOption::BallFromHand); bool ballFromHand = Menu::getInstance()->isOptionChecked(MenuOption::BallFromHand);
int handID = palm.getSixenseID(); int handID = palm.getSixenseID();
bool grabButtonPressed = (palm.getControllerButtons() & BUTTON_FWD);
bool ballAlreadyInHand = _toyBallInHand[handID];
glm::vec3 targetPosition = palm.getPosition() / (float)TREE_SCALE; glm::vec3 targetPosition = palm.getPosition() / (float)TREE_SCALE;
float targetRadius = (TOY_BALL_RADIUS * 4.0f) / (float)TREE_SCALE; float targetRadius = (TOY_BALL_RADIUS * 4.0f) / (float)TREE_SCALE;
const Particle* closestParticle = Application::getInstance()->getParticles() const Particle* closestParticle = Application::getInstance()->getParticles()
->getTree()->findClosestParticle(targetPosition, targetRadius); ->getTree()->findClosestParticle(targetPosition, targetRadius);
//printf("simulateToyBall() handID:%d grabButtonPressed:%s ballAlreadyInHand:%s\n",
// handID, debug::valueOf(grabButtonPressed), debug::valueOf(ballAlreadyInHand));
if (closestParticle) { if (closestParticle) {
//printf("potentially caught... particle ID:%d\n", closestParticle->getID()); //printf("potentially caught... handID:%d particle ID:%d grabButtonPressed:%s ballAlreadyInHand:%s\n",
// handID, closestParticle->getID(), debug::valueOf(grabButtonPressed), debug::valueOf(ballAlreadyInHand));
if (!_toyBallInHand[handID]) {
/***
printf("particle ID:%d IN TARGET AND NOT IN HAND\n", closestParticle->getID());
// you can create a ParticleEditHandle by doing this...
ParticleEditHandle* caughtParticle = Application::getInstance()->newParticleEditHandle(closestParticle->getID());
// reflect off the hand...
printf("particle ID:%d old velocity=%f,%f,%f\n", closestParticle->getID(),
closestParticle->getVelocity().x, closestParticle->getVelocity().y, closestParticle->getVelocity().z);
glm::vec3 reflectNormal = glm::vec3(0,1,0); // palm.getNormal()
glm::vec3 newVelocity = glm::reflect(closestParticle->getVelocity(), reflectNormal);
printf("particle ID:%d REFLECT velocity=%f,%f,%f\n", closestParticle->getID(),
newVelocity.x, newVelocity.y, newVelocity.z);
//newVelocity += palm.getTipVelocity() / (float)TREE_SCALE;
//printf("particle ID:%d with TIP velocity=%f,%f,%f\n", closestParticle->getID(), newVelocity.x, newVelocity.y, newVelocity.z);
printf("particle ID:%d OLD position=%f,%f,%f\n", closestParticle->getID(), // If I don't currently have a ball in my hand, then I can catch this closest particle
closestParticle->getPosition().x, closestParticle->getPosition().y, closestParticle->getPosition().z); if (!ballAlreadyInHand && grabButtonPressed) {
glm::vec3 newPosition = closestParticle->getPosition(); //printf("caught... handID:%d particle ID:%d\n", handID, closestParticle->getID());
ParticleEditHandle* caughtParticle = Application::getInstance()->newParticleEditHandle(closestParticle->getID());
newPosition += newVelocity * 10.f; // move it as if it's already been moving in new direction glm::vec3 newPosition = targetPosition;
glm::vec3 newVelocity = NO_VELOCITY;
printf("particle ID:%d NEW position=%f,%f,%f\n", closestParticle->getID(),
newPosition.x, newPosition.y, newPosition.z); // update the particle with it's new state...
caughtParticle->updateParticle(newPosition, caughtParticle->updateParticle(newPosition,
closestParticle->getRadius(), closestParticle->getRadius(),
closestParticle->getXColor(), closestParticle->getXColor(),
newVelocity, newVelocity,
closestParticle->getGravity(), closestParticle->getGravity(),
closestParticle->getDamping(), closestParticle->getDamping(),
IN_HAND, // we just grabbed it!
closestParticle->getUpdateScript()); closestParticle->getUpdateScript());
// but make sure you clean it up, when you're done // now tell our hand about us having caught it...
delete caughtParticle; _toyBallInHand[handID] = true;
**/
//printf(">>>>>>> caught... handID:%d particle ID:%d _toyBallInHand[handID] = true\n", handID, closestParticle->getID());
_ballParticleEditHandles[handID] = caughtParticle;
caughtParticle = NULL;
} }
} }