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

Fixing issues with the review process

Browse source
This commit is contained in:
Sam Gateau 2015-07-23 16:55:18 -07:00
parent a002560003
commit a424ff98ca
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/Application.cpp
View file

@ -962,10 +962,6 @@ void Application::paintGL() {
_myCamera.update(1.0f / _fps); _myCamera.update(1.0f / _fps);
} }
// Sync up the View Furstum with the camera
// loadViewFrustum(_myCamera, _viewFrustum);
renderArgs._renderMode = RenderArgs::DEFAULT_RENDER_MODE; renderArgs._renderMode = RenderArgs::DEFAULT_RENDER_MODE;
if (OculusManager::isConnected()) { if (OculusManager::isConnected()) {
@ -3010,7 +3006,8 @@ QImage Application::renderAvatarBillboard(RenderArgs* renderArgs) {
batch.setFramebuffer(primaryFbo); batch.setFramebuffer(primaryFbo);
renderArgs->_context->render(batch); renderArgs->_context->render(batch);
} }
renderArgs->_renderMode = RenderArgs::NORMAL_RENDER_MODE; renderArgs->_renderMode = RenderArgs::DEFAULT_RENDER_MODE;
renderRearViewMirror(renderArgs, QRect(0, 0, BILLBOARD_SIZE, BILLBOARD_SIZE), true); renderRearViewMirror(renderArgs, QRect(0, 0, BILLBOARD_SIZE, BILLBOARD_SIZE), true);
{ {

2
interface/src/avatar/MyAvatar.cpp
View file

@ -1551,7 +1551,9 @@ void MyAvatar::maybeUpdateBillboard() {
QBuffer buffer(&_billboard); QBuffer buffer(&_billboard);
buffer.open(QIODevice::WriteOnly); buffer.open(QIODevice::WriteOnly);
image.save(&buffer, "PNG"); image.save(&buffer, "PNG");
#ifdef DEBUG
image.save("billboard.png", "PNG"); image.save("billboard.png", "PNG");
#endif
_billboardValid = true; _billboardValid = true;
sendBillboardPacket(); sendBillboardPacket();

2
libraries/gpu/src/gpu/Context.h
View file

@ -20,6 +20,8 @@
#include "Pipeline.h" #include "Pipeline.h"
#include "Framebuffer.h" #include "Framebuffer.h"
class QImage;
namespace gpu { namespace gpu {
class Backend { class Backend {

3
libraries/gpu/src/gpu/GLBackendOutput.cpp
View file

@ -8,10 +8,11 @@
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
#include <qimage.h>
#include "GPULogging.h" #include "GPULogging.h"
#include "GLBackendShared.h" #include "GLBackendShared.h"
#include "qimage.h"
using namespace gpu; using namespace gpu;