History

improving on the poin light attenuatiion formula

Sam Gateau committed 11 years ago

Commit b6836af1 parent b9bbd776 files · +64 −44Browse files

Showing the changes to libraries/render-utils/src/DeferredLightingEffect.cpp (1 of 6 files). Show all

Unified · Split

libraries/render-utils/src/DeferredLightingEffect.cpp+14−9
@@ -275,7 +275,7 @@ void DeferredLightingEffect::addSpotLight(const glm::vec3& position, float radiu · 274 unmodified lines
275275
276276 model::LightPointer lp = model::LightPointer(new model::Light());
277277 lp->setPosition(position);
278− lp->setAttenuationRadius(radius);
278+ lp->setMaximumRadius(radius);
279279 lp->setColor(diffuse);
280280 lp->setIntensity(1.0f);
281281 lp->setType(model::Light::POINT);
@@ -297,7 +297,7 @@ void DeferredLightingEffect::addSpotLight(const glm::vec3& position, float radiu · 15 unmodified lines
297297 model::LightPointer ls = model::LightPointer(new model::Light());
298298 ls->setPosition(position);
299299 ls->setDirection(direction);
300− ls->setAttenuationRadius(radius);
300+ ls->setMaximumRadius(radius);
301301 ls->setSpotCone(cutoff);
302302 ls->setColor(diffuse);
303303 ls->setIntensity(1.0f);
@@ -453,6 +453,8 @@ void DeferredLightingEffect::render() { · 149 unmodified lines
453453
454454 const glm::vec3& eyePoint = _viewState->getCurrentViewFrustum()->getPosition();
455455 float nearRadius = glm::distance(eyePoint, _viewState->getCurrentViewFrustum()->getNearTopLeft());
456+ glm::mat4 invViewMat;
457+ _viewState->getViewTransform().getMatrix(invViewMat);
456458
457459 auto geometryCache = DependencyManager::get<GeometryCache>();
458460
@@ -470,7 +472,9 @@ void DeferredLightingEffect::render() { · 11 unmodified lines
470472 batch.setUniformBuffer(_pointLightLocations.lightBufferUnit, light->getSchemaBuffer());
471473 gpu::GLBackend::renderBatch(batch);
472474 }
473− _spotLight.setUniformValue(_pointLightLocations.radius, light->getAttenuationRadius());
475+ glUniformMatrix4fv(_pointLightLocations.invViewMat, 1, false, reinterpret_cast< const GLfloat* >(&invViewMat));
476+ // _pointLight.setUniformValue(_pointLightLocations.viewMat, reinterpret_cast< const GLfloat* >(&viewMat));
477+ // _spotLight.setUniformValue(_pointLightLocations.radius, light->getAttenuationRadius());
474478
475479
476480 /*
@@ -485,7 +489,7 @@ void DeferredLightingEffect::render() { · 8 unmodified lines
485489 */
486490 glPushMatrix();
487491
488− float expandedRadius = light->getAttenuationRadius() * (1.0f + SCALE_EXPANSION);
492+ float expandedRadius = light->getMaximumRadius() * (1.0f + SCALE_EXPANSION);
489493 if (glm::distance(eyePoint, glm::vec3(light->getPosition())) < expandedRadius + nearRadius) {
490494 glLoadIdentity();
491495 glTranslatef(0.0f, 0.0f, -1.0f);
@@ -525,7 +529,7 @@ void DeferredLightingEffect::render() { · 33 unmodified lines
525529 batch.setUniformBuffer(_spotLightLocations.lightBufferUnit, light->getSchemaBuffer());
526530 gpu::GLBackend::renderBatch(batch);
527531 }
528− _spotLight.setUniformValue(_spotLightLocations.radius, light->getAttenuationRadius());
532+ // _spotLight.setUniformValue(_spotLightLocations.radius, light->getAttenuationRadius());
529533
530534 /*
531535 _spotLight.setUniformValue(_spotLightLocations.radius, light.radius);
@@ -543,7 +547,7 @@ void DeferredLightingEffect::render() { · 11 unmodified lines
543547
544548 glPushMatrix();
545549
546− float expandedRadius = light->getAttenuationRadius() * (1.0f + SCALE_EXPANSION);
550+ float expandedRadius = light->getMaximumRadius() * (1.0f + SCALE_EXPANSION);
547551 float edgeRadius = expandedRadius / glm::cos(light->getSpotConeAngle());
548552 if (glm::distance(eyePoint, glm::vec3(light->getPosition())) < edgeRadius + nearRadius) {
549553 glLoadIdentity();
@@ -563,7 +567,7 @@ void DeferredLightingEffect::render() { · 13 unmodified lines
563567 glm::quat spotRotation = rotationBetween(glm::vec3(0.0f, 0.0f, -1.0f), light->getDirection());
564568 glm::vec3 axis = glm::axis(spotRotation);
565569 glRotatef(glm::degrees(glm::angle(spotRotation)), axis.x, axis.y, axis.z);
566− glTranslatef(0.0f, 0.0f, -light->getAttenuationRadius() * (1.0f + SCALE_EXPANSION * 0.5f));
570+ glTranslatef(0.0f, 0.0f, -light->getMaximumRadius() * (1.0f + SCALE_EXPANSION * 0.5f));
567571 geometryCache->renderCone(expandedRadius * glm::tan(light->getSpotConeAngle()),
568572 expandedRadius, 32, 1);
569573 }
@@ -649,6 +653,7 @@ void DeferredLightingEffect::loadLightProgram(const char* fragSource, bool limit · 79 unmodified lines
649653 locations.depthTexCoordScale = program.uniformLocation("depthTexCoordScale");
650654 locations.radius = program.uniformLocation("radius");
651655 locations.ambientSphere = program.uniformLocation("ambientSphere.L00");
656+ locations.invViewMat = program.uniformLocation("invViewMat");
652657
653658 GLint loc = -1;
654659 #if defined(Q_OS_MAC)
@@ -661,8 +666,8 @@ void DeferredLightingEffect::loadLightProgram(const char* fragSource, bool limit · 6 unmodified lines
661666 #elif defined(Q_OS_WIN)
662667 loc = glGetUniformBlockIndex(program.programId(), "lightBuffer");
663668 if (loc >= 0) {
664− glUniformBlockBinding(program.programId(), loc, 1);
665− locations.lightBufferUnit = 1;
669+ glUniformBlockBinding(program.programId(), loc, 0);
670+ locations.lightBufferUnit = 0;
666671 } else {
667672 locations.lightBufferUnit = -1;
668673 }

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