diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 9af09dc21d..a14c9e0814 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1680,7 +1680,6 @@ void Application::paintGL() { auto inputs = AvatarInputs::getInstance(); if (inputs->mirrorVisible()) { PerformanceTimer perfTimer("Mirror"); - // auto primaryFbo = DependencyManager::get()->getPrimaryFramebuffer(); renderArgs._renderMode = RenderArgs::MIRROR_RENDER_MODE; renderArgs._blitFramebuffer = DependencyManager::get()->getSelfieFramebuffer(); diff --git a/libraries/fbx/src/FBXReader_Material.cpp b/libraries/fbx/src/FBXReader_Material.cpp index f68203a04b..eb25f1d8a2 100644 --- a/libraries/fbx/src/FBXReader_Material.cpp +++ b/libraries/fbx/src/FBXReader_Material.cpp @@ -258,6 +258,7 @@ void FBXReader::consolidateFBXMaterials(const QVariantHash& mapping) { } } } + qDebug() << " fbx material Name:" << material.name; if (materialMap.contains(material.name)) { QJsonObject materialOptions = materialMap.value(material.name).toObject(); diff --git a/libraries/gpu-gl/src/gpu/gl/GLShared.cpp b/libraries/gpu-gl/src/gpu/gl/GLShared.cpp index db930cf696..8f234ca6b4 100644 --- a/libraries/gpu-gl/src/gpu/gl/GLShared.cpp +++ b/libraries/gpu-gl/src/gpu/gl/GLShared.cpp @@ -671,15 +671,18 @@ bool compileShader(GLenum shaderDomain, const std::string& shaderSource, const s // if compilation fails if (!compiled) { + // save the source code to a temp file so we can debug easily - std::ofstream filestream; + /* + std::ofstream filestream; filestream.open("debugshader.glsl"); if (filestream.is_open()) { filestream << srcstr[0]; filestream << srcstr[1]; filestream.close(); } - + */ + GLint infoLength = 0; glGetShaderiv(glshader, GL_INFO_LOG_LENGTH, &infoLength); diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp index 665f1c14ce..1299cb428f 100644 --- a/libraries/render-utils/src/DeferredLightingEffect.cpp +++ b/libraries/render-utils/src/DeferredLightingEffect.cpp @@ -331,13 +331,10 @@ model::MeshPointer DeferredLightingEffect::getSpotLightMesh() { } void PreparePrimaryFramebuffer::run(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext, gpu::FramebufferPointer& primaryFramebuffer) { - auto args = renderContext->args; auto framebufferCache = DependencyManager::get(); auto framebufferSize = framebufferCache->getFrameBufferSize(); - - // glm::ivec2 frameSize(args->_viewport.z, args->_viewport.w); - glm::ivec2 frameSize(framebufferSize.width(), framebufferSize.height()); + glm::ivec2 frameSize(framebufferSize.width(), framebufferSize.height()); if (!_primaryFramebuffer) { _primaryFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create()); diff --git a/libraries/render/src/render/Task.h b/libraries/render/src/render/Task.h index 3621fc5e0a..a42fb4f0ac 100644 --- a/libraries/render/src/render/Task.h +++ b/libraries/render/src/render/Task.h @@ -521,7 +521,7 @@ public: template Model(const Varying& input, A&&... args) : - Concept(std::make_shared()), _data(Data(std::forward(args)...)), _input(input), _output(Output()) { + Concept(std::make_shared()), _data(Data(std::forward(args)...)), _input(input), _output(Output()) { _config = _data._config; std::static_pointer_cast(_config)->init(&_data); applyConfiguration();