mirror of
https://github.com/overte-org/overte.git
synced 2025-04-21 09:44:21 +02:00
Merge pull request #1363 from ZappoMan/edit_particles
Add shadows and only render local toy ball if one has been created
This commit is contained in:
commit
1c4f02d568
3 changed files with 2 additions and 2 deletions
|
@ -2920,6 +2920,7 @@ void Application::updateShadowMap() {
|
|||
glTranslatef(translation.x, translation.y, translation.z);
|
||||
|
||||
renderAvatars(true);
|
||||
_particles.render();
|
||||
|
||||
glPopMatrix();
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Reference in a new issue