Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 20:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename (haze)getParametersBuffer to getHazeParametersBuffer.

Browse source 
Add corrections from Sam
This commit is contained in:
Nissim Hadar 2017-10-02 16:54:02 -07:00
parent ca4c5969d9
commit cdbf067a24
6 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
View file

@ -60,6 +60,7 @@ void ZoneEntityRenderer::onRemoveFromSceneTyped(const TypedEntityPointer& entity
} }
} }
#pragma optimize("", off);
void ZoneEntityRenderer::doRender(RenderArgs* args) { void ZoneEntityRenderer::doRender(RenderArgs* args) {
#if 0 #if 0
if (ZoneEntityItem::getDrawZoneBoundaries()) { if (ZoneEntityItem::getDrawZoneBoundaries()) {

2
libraries/model/src/model/Haze.h
View file

@ -83,7 +83,7 @@ namespace model {
void setHazeBackgroundBlendValue(const float hazeBackgroundBlendValue); void setHazeBackgroundBlendValue(const float hazeBackgroundBlendValue);
UniformBufferView getParametersBuffer() const { return _parametersBuffer; } UniformBufferView getHazeParametersBuffer() const { return _parametersBuffer; }
protected: protected:
class Parameters { class Parameters {

6
libraries/render-utils/src/DeferredLightingEffect.cpp
View file

@ -552,8 +552,10 @@ void RenderDeferredSetup::run(const render::RenderContextPointer& renderContext,
deferredLightingEffect->setupKeyLightBatch(args, batch, locations->lightBufferUnit, locations->ambientBufferUnit, SKYBOX_MAP_UNIT); deferredLightingEffect->setupKeyLightBatch(args, batch, locations->lightBufferUnit, locations->ambientBufferUnit, SKYBOX_MAP_UNIT);
// Haze // Haze
batch.setUniformBuffer(HAZE_MODEL_BUFFER_SLOT, haze->getParametersBuffer()); if (haze != nullptr) {
batch.setUniformBuffer(HAZE_MODEL_BUFFER_SLOT, haze->getHazeParametersBuffer());
}
batch.draw(gpu::TRIANGLE_STRIP, 4); batch.draw(gpu::TRIANGLE_STRIP, 4);
deferredLightingEffect->unsetKeyLightBatch(batch, locations->lightBufferUnit, locations->ambientBufferUnit, SKYBOX_MAP_UNIT); deferredLightingEffect->unsetKeyLightBatch(batch, locations->lightBufferUnit, locations->ambientBufferUnit, SKYBOX_MAP_UNIT);

7
libraries/render-utils/src/DrawHaze.cpp
View file

@ -125,8 +125,13 @@ const int HazeEffect_LinearDepthMapSlot = 3;
void DrawHaze::configure(const Config& config) { void DrawHaze::configure(const Config& config) {
} }
#pragma optimize("", off)
void DrawHaze::run(const render::RenderContextPointer& renderContext, const Inputs& inputs) { void DrawHaze::run(const render::RenderContextPointer& renderContext, const Inputs& inputs) {
const auto haze = inputs.get0(); const auto haze = inputs.get0();
if (haze == nullptr) {
return;
}
const auto inputBuffer = inputs.get1()->getRenderBuffer(0); const auto inputBuffer = inputs.get1()->getRenderBuffer(0);
const auto framebuffer = inputs.get2(); const auto framebuffer = inputs.get2();
const auto transformBuffer = inputs.get3(); const auto transformBuffer = inputs.get3();
@ -169,7 +174,7 @@ void DrawHaze::run(const render::RenderContextPointer& renderContext, const Inpu
batch.setPipeline(_hazePipeline); batch.setPipeline(_hazePipeline);
batch.setUniformBuffer(HazeEffect_ParamsSlot, haze->getParametersBuffer()); batch.setUniformBuffer(HazeEffect_ParamsSlot, haze->getHazeParametersBuffer());
batch.setUniformBuffer(HazeEffect_TransformBufferSlot, transformBuffer->getFrameTransformBuffer()); batch.setUniformBuffer(HazeEffect_TransformBufferSlot, transformBuffer->getFrameTransformBuffer());
batch.setResourceTexture(HazeEffect_LightingMapSlot, inputBuffer); batch.setResourceTexture(HazeEffect_LightingMapSlot, inputBuffer);

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

@ -84,10 +84,12 @@ void HazeStageSetup::run(const render::RenderContextPointer& renderContext) {
} }
} }
#pragma optimize("", off)
void FetchHazeStage::run(const render::RenderContextPointer& renderContext, model::HazePointer& haze) { void FetchHazeStage::run(const render::RenderContextPointer& renderContext, model::HazePointer& haze) {
auto hazeStage = renderContext->_scene->getStage<HazeStage>(); auto hazeStage = renderContext->_scene->getStage<HazeStage>();
assert(hazeStage); assert(hazeStage);
haze = nullptr;
if (hazeStage->_currentFrame._hazes.size() != 0) { if (hazeStage->_currentFrame._hazes.size() != 0) {
auto hazeId = hazeStage->_currentFrame._hazes.front(); auto hazeId = hazeStage->_currentFrame._hazes.front();
haze = hazeStage->getHaze(hazeId); haze = hazeStage->getHaze(hazeId);

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

@ -72,7 +72,6 @@ void SetupZones::run(const RenderContextPointer& context, const Inputs& inputs)
auto hazeStage = context->_scene->getStage<HazeStage>(); auto hazeStage = context->_scene->getStage<HazeStage>();
assert(hazeStage); assert(hazeStage);
hazeStage->_currentFrame.clear(); hazeStage->_currentFrame.clear();
hazeStage->_currentFrame.pushHaze(0);
} }
const gpu::PipelinePointer& DebugZoneLighting::getKeyLightPipeline() { const gpu::PipelinePointer& DebugZoneLighting::getKeyLightPipeline() {