History

Merge branch 'master' of https://github.com/highfidelity/hifi into temp0

Sam Gateau committed 12 years ago

Commit b0189ef2 parents 820c079 843aaf441 files · +780 −378Browse files

Showing the changes to interface/src/renderer/DeferredLightingEffect.cpp (1 of 41 files). Show all

Unified · Split

interface/src/renderer/DeferredLightingEffect.cpp+2−2
@@ -269,7 +269,7 @@ void DeferredLightingEffect::render() { · 268 unmodified lines
269 269
270 } else {270 } else {
271 glTranslatef(light.position.x, light.position.y, light.position.z); 271 glTranslatef(light.position.x, light.position.y, light.position.z);
272 Application::getInstance()->getGeometryCache()->renderSphere(expandedRadius, 64, 64);272 Application::getInstance()->getGeometryCache()->renderSphere(expandedRadius, 32, 32);
273 }273 }
274 274
275 glPopMatrix();275 glPopMatrix();
@@ -323,7 +323,7 @@ void DeferredLightingEffect::render() { · 47 unmodified lines
323 glRotatef(glm::degrees(glm::angle(spotRotation)), axis.x, axis.y, axis.z); 323 glRotatef(glm::degrees(glm::angle(spotRotation)), axis.x, axis.y, axis.z);
324 glTranslatef(0.0f, 0.0f, -light.radius * (1.0f + SCALE_EXPANSION * 0.5f)); 324 glTranslatef(0.0f, 0.0f, -light.radius * (1.0f + SCALE_EXPANSION * 0.5f));
325 Application::getInstance()->getGeometryCache()->renderCone(expandedRadius * glm::tan(light.cutoff),325 Application::getInstance()->getGeometryCache()->renderCone(expandedRadius * glm::tan(light.cutoff),
326 expandedRadius, 64, 32);326 expandedRadius, 32, 1);
327 }327 }
328 328
329 glPopMatrix();329 glPopMatrix();