History

Merge branch 'master' of https://github.com/highfidelity/hifi into external-glm

Stephen Birarda committed 12 years ago

Commit 90d4bbe2 parents 284cd6b a39b03184 files · +2904 −279Browse files

Showing the changes to interface/src/Application.cpp (1 of 84 files). Show all

Unified · Split

interface/src/Application.cpp+6−6
@@ -1562,14 +1562,14 @@ void Application::init() { · 1561 unmodified lines
15621562
15631563 // connect the _particleCollisionSystem to our script engine's ParticleScriptingInterface
15641564 connect(&_particleCollisionSystem,
1565− SIGNAL(particleCollisionWithVoxel(const ParticleID&, const VoxelDetail&)),
1565+ SIGNAL(particleCollisionWithVoxel(const ParticleID&, const VoxelDetail&, const glm::vec3&)),
15661566 ScriptEngine::getParticlesScriptingInterface(),
1567− SLOT(forwardParticleCollisionWithVoxel(const ParticleID&, const VoxelDetail&)));
1567+ SLOT(forwardParticleCollisionWithVoxel(const ParticleID&, const VoxelDetail&, const glm::vec3&)));
15681568
15691569 connect(&_particleCollisionSystem,
1570− SIGNAL(particleCollisionWithParticle(const ParticleID&, const ParticleID&)),
1570+ SIGNAL(particleCollisionWithParticle(const ParticleID&, const ParticleID&, const glm::vec3&)),
15711571 ScriptEngine::getParticlesScriptingInterface(),
1572− SLOT(forwardParticleCollisionWithParticle(const ParticleID&, const ParticleID&)));
1572+ SLOT(forwardParticleCollisionWithParticle(const ParticleID&, const ParticleID&, const glm::vec3&)));
15731573
15741574 _pieMenu.init("./resources/images/hifi-interface-tools-v2-pie.svg",
15751575 _glWidget->width(),
@@ -2383,8 +2383,8 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 807 unmodified lines
23832383 glMaterialfv(GL_FRONT, GL_SPECULAR, WHITE_SPECULAR_COLOR);
23842384 }
23852385
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);
23882388
23892389 if (!selfAvatarOnly) {
23902390 // Render the world box

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t