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

Merge pull request #1545 from birarda/master

Browse source 
some warning fixes
This commit is contained in:
ZappoMan 2014-01-16 10:03:43 -08:00
commit b4c963b9f8
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -360,7 +360,6 @@ bool Avatar::findSphereCollision(const glm::vec3& sphereCenter, float sphereRadi
const HandData* handData = getHandData(); const HandData* handData = getHandData();
if (handData) { if (handData) {
int jointIndices[2] = { _skeletonModel.getLeftHandJointIndex(), _skeletonModel.getRightHandJointIndex() };
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
const PalmData* palm = handData->getPalm(i); const PalmData* palm = handData->getPalm(i);
if (palm) { if (palm) {

3
interface/src/devices/Webcam.cpp
View file

@ -40,7 +40,8 @@ int matMetaType = qRegisterMetaType<Mat>("cv::Mat");
int rotatedRectMetaType = qRegisterMetaType<RotatedRect>("cv::RotatedRect"); int rotatedRectMetaType = qRegisterMetaType<RotatedRect>("cv::RotatedRect");
#endif //def HAVE_LIBVPX #endif //def HAVE_LIBVPX
Webcam::Webcam() : _enabled(false), _active(false), _colorTextureID(0), _depthTextureID(0), _skeletonTrackingOn(false), _grabber(NULL) { Webcam::Webcam() : _grabber(NULL), _enabled(false), _active(false), _colorTextureID(0), _depthTextureID(0),
_skeletonTrackingOn(false) {
// the grabber simply runs as fast as possible // the grabber simply runs as fast as possible
#ifdef HAVE_LIBVPX #ifdef HAVE_LIBVPX
_grabber = new FrameGrabber(); _grabber = new FrameGrabber();

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

@ -149,7 +149,6 @@ void ParticleCollisionSystem::updateCollisionWithAvatars(Particle* particle) {
const float DAMPING = 0.0f; const float DAMPING = 0.0f;
const float COLLISION_FREQUENCY = 0.5f; const float COLLISION_FREQUENCY = 0.5f;
glm::vec3 penetration; glm::vec3 penetration;
const PalmData* collidingPalm = NULL;
// first check the selfAvatar if set... // first check the selfAvatar if set...
if (_selfAvatar) { if (_selfAvatar) {