Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 17:14:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

jittery, still not working in tablet

Browse source
This commit is contained in:
David Kelly 2017-06-30 12:55:11 -07:00
parent 02b712716b
commit 133af0b522
3 changed files with 59 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
interface/src/ui/ResourceImageItem.cpp
View file

@ -20,35 +20,46 @@
#include <TextureCache.h>
ResourceImageItem::ResourceImageItem(QQuickItem* parent) : QQuickFramebufferObject(parent) {
connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(update()));
connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(onUpdateTimer()));
}
void ResourceImageItem::onUpdateTimer() {
qDebug() << "onUpdateTimer called";
// turn timer off if not visible
if (!isVisible()) {
m_updateTimer.stop();
} else {
update();
}
}
void ResourceImageItem::setUrl(const QString& url) {
if (url != m_url) {
m_url = url;
}
update();
}
void ResourceImageItem::setReady(bool ready) {
if (ready != m_ready) {
m_ready = ready;
update();
/*
if (m_ready) {
// 10 HZ for now. Also this serves as a small
// delay before getting the network texture, which
// helps a lot. TODO: find better way.
qDebug() << "setReady called";
m_updateTimer.start(100);
} else {
m_updateTimer.stop();
update();
}*/
}
}
}
void ResourceImageItemRenderer::synchronize(QQuickFramebufferObject* item) {
ResourceImageItem* resourceImageItem = static_cast<ResourceImageItem*>(item);
resourceImageItem->setFlag(QQuickItem::ItemHasContents);
bool urlChanged = false;
if( _url != resourceImageItem->getUrl()) {
_url = resourceImageItem->getUrl();
@ -65,7 +76,6 @@ void ResourceImageItemRenderer::synchronize(QQuickFramebufferObject* item) {
_networkTexture = DependencyManager::get<TextureCache>()->getTexture(_url);
}
resourceImageItem->forceActiveFocus();
if (_ready && _networkTexture && _networkTexture->isLoaded()) {
if(_fboMutex.tryLock()) {
qApp->getActiveDisplayPlugin()->copyTextureToQuickFramebuffer(_networkTexture, _copyFbo, &_fenceSync);
@ -73,6 +83,7 @@ void ResourceImageItemRenderer::synchronize(QQuickFramebufferObject* item) {
}
}
glFlush();
}
@ -82,13 +93,46 @@ QOpenGLFramebufferObject* ResourceImageItemRenderer::createFramebufferObject(con
_copyFbo = new QOpenGLFramebufferObject(size, format);
return new QOpenGLFramebufferObject(size, format);
}
/*
// this is helpful to look for problems without the confusion of the framebufer stuff
void ResourceImageItemRenderer::render() {
qDebug() << "rendering";
static int colorInt = 0;
float red = (float)((colorInt++ % 20)/(float)20);
float red = (float)((colorInt++ % 50)/(float)50);
glClearColor(red, 0.0f, 0.0f, 0.5f + red/2.0f);
glClear(GL_COLOR_BUFFER_BIT);
glFlush();
_window->resetOpenGLState();
update(); // schedule a call to render again on next frame (only do this when camera is on, in the future)
update();
//_window->resetOpenGLState();
// we only want to call Renderer::update once per timer tick, and
// so waiting on the fenceSync and resetting it does that
auto f = QOpenGLContext::currentContext()->extraFunctions();
if (_fenceSync) {
f->glWaitSync(_fenceSync, 0, GL_TIMEOUT_IGNORED);
f->glDeleteSync(_fenceSync);
_fenceSync = 0;
update();
}
}
*/
void ResourceImageItemRenderer::render() {
auto f = QOpenGLContext::currentContext()->extraFunctions();
bool doUpdate = false;
if (_fenceSync) {
f->glWaitSync(_fenceSync, 0, GL_TIMEOUT_IGNORED);
f->glDeleteSync(_fenceSync);
_fenceSync = 0;
doUpdate = true;
}
if (_ready) {
_fboMutex.lock();
_copyFbo->bind();
QOpenGLFramebufferObject::blitFramebuffer(framebufferObject(), _copyFbo, GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT, GL_NEAREST);
_copyFbo->release();
_fboMutex.unlock();
if (doUpdate) {
update();
}
}
glFlush();
}

5
interface/src/ui/ResourceImageItem.h
View file

@ -44,10 +44,15 @@ public:
bool getReady() const { return m_ready; }
void setReady(bool ready);
QQuickFramebufferObject::Renderer* createRenderer() const override { return new ResourceImageItemRenderer; }
public slots:
void onUpdateTimer();
private:
QString m_url;
bool m_ready { false };
QTimer m_updateTimer; // TODO: something more clever
};
#endif // hifi_ResourceImageItem_h

1
libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
View file

@ -847,6 +847,7 @@ void OpenGLDisplayPlugin::copyTextureToQuickFramebuffer(NetworkTexturePointer ne
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, targetTexture, 0);
qDebug() << "error" << glGetError();
// TODO: perhaps maintain aspect ratio
glBlitNamedFramebuffer(fbo[0], fbo[1], 0, 0, networkTexture->getWidth(), networkTexture->getHeight(), 0, 0, target->width(), target->height(), GL_COLOR_BUFFER_BIT, GL_NEAREST);
qDebug() << "error" << glGetError();