Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Addressing warnings

Browse source
This commit is contained in:
Sam Gateau 2019-09-27 14:01:00 -07:00
parent 57f8095506
commit ecd940e0e6
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/graphics/src/graphics/Material.cpp
View file

@ -36,7 +36,8 @@ std::string MaterialKey::getOpacityMapModeName(OpacityMapMode mode) {
bool MaterialKey::getOpacityMapModeFromName(const std::string& modeName, MaterialKey::OpacityMapMode& mode) {
for (mode = OPACITY_MAP_OPAQUE; mode <= OPACITY_MAP_BLEND; mode + 1) {
for (int i = OPACITY_MAP_OPAQUE; i <= OPACITY_MAP_BLEND; i++) {
mode = (MaterialKey::OpacityMapMode) i;
if (modeName == getOpacityMapModeName(mode)) {
return true;
}

2
tools/gpu-frame-player/src/RenderThread.cpp
View file

@ -182,7 +182,7 @@ void RenderThread::renderFrame(gpu::FramePointer& frame) {
batch->setPipeline(_presentPipeline);
batch->setFramebuffer(nullptr);
batch->setResourceTexture(0, frame->framebuffer->getRenderBuffer(0));
batch->setViewportTransform(ivec4(uvec2(0), ivec2(scale * fboSize.x, scale * fboSize.y)));
batch->setViewportTransform(ivec4(uvec2(0), ivec2(windowSize.width(), windowSize.height())));
batch->draw(gpu::TRIANGLE_STRIP, 4);
}
glDisable(GL_FRAMEBUFFER_SRGB);