Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions deflect/qt/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,19 @@

set(DEFLECTQT_HEADERS
EventReceiver.h
helpers.h
QmlGestures.h
QmlStreamerImpl.h
)
set(DEFLECTQT_PUBLIC_HEADERS
OffscreenQuickView.h
QmlStreamer.h
QuickRenderer.h
TouchInjector.h
)
set(DEFLECTQT_SOURCES
EventReceiver.cpp
OffscreenQuickView.cpp
QmlStreamer.cpp
QmlStreamerImpl.cpp
QuickRenderer.cpp
Expand Down
18 changes: 14 additions & 4 deletions deflect/qt/EventReceiver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ inline QPointF _pos( const Event& deflectEvent )
return QPointF{ deflectEvent.mouseX, deflectEvent.mouseY };
}

void EventReceiver::_onEvent( int socket )
void EventReceiver::_onEvent( const int socket )
{
if( socket != _stream.getDescriptor( ))
return;
Expand All @@ -82,9 +82,8 @@ void EventReceiver::_onEvent( int socket )
switch( deflectEvent.type )
{
case Event::EVT_CLOSE:
_notifier->setEnabled( false );
emit closed();
break;
_stop();
return;
case Event::EVT_PRESS:
emit pressed( _pos( deflectEvent ));
break;
Expand Down Expand Up @@ -134,7 +133,18 @@ void EventReceiver::_onEvent( int socket )
break;
}
}

if( !_stream.isConnected( ))
_stop();
}

void EventReceiver::_stop()
{
_notifier->setEnabled( false );
_timer->stop();
emit closed();
}

}

}
10 changes: 5 additions & 5 deletions deflect/qt/EventReceiver.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
/* or implied, of The University of Texas at Austin. */
/*********************************************************************/

#ifndef EVENTRECEIVER_H
#define EVENTRECEIVER_H
#ifndef DELFECT_QT_EVENTRECEIVER_H
#define DELFECT_QT_EVENTRECEIVER_H

#include <QObject>
#include <QPointF>
Expand Down Expand Up @@ -82,13 +82,13 @@ class EventReceiver : public QObject
void touchPointUpdated( int id, QPointF position );
void touchPointRemoved( int id, QPointF position );

private slots:
void _onEvent( int socket );

private:
Stream& _stream;
std::unique_ptr< QSocketNotifier > _notifier;
std::unique_ptr< QTimer > _timer;

void _onEvent( int socket );
void _stop();
};

}
Expand Down
248 changes: 248 additions & 0 deletions deflect/qt/OffscreenQuickView.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,248 @@
/*********************************************************************/
/* Copyright (c) 2016, EPFL/Blue Brain Project */
/* Daniel Nachbaur <daniel.nachbaur@epfl.ch> */
/* Raphael Dumusc <raphael.dumusc@epfl.ch> */
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did 80% of this file, for shame :)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you did it for my glory, for which I am grateful :-)

/* All rights reserved. */
/* */
/* Redistribution and use in source and binary forms, with or */
/* without modification, are permitted provided that the following */
/* conditions are met: */
/* */
/* 1. Redistributions of source code must retain the above */
/* copyright notice, this list of conditions and the following */
/* disclaimer. */
/* */
/* 2. Redistributions in binary form must reproduce the above */
/* copyright notice, this list of conditions and the following */
/* disclaimer in the documentation and/or other materials */
/* provided with the distribution. */
/* */
/* THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY OF TEXAS AT */
/* AUSTIN ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, */
/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF */
/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE */
/* DISCLAIMED. IN NO EVENT SHALL THE UNIVERSITY OF TEXAS AT */
/* AUSTIN OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, */
/* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES */
/* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE */
/* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR */
/* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF */
/* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT */
/* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT */
/* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE */
/* POSSIBILITY OF SUCH DAMAGE. */
/* */
/* The views and conclusions contained in the software and */
/* documentation are those of the authors and should not be */
/* interpreted as representing official policies, either expressed */
/* or implied, of Ecole polytechnique federale de Lausanne. */
/*********************************************************************/

#include "OffscreenQuickView.h"

#include "QuickRenderer.h"

#include <QOpenGLContext>
#include <QOpenGLFunctions>
#include <QQmlComponent>
#include <QQmlEngine>
#include <QQuickItem>
#include <QQuickRenderControl>
#include <QThread>

