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

remove buckyballs physics testing code from hand code

Browse source
This commit is contained in:
Philip Rosedale 2014-02-23 21:08:38 -08:00
parent 7f2fe14565
commit 197b039a42
3 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -55,10 +55,6 @@ void Hand::simulate(float deltaTime, bool isMine) {
_collisionAge += deltaTime;
}
if (isMine) {
_buckyBalls.simulate(deltaTime);
}
calculateGeometry();
if (isMine) {
@ -69,8 +65,7 @@ void Hand::simulate(float deltaTime, bool isMine) {
FingerData& finger = palm.getFingers()[0]; // Sixense has only one finger
glm::vec3 fingerTipPosition = finger.getTipPosition();
_buckyBalls.grab(palm, fingerTipPosition, _owningAvatar->getOrientation(), deltaTime);
if (palm.getControllerButtons() & BUTTON_1) {
if (glm::length(fingerTipPosition - _lastFingerAddVoxel) > (FINGERTIP_VOXEL_SIZE / 2.f)) {
QColor paintColor = Menu::getInstance()->getActionForOption(MenuOption::VoxelPaintColor)->data().value<QColor>();
@ -309,10 +304,6 @@ void Hand::render(bool isMine) {
_renderAlpha = 1.0;
if (isMine) {
_buckyBalls.render();
}
if (Menu::getInstance()->isOptionChecked(MenuOption::RenderSkeletonCollisionProxies)) {
// draw a green sphere at hand joint location, which is actually near the wrist)
for (size_t i = 0; i < getNumPalms(); i++) {

3
interface/src/avatar/Hand.h
View file

@ -20,7 +20,6 @@
#include <AudioScriptingInterface.h>
#include <HandData.h>
#include "BuckyBalls.h"
#include "InterfaceConfig.h"
#include "world.h"
#include "VoxelSystem.h"
@ -81,8 +80,6 @@ private:
float _collisionAge;
float _collisionDuration;
BuckyBalls _buckyBalls;
// private methods
void setLeapHands(const std::vector<glm::vec3>& handPositions,
const std::vector<glm::vec3>& handNormals);

1
interface/src/avatar/Head.cpp
View file

@ -10,6 +10,7 @@
#include "Application.h"
#include "Avatar.h"
#include "GeometryUtil.h"
#include "Head.h"
#include "Menu.h"
#include "Util.h"