From 08591481a6bb9a74f44e80fbe7ca49de2dc9cdd1 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Thu, 12 Dec 2013 15:44:06 -0800 Subject: [PATCH 1/4] added shadows to particles --- interface/src/Application.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index c84165456e..bc3eaaf736 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2920,6 +2920,7 @@ void Application::updateShadowMap() { glTranslatef(translation.x, translation.y, translation.z); renderAvatars(true); + _particles.render(); glPopMatrix(); From 0560b1613354df2abc2f2fbe88e055abfd5715b4 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Thu, 12 Dec 2013 15:47:51 -0800 Subject: [PATCH 2/4] only render local toy ball sphere if there is an actual toy ball --- interface/src/avatar/Hand.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/avatar/Hand.cpp b/interface/src/avatar/Hand.cpp index 7530096e9d..69a339ef06 100755 --- a/interface/src/avatar/Hand.cpp +++ b/interface/src/avatar/Hand.cpp @@ -377,7 +377,7 @@ void Hand::render( bool isMine) { } // Render toy ball - if (isMine) { + if (isMine && _hasToyBall) { glPushMatrix(); glColor3f(1, 0, 0); glTranslatef(_toyBallPosition.x, _toyBallPosition.y, _toyBallPosition.z); From c9da89cde71842820b9715f0f10614cb0a2f85bb Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Thu, 12 Dec 2013 15:50:25 -0800 Subject: [PATCH 3/4] fix compiler warning --- libraries/octree/src/Octree.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/octree/src/Octree.cpp b/libraries/octree/src/Octree.cpp index d10248d9e3..7f7deecf77 100644 --- a/libraries/octree/src/Octree.cpp +++ b/libraries/octree/src/Octree.cpp @@ -887,7 +887,6 @@ int Octree::encodeTreeBitstreamRecursion(OctreeElement* node, unsigned char childrenExistInTreeBits = 0; unsigned char childrenExistInPacketBits = 0; unsigned char childrenColoredBits = 0; - const int BYTES_PER_COLOR = 3; // Make our local buffer large enough to handle writing at this level in case we need to. LevelDetails thisLevelKey = packetData->startLevel(); From 17b2ee69840a91adaed1681d06d56705f496b4d3 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Thu, 12 Dec 2013 16:46:17 -0800 Subject: [PATCH 4/4] Fix for obnoxious C++0x warning in GCC. --- libraries/particles/src/Particle.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/particles/src/Particle.h b/libraries/particles/src/Particle.h index bfdcbdd338..0fed2c80f0 100644 --- a/libraries/particles/src/Particle.h +++ b/libraries/particles/src/Particle.h @@ -57,7 +57,7 @@ public: const glm::vec3& getPosition() const { return _position; } const rgbColor& getColor() const { return _color; } - xColor getColor() { return { _color[RED_INDEX], _color[GREEN_INDEX], _color[BLUE_INDEX] }; } + xColor getColor() { xColor color = { _color[RED_INDEX], _color[GREEN_INDEX], _color[BLUE_INDEX] }; return color; } float getRadius() const { return _radius; } const glm::vec3& getVelocity() const { return _velocity; } const glm::vec3& getGravity() const { return _gravity; } @@ -144,4 +144,4 @@ private: }; -#endif /* defined(__hifi__Particle__) */ \ No newline at end of file +#endif /* defined(__hifi__Particle__) */