namespace deflect
{
namespace qt
{

OffscreenQuickView::OffscreenQuickView( std::unique_ptr<QQuickRenderControl>
renderControl, const RenderMode mode )
: QQuickWindow{ renderControl.get() }
, _renderControl{ std::move( renderControl ) }
, _mode{ mode }
, _qmlEngine{ new QQmlEngine }
, _qmlComponent{ new QQmlComponent{ _qmlEngine.get() }}
{
if( !_qmlEngine->incubationController( ))
_qmlEngine->setIncubationController( incubationController( ));

// remote URL to QML components are loaded asynchronously
connect( _qmlComponent.get(), &QQmlComponent::statusChanged,
this, &OffscreenQuickView::_setupRootItem );

// Now hook up the signals. For simplicity we don't differentiate between
// renderRequested (only render is needed, no sync) and sceneChanged (polish
// and sync is needed too).
connect( _renderControl.get(), &QQuickRenderControl::renderRequested,
this, &OffscreenQuickView::_requestRender );
connect( _renderControl.get(), &QQuickRenderControl::sceneChanged,
this, &OffscreenQuickView::_requestRender );
}

OffscreenQuickView::~OffscreenQuickView()
{
killTimer( _renderTimer );
_renderTimer = 0;
killTimer( _stopRenderingDelayTimer );
_stopRenderingDelayTimer = 0;

_quickRenderer->stop();
if( _quickRendererThread )
{
_quickRendererThread->quit();
_quickRendererThread->wait();
}

// delete first to free scenegraph resources for following destructions
_renderControl.reset();
}

std::future<bool> OffscreenQuickView::load( const QUrl& url )
{
_qmlComponent->loadUrl( url );
return _loadPromise.get_future();
}

QQuickItem* OffscreenQuickView::getRootItem() const
{
return _rootItem.get();
}

QQmlEngine* OffscreenQuickView::getEngine() const
{
return _qmlEngine.get();
}

QQmlContext* OffscreenQuickView::getRootContext() const
{
return _qmlEngine->rootContext();
}

void OffscreenQuickView::timerEvent( QTimerEvent* e )
{
if( e->timerId() == _renderTimer )
_render();
else if( e->timerId() == _stopRenderingDelayTimer )
{
killTimer( _renderTimer );
killTimer( _stopRenderingDelayTimer );
_renderTimer = 0;
_stopRenderingDelayTimer = 0;
}
}

void OffscreenQuickView::_setupRootItem()
{
disconnect( _qmlComponent.get(), &QQmlComponent::statusChanged,
this, &OffscreenQuickView::_setupRootItem );

if( _qmlComponent->isError( ))
{
for( const auto& error : _qmlComponent->errors( ))
qWarning() << error.url() << error.line() << error;
_loadPromise.set_value( false );
}

QObject* rootObject = _qmlComponent->create();
if( _qmlComponent->isError( ))
{
for( const auto& error : _qmlComponent->errors( ))
qWarning() << error.url() << error.line() << error;
_loadPromise.set_value( false );
return;
}

_rootItem.reset( qobject_cast< QQuickItem* >( rootObject ));
if( !_rootItem )
{
delete rootObject;
_loadPromise.set_value( false );
return;
}
_rootItem->setParentItem( contentItem( ));
resize( _rootItem->width(), _rootItem->height( ));

// emulate QQuickView::ResizeMode::SizeRootObjectToView
connect( this, &QQuickWindow::widthChanged,
_rootItem.get(), &QQuickItem::setWidth );
connect( this, &QQuickWindow::heightChanged,
_rootItem.get(), &QQuickItem::setHeight );

// also bind view to root object, to allow programmatic resize of rootItem
connect( _rootItem.get(), &QQuickItem::widthChanged,
[this]() { setWidth( _rootItem->width( )); } );
connect( _rootItem.get(), &QQuickItem::heightChanged,
[this]() { setHeight( _rootItem->height( )); } );

_loadPromise.set_value( true );
}

void OffscreenQuickView::_requestRender()
{
killTimer( _stopRenderingDelayTimer );
_stopRenderingDelayTimer = 0;

if( _renderTimer == 0 )
_renderTimer = startTimer( 5, Qt::PreciseTimer );
}

void OffscreenQuickView::_initRenderer()
{
switch( _mode )
{
case RenderMode::MULTITHREADED:
#ifdef DEFLECTQT_MULTITHREADED
_quickRenderer.reset( new QuickRenderer{ *this, *_renderControl, true,
RenderTarget::FBO } );

_quickRendererThread.reset( new QThread );
_quickRendererThread->setObjectName( "Render" );

// Call required to make QtGraphicalEffects work in the initial scene.
_renderControl->prepareThread( _quickRendererThread.get( ));
_quickRenderer->moveToThread( _quickRendererThread.get( ));
_quickRendererThread->start();
#else
throw std::runtime_error( "This version of deflect does not support "
"multithreaded rendering." );
#endif
break;
case RenderMode::SINGLETHREADED:
_quickRenderer.reset( new QuickRenderer{ *this, *_renderControl,
false, RenderTarget::FBO } );
break;
case RenderMode::DISABLED:
_quickRenderer.reset( new QuickRenderer{ *this, *_renderControl,
false, RenderTarget::NONE } );
break;
}

connect( _quickRenderer.get(), &QuickRenderer::afterRender,
this, &OffscreenQuickView::_afterRender, Qt::DirectConnection );

_quickRenderer->init();
}

void OffscreenQuickView::_render()
{
// Initialize the render control and our OpenGL resources. Do this as late
// as possible to use the proper size reported by the rootItem.
if( !_quickRenderer )
_initRenderer();

_renderControl->polishItems();
_quickRenderer->render();

if( _stopRenderingDelayTimer == 0 )
_stopRenderingDelayTimer = startTimer( 5000 /*ms*/ );
}

void OffscreenQuickView::_afterRender()
{
// Called directly by the render thread just after the rendering is done.
// The fbo can be safely assumed to be valid when this function executes.
emit afterRender( _quickRenderer->fbo()->toImage( ));
}

}
}
Loading