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

merge fix

Browse source
This commit is contained in:
Philip Rosedale 2013-12-12 17:58:37 -08:00
commit 63243b2e14
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Application.cpp
View file

@ -2920,6 +2920,7 @@ void Application::updateShadowMap() {
glTranslatef(translation.x, translation.y, translation.z);
renderAvatars(true);
_particles.render();
glPopMatrix();

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

@ -377,8 +377,7 @@ void Hand::render( bool isMine) {
}
// Render toy ball
if (isMine && _toyBallShouldRender) {
if (isMine && _hasToyBall) {
glPushMatrix();
glColor3f(1, 0, 0);
glTranslatef(_toyBallPosition.x, _toyBallPosition.y, _toyBallPosition.z);

1
libraries/octree/src/Octree.cpp
View file

@ -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();

4
libraries/particles/src/Particle.h
View file

@ -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__) */
#endif /* defined(__hifi__Particle__) */