Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Warnings as errors #938

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −5
Open

Warnings as errors #938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ if(NOT DEFINED OVERTE_WARNINGS_ALLOWLIST)
endif()

if(NOT DEFINED OVERTE_WARNINGS_AS_ERRORS)
set(OVERTE_WARNINGS_AS_ERRORS false CACHE BOOL "Count warnings as errors")
set(OVERTE_WARNINGS_AS_ERRORS true CACHE BOOL "Count warnings as errors")
endif()

if(OVERTE_WARNINGS_ALLOWLIST)
Expand Down
3 changes: 2 additions & 1 deletion assignment-client/src/audio/AudioMixer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,8 @@ void updateAudioZone(EntityItem* entity, std::unordered_map<QString, AudioMixer:
audioZone.listeners.push_back(listener.toString());
}

audioZone.coefficients = audioSettings.getListenerAttenuationCoefficients().toStdVector();
const auto& listenerAttenuationCoefficients = audioSettings.getListenerAttenuationCoefficients();
audioZone.coefficients = std::vector<float>(listenerAttenuationCoefficients.begin(), listenerAttenuationCoefficients.end());

/*qCDebug(audio) << "Updated audio zone:" << entity->getID().toString() << "(position:" << t.getTranslation()
<< ", dimensions:" << t.getScale() << ")";*/
Expand Down
2 changes: 1 addition & 1 deletion libraries/render-utils/src/RenderCommonTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ class SetupMirrorTask {
args->_numMirrorFlips += portalExitID != Item::INVALID_ITEM_ID ? 0 : 1;

gpu::doInBatch("SetupMirrorTask::run", args->_context, [&](gpu::Batch& batch) {
bool shouldMirror = args->_numMirrorFlips % 2 == (args->_renderMode != RenderArgs::MIRROR_RENDER_MODE);
bool shouldMirror = args->_numMirrorFlips % 2 == (args->_renderMode != RenderArgs::MIRROR_RENDER_MODE ? 1 : 0);
batch.setContextMirrorViewCorrection(shouldMirror);
});

Expand Down
2 changes: 1 addition & 1 deletion libraries/render-utils/src/ToneMapAndResampleTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ void ToneMapAndResample::run(const RenderContextPointer& renderContext, const In
batch.setViewportTransform(destViewport);
batch.setProjectionTransform(glm::mat4());
batch.resetViewTransform();
bool shouldMirror = args->_numMirrorFlips >= (args->_renderMode != RenderArgs::MIRROR_RENDER_MODE);
bool shouldMirror = args->_numMirrorFlips >= (args->_renderMode != RenderArgs::MIRROR_RENDER_MODE ? 1 : 0);
batch.setPipeline(shouldMirror ? _mirrorPipeline : _pipeline);

batch.setModelTransform(gpu::Framebuffer::evalSubregionTexcoordTransform(srcBufferSize, args->_viewport));
Expand Down
2 changes: 1 addition & 1 deletion libraries/render/src/render/ResampleTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ void UpsampleToBlitFramebuffer::run(const RenderContextPointer& renderContext, c
batch.setViewportTransform(viewport);
batch.setProjectionTransform(glm::mat4());
batch.resetViewTransform();
bool shouldMirror = args->_numMirrorFlips >= (args->_renderMode != RenderArgs::MIRROR_RENDER_MODE);
bool shouldMirror = args->_numMirrorFlips >= (args->_renderMode != RenderArgs::MIRROR_RENDER_MODE ? 1 : 0);
batch.setPipeline(shouldMirror ? _mirrorPipeline : _pipeline);

batch.setModelTransform(gpu::Framebuffer::evalSubregionTexcoordTransform(bufferSize, viewport));
Expand Down
Loading