Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-06 15:12:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

it's working!

Browse source
This commit is contained in:
HifiExperiments 2024-06-26 23:24:56 -07:00
parent b5da8e7d5c
commit b00086ddb0
8 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/render-utils/src/AmbientOcclusionEffect.cpp
View file

@ -380,16 +380,17 @@ void AmbientOcclusionEffect::updateParameters(const graphics::AmbientOcclusionPo
current.w = ambientOcclusion->getAOObscuranceLevel();
}
if (shouldUpdateTechnique || ambientOcclusion->getAOFalloffAngle() != _aoParametersBuffer->getFalloffAngle()) {
const float falloffAngle = std::min(1.0f - EPSILON, ambientOcclusion->getAOFalloffAngle());
if (shouldUpdateTechnique || falloffAngle != _aoParametersBuffer->getFalloffAngle()) {
auto& current = _aoParametersBuffer.edit()._falloffInfo;
current.x = ambientOcclusion->getAOFalloffAngle();
current.x = falloffAngle;
current.y = 1.0f / (1.0f - current.x);
// Compute sin from cos
current.z = sqrtf(1.0f - ambientOcclusion->getAOFalloffAngle() * ambientOcclusion->getAOFalloffAngle());
current.z = sqrtf(1.0f - current.x * current.x);
current.w = 1.0f / current.z;
}
const int numSamples = ambientOcclusion->getAOSamplingAmount() * MAX_SSAO_SAMPLES;
const int numSamples = std::max(1, (int)(ambientOcclusion->getAOSamplingAmount() * MAX_HBAO_SAMPLES));
if (shouldUpdateTechnique || numSamples != _aoParametersBuffer->getNumSamples()) {
auto& current = _aoParametersBuffer.edit()._sampleInfo;
current.x = numSamples;
@ -423,7 +424,7 @@ void AmbientOcclusionEffect::updateParameters(const graphics::AmbientOcclusionPo
current.z = ambientOcclusion->getSSAONumSpiralTurns();
}
const int numSamples = ambientOcclusion->getAOSamplingAmount() * MAX_HBAO_SAMPLES;
const int numSamples = std::max(1, (int)(ambientOcclusion->getAOSamplingAmount() * MAX_SSAO_SAMPLES));
if (shouldUpdateTechnique || numSamples != _aoParametersBuffer->getNumSamples()) {
auto& current = _aoParametersBuffer.edit()._sampleInfo;
current.x = numSamples;

2
libraries/render-utils/src/AmbientOcclusionStage.cpp
View file

@ -11,7 +11,7 @@
#include <gpu/Context.h>
std::string AmbientOcclusionStage::_stageName { "BLOOM_STAGE"};
std::string AmbientOcclusionStage::_stageName { "AMBIENT_OCCLUSION_STAGE" };
const AmbientOcclusionStage::Index AmbientOcclusionStage::INVALID_INDEX { render::indexed_container::INVALID_INDEX };
AmbientOcclusionStage::Index AmbientOcclusionStage::findAmbientOcclusion(const AmbientOcclusionPointer& ambientOcclusion) const {

2
libraries/render-utils/src/BackgroundStage.cpp
View file

@ -15,7 +15,7 @@
#include <graphics/ShaderConstants.h>
std::string BackgroundStage::_stageName { "BACKGROUND_STAGE"};
std::string BackgroundStage::_stageName { "BACKGROUND_STAGE" };
const BackgroundStage::Index BackgroundStage::INVALID_INDEX { render::indexed_container::INVALID_INDEX };
BackgroundStage::Index BackgroundStage::findBackground(const BackgroundPointer& background) const {

2
libraries/render-utils/src/BloomStage.cpp
View file

@ -13,7 +13,7 @@
#include <gpu/Context.h>
std::string BloomStage::_stageName { "BLOOM_STAGE"};
std::string BloomStage::_stageName { "BLOOM_STAGE" };
const BloomStage::Index BloomStage::INVALID_INDEX { render::indexed_container::INVALID_INDEX };
BloomStage::Index BloomStage::findBloom(const BloomPointer& bloom) const {

2
libraries/render-utils/src/HazeStage.cpp
View file

@ -13,7 +13,7 @@
#include <gpu/Context.h>
std::string HazeStage::_stageName { "HAZE_STAGE"};
std::string HazeStage::_stageName { "HAZE_STAGE" };
const HazeStage::Index HazeStage::INVALID_INDEX { render::indexed_container::INVALID_INDEX };
HazeStage::Index HazeStage::findHaze(const HazePointer& haze) const {

2
libraries/render-utils/src/LightStage.cpp
View file

@ -15,7 +15,7 @@
#include "ViewFrustum.h"
std::string LightStage::_stageName { "LIGHT_STAGE"};
std::string LightStage::_stageName { "LIGHT_STAGE" };
// The bias matrix goes from homogeneous coordinates to UV coords (see http://www.opengl-tutorial.org/intermediate-tutorials/tutorial-16-shadow-mapping/#basic-shader)
const glm::mat4 LightStage::Shadow::_biasMatrix {
0.5, 0.0, 0.0, 0.0,

2
libraries/render-utils/src/TonemappingStage.cpp
View file

@ -11,7 +11,7 @@
#include <gpu/Context.h>
std::string TonemappingStage::_stageName { "TONEMAPPING_STAGE"};
std::string TonemappingStage::_stageName { "TONEMAPPING_STAGE" };
const TonemappingStage::Index TonemappingStage::INVALID_INDEX { render::indexed_container::INVALID_INDEX };
TonemappingStage::Index TonemappingStage::findTonemapping(const TonemappingPointer& tonemapping) const {

2
libraries/render-utils/src/ZoneRenderer.cpp
View file

@ -90,7 +90,7 @@ void SetupZones::run(const RenderContextPointer& context, const Input& input) {
hazeStage->_currentFrame.pushHaze(0);
bloomStage->_currentFrame.pushBloom(INVALID_INDEX);
tonemappingStage->_currentFrame.pushTonemapping(0);
ambientOcclusionStage->_currentFrame.pushAmbientOcclusion(0);
ambientOcclusionStage->_currentFrame.pushAmbientOcclusion(INVALID_INDEX);
}
const gpu::PipelinePointer& DebugZoneLighting::getKeyLightPipeline() {