Showing the changes to interface/src/Application.cpp (1 of 84 files). Show all
Unified · Split
| @@ -1562,14 +1562,14 @@ void Application::init() { · 1561 unmodified lines | ||
| 1562 | 1562 | |
| 1563 | 1563 | // connect the _particleCollisionSystem to our script engine's ParticleScriptingInterface |
| 1564 | 1564 | connect(&_particleCollisionSystem, |
| 1565 | − SIGNAL(particleCollisionWithVoxel(const ParticleID&, const VoxelDetail&)), | |
| 1565 | + SIGNAL(particleCollisionWithVoxel(const ParticleID&, const VoxelDetail&, const glm::vec3&)), | |
| 1566 | 1566 | ScriptEngine::getParticlesScriptingInterface(), |
| 1567 | − SLOT(forwardParticleCollisionWithVoxel(const ParticleID&, const VoxelDetail&))); | |
| 1567 | + SLOT(forwardParticleCollisionWithVoxel(const ParticleID&, const VoxelDetail&, const glm::vec3&))); | |
| 1568 | 1568 | |
| 1569 | 1569 | connect(&_particleCollisionSystem, |
| 1570 | − SIGNAL(particleCollisionWithParticle(const ParticleID&, const ParticleID&)), | |
| 1570 | + SIGNAL(particleCollisionWithParticle(const ParticleID&, const ParticleID&, const glm::vec3&)), | |
| 1571 | 1571 | ScriptEngine::getParticlesScriptingInterface(), |
| 1572 | − SLOT(forwardParticleCollisionWithParticle(const ParticleID&, const ParticleID&))); | |
| 1572 | + SLOT(forwardParticleCollisionWithParticle(const ParticleID&, const ParticleID&, const glm::vec3&))); | |
| 1573 | 1573 | |
| 1574 | 1574 | _pieMenu.init("./resources/images/hifi-interface-tools-v2-pie.svg", |
| 1575 | 1575 | _glWidget->width(), |
| @@ -2383,8 +2383,8 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 807 unmodified lines | ||
| 2383 | 2383 | glMaterialfv(GL_FRONT, GL_SPECULAR, WHITE_SPECULAR_COLOR); |
| 2384 | 2384 | } |
| 2385 | 2385 | |
| 2386 | − bool forceRenderMyHead = (whichCamera.getInterpolatedMode() == CAMERA_MODE_MIRROR); | |
| 2387 | − _avatarManager.renderAvatars(forceRenderMyHead, selfAvatarOnly); | |
| 2386 | + bool mirrorMode = (whichCamera.getInterpolatedMode() == CAMERA_MODE_MIRROR); | |
| 2387 | + _avatarManager.renderAvatars(mirrorMode, selfAvatarOnly); | |
| 2388 | 2388 | |
| 2389 | 2389 | if (!selfAvatarOnly) { |
| 2390 | 2390 | // Render the world box |