Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 14:18:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Address some warnings and syntax issues

Browse source
This commit is contained in:
samcake 2016-07-14 12:06:02 -07:00
parent a42f9a5d0e
commit 3ab56062d4
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Application.cpp
View file

@ -1680,7 +1680,6 @@ void Application::paintGL() {
auto inputs = AvatarInputs::getInstance(); auto inputs = AvatarInputs::getInstance();
if (inputs->mirrorVisible()) { if (inputs->mirrorVisible()) {
PerformanceTimer perfTimer("Mirror"); PerformanceTimer perfTimer("Mirror");
// auto primaryFbo = DependencyManager::get<FramebufferCache>()->getPrimaryFramebuffer();
renderArgs._renderMode = RenderArgs::MIRROR_RENDER_MODE; renderArgs._renderMode = RenderArgs::MIRROR_RENDER_MODE;
renderArgs._blitFramebuffer = DependencyManager::get<FramebufferCache>()->getSelfieFramebuffer(); renderArgs._blitFramebuffer = DependencyManager::get<FramebufferCache>()->getSelfieFramebuffer();

1
libraries/fbx/src/FBXReader_Material.cpp
View file

@ -258,6 +258,7 @@ void FBXReader::consolidateFBXMaterials(const QVariantHash& mapping) {
} }
} }
} }
qDebug() << " fbx material Name:" << material.name;
if (materialMap.contains(material.name)) { if (materialMap.contains(material.name)) {
QJsonObject materialOptions = materialMap.value(material.name).toObject(); QJsonObject materialOptions = materialMap.value(material.name).toObject();

7
libraries/gpu-gl/src/gpu/gl/GLShared.cpp
View file

@ -671,15 +671,18 @@ bool compileShader(GLenum shaderDomain, const std::string& shaderSource, const s
// if compilation fails // if compilation fails
if (!compiled) { if (!compiled) {
// save the source code to a temp file so we can debug easily // save the source code to a temp file so we can debug easily
std::ofstream filestream; /*
std::ofstream filestream;
filestream.open("debugshader.glsl"); filestream.open("debugshader.glsl");
if (filestream.is_open()) { if (filestream.is_open()) {
filestream << srcstr[0]; filestream << srcstr[0];
filestream << srcstr[1]; filestream << srcstr[1];
filestream.close(); filestream.close();
} }
*/
GLint infoLength = 0; GLint infoLength = 0;
glGetShaderiv(glshader, GL_INFO_LOG_LENGTH, &infoLength); glGetShaderiv(glshader, GL_INFO_LOG_LENGTH, &infoLength);

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

@ -331,13 +331,10 @@ model::MeshPointer DeferredLightingEffect::getSpotLightMesh() {
} }
void PreparePrimaryFramebuffer::run(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext, gpu::FramebufferPointer& primaryFramebuffer) { void PreparePrimaryFramebuffer::run(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext, gpu::FramebufferPointer& primaryFramebuffer) {
auto args = renderContext->args;
auto framebufferCache = DependencyManager::get<FramebufferCache>(); auto framebufferCache = DependencyManager::get<FramebufferCache>();
auto framebufferSize = framebufferCache->getFrameBufferSize(); auto framebufferSize = framebufferCache->getFrameBufferSize();
glm::ivec2 frameSize(framebufferSize.width(), framebufferSize.height());
// glm::ivec2 frameSize(args->_viewport.z, args->_viewport.w);
glm::ivec2 frameSize(framebufferSize.width(), framebufferSize.height());
if (!_primaryFramebuffer) { if (!_primaryFramebuffer) {
_primaryFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create()); _primaryFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create());

2
libraries/render/src/render/Task.h
View file

@ -521,7 +521,7 @@ public:
template <class... A> template <class... A>
Model(const Varying& input, A&&... args) : Model(const Varying& input, A&&... args) :
Concept(std::make_shared<C>()), _data(Data(std::forward<A>(args)...)), _input(input), _output(Output()) { Concept(std::make_shared<Config>()), _data(Data(std::forward<A>(args)...)), _input(input), _output(Output()) {
_config = _data._config; _config = _data._config;
std::static_pointer_cast<Config>(_config)->init(&_data); std::static_pointer_cast<Config>(_config)->init(&_data);
applyConfiguration(); applyConfiguration();