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

Merge pull request #1363 from ZappoMan/edit_particles

Browse source 
Add shadows and only render local toy ball if one has been created
This commit is contained in:
Philip Rosedale 2013-12-12 17:51:54 -08:00
commit 1c4f02d568
3 changed files with 2 additions and 2 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); glTranslatef(translation.x, translation.y, translation.z);
renderAvatars(true); renderAvatars(true);
_particles.render();
glPopMatrix(); glPopMatrix();

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

@ -377,7 +377,7 @@ void Hand::render( bool isMine) {
} }
// Render toy ball // Render toy ball
if (isMine) { if (isMine && _hasToyBall) {
glPushMatrix(); glPushMatrix();
glColor3f(1, 0, 0); glColor3f(1, 0, 0);
glTranslatef(_toyBallPosition.x, _toyBallPosition.y, _toyBallPosition.z); 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 childrenExistInTreeBits = 0;
unsigned char childrenExistInPacketBits = 0; unsigned char childrenExistInPacketBits = 0;
unsigned char childrenColoredBits = 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. // Make our local buffer large enough to handle writing at this level in case we need to.
LevelDetails thisLevelKey = packetData->startLevel(); LevelDetails thisLevelKey = packetData->startLevel();