Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Coding standard fixes

Browse source
This commit is contained in:
Brad Davis 2015-04-22 19:05:57 -07:00
parent e68f149aac
commit 8d8c4babba
9 changed files with 107 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/Application.cpp
View file

@ -569,8 +569,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
this->installEventFilter(this);
// The offscreen UI needs to intercept the mouse and keyboard
// events coming from the onscreen window
_glWidget->installEventFilter(
DependencyManager::get<OffscreenUi>().data());
_glWidget->installEventFilter(DependencyManager::get<OffscreenUi>().data());
}

10
interface/src/ui/ApplicationOverlay.cpp
View file

@ -237,15 +237,15 @@ void ApplicationOverlay::renderOverlay() {
// A quick and dirty solution for compositing the old overlay
// texture with the new one
template <typename F>
void with_each_texture(GLuint a, GLuint b, F f) {
void with_each_texture(GLuint firstPassTexture, GLuint secondPassTexture, F f) {
glEnable(GL_TEXTURE_2D);
glActiveTexture(GL_TEXTURE0);
if (a) {
glBindTexture(GL_TEXTURE_2D, a);
if (firstPassTexture) {
glBindTexture(GL_TEXTURE_2D, firstPassTexture);
f();
}
if (b) {
glBindTexture(GL_TEXTURE_2D, b);
if (secondPassTexture) {
glBindTexture(GL_TEXTURE_2D, secondPassTexture);
f();
}
glBindTexture(GL_TEXTURE_2D, 0);

6
interface/src/ui/LoginDialog.h
View file

@ -25,7 +25,7 @@ class LoginDialog : public OffscreenQmlDialog
public:
static void toggleAction();
LoginDialog(QQuickItem *parent = 0);
LoginDialog(QQuickItem* parent = 0);
void setStatusText(const QString & a);
QString statusText() const;
@ -39,8 +39,8 @@ protected:
void handleLoginCompleted(const QUrl& authURL);
void handleLoginFailed();
Q_INVOKABLE void login(const QString & username, const QString & password);
Q_INVOKABLE void openUrl(const QString & url);
Q_INVOKABLE void login(const QString& username, const QString& password);
Q_INVOKABLE void openUrl(const QString& url);
private:
QString _statusText;
const QString _rootUrl;

2
libraries/render-utils/src/OffscreenGlCanvas.cpp
View file

@ -15,7 +15,7 @@
OffscreenGlCanvas::OffscreenGlCanvas() {
}
void OffscreenGlCanvas::create(QOpenGLContext * sharedContext) {
void OffscreenGlCanvas::create(QOpenGLContext* sharedContext) {
if (nullptr != sharedContext) {
sharedContext->doneCurrent();
_context.setFormat(sharedContext->format());

2
libraries/render-utils/src/OffscreenGlCanvas.h
View file

@ -18,7 +18,7 @@
class OffscreenGlCanvas : public QObject {
public:
OffscreenGlCanvas();
void create(QOpenGLContext * sharedContext = nullptr);
void create(QOpenGLContext* sharedContext = nullptr);
bool makeCurrent();
void doneCurrent();

2
libraries/render-utils/src/OffscreenQmlDialog.cpp
View file

@ -10,7 +10,7 @@
#include "OffscreenQmlDialog.h"
OffscreenQmlDialog::OffscreenQmlDialog(QQuickItem *parent)
OffscreenQmlDialog::OffscreenQmlDialog(QQuickItem* parent)
: QQuickItem(parent) { }
void OffscreenQmlDialog::hide() {

2
libraries/render-utils/src/OffscreenQmlDialog.h
View file

@ -47,7 +47,7 @@ class OffscreenQmlDialog : public QQuickItem
{
Q_OBJECT
public:
OffscreenQmlDialog(QQuickItem *parent = 0);
OffscreenQmlDialog(QQuickItem* parent = 0);
protected:
void hide();

139
libraries/render-utils/src/OffscreenUi.cpp
View file

@ -18,18 +18,18 @@ class OffscreenUiRoot : public QQuickItem {
Q_OBJECT
public:
OffscreenUiRoot(QQuickItem *parent = 0);
Q_INVOKABLE void information(const QString & title, const QString & text);
Q_INVOKABLE void loadChild(const QUrl & url) {
OffscreenUiRoot(QQuickItem* parent = 0);
Q_INVOKABLE void information(const QString& title, const QString& text);
Q_INVOKABLE void loadChild(const QUrl& url) {
DependencyManager::get<OffscreenUi>()->load(url);
}
};
OffscreenUiRoot::OffscreenUiRoot(QQuickItem *parent) : QQuickItem(parent) {
OffscreenUiRoot::OffscreenUiRoot(QQuickItem* parent) : QQuickItem(parent) {
}
void OffscreenUiRoot::information(const QString & title, const QString & text = "foo") {
void OffscreenUiRoot::information(const QString& title, const QString& text) {
OffscreenUi::information(title, text);
}
@ -55,7 +55,7 @@ OffscreenUi::~OffscreenUi() {
doneCurrent();
}
void OffscreenUi::create(QOpenGLContext * shareContext) {
void OffscreenUi::create(QOpenGLContext* shareContext) {
OffscreenGlCanvas::create(shareContext);
makeCurrent();
@ -69,8 +69,9 @@ void OffscreenUi::create(QOpenGLContext * shareContext) {
_quickWindow->setFlags(_quickWindow->flags() | static_cast<Qt::WindowFlags>(Qt::WA_TranslucentBackground));
// Create a QML engine.
_qmlEngine = new QQmlEngine;
if (!_qmlEngine->incubationController())
if (!_qmlEngine->incubationController()) {
_qmlEngine->setIncubationController(_quickWindow->incubationController());
}
// When Quick says there is a need to render, we will not render immediately. Instead,
// a timer with a small interval is used to get better performance.
@ -91,11 +92,11 @@ void OffscreenUi::create(QOpenGLContext * shareContext) {
_renderControl->initialize(&_context);
}
void OffscreenUi::addImportPath(const QString & path) {
void OffscreenUi::addImportPath(const QString& path) {
_qmlEngine->addImportPath(path);
}
void OffscreenUi::resize(const QSize & newSize) {
void OffscreenUi::resize(const QSize& newSize) {
makeCurrent();
// Clear out any fbos with the old size
@ -115,24 +116,25 @@ void OffscreenUi::resize(const QSize & newSize) {
doneCurrent();
}
QQmlContext * OffscreenUi::qmlContext() {
QQmlContext* OffscreenUi::qmlContext() {
if (nullptr == _rootItem) {
return _qmlComponent->creationContext();
}
return QQmlEngine::contextForObject(_rootItem);
}
void OffscreenUi::setBaseUrl(const QUrl & baseUrl) {
void OffscreenUi::setBaseUrl(const QUrl& baseUrl) {
_qmlEngine->setBaseUrl(baseUrl);
}
void OffscreenUi::load(const QUrl & qmlSource, std::function<void(QQmlContext*)> f) {
void OffscreenUi::load(const QUrl& qmlSource, std::function<void(QQmlContext*)> f) {
qDebug() << "Loading QML from URL " << qmlSource;
_qmlComponent->loadUrl(qmlSource);
if (_qmlComponent->isLoading())
connect(_qmlComponent, &QQmlComponent::statusChanged, this, [] {});
else
if (_qmlComponent->isLoading()) {
connect(_qmlComponent, &QQmlComponent::statusChanged, this, []{});
} else {
finishQmlLoad();
}
}
void OffscreenUi::requestUpdate() {
@ -156,7 +158,7 @@ void OffscreenUi::finishQmlLoad() {
return;
}
QObject *newObject = _qmlComponent->create();
QObject* newObject = _qmlComponent->create();
if (_qmlComponent->isError()) {
QList<QQmlError> errorList = _qmlComponent->errors();
foreach(const QQmlError &error, errorList)
@ -167,7 +169,7 @@ void OffscreenUi::finishQmlLoad() {
return;
}
QQuickItem * newItem = qobject_cast<QQuickItem *>(newObject);
QQuickItem* newItem = qobject_cast<QQuickItem*>(newObject);
if (!newItem) {
qWarning("run: Not a QQuickItem");
delete newObject;
@ -200,8 +202,9 @@ void OffscreenUi::updateQuick() {
if (_paused) {
return;
}
if (!makeCurrent())
if (!makeCurrent()) {
return;
}
// Polish, synchronize and render the next frame (into our fbo). In this example
// everything happens on the same thread and therefore all three steps are performed
@ -234,7 +237,7 @@ void OffscreenUi::updateQuick() {
emit textureUpdated(fbo->texture());
}
QPointF OffscreenUi::mapWindowToUi(const QPointF & p, QObject * dest) {
QPointF OffscreenUi::mapWindowToUi(const QPointF& p, QObject* dest) {
vec2 sourceSize;
if (dynamic_cast<QWidget*>(dest)) {
sourceSize = toGlm(((QWidget*)dest)->size());
@ -252,7 +255,7 @@ QPointF OffscreenUi::mapWindowToUi(const QPointF & p, QObject * dest) {
// Event handling customization
//
bool OffscreenUi::eventFilter(QObject * dest, QEvent * e) {
bool OffscreenUi::eventFilter(QObject* dest, QEvent* e) {
// Only intercept events while we're in an active state
if (_paused) {
return false;
@ -264,50 +267,46 @@ bool OffscreenUi::eventFilter(QObject * dest, QEvent * e) {
}
switch (e->type()) {
case QEvent::Resize:
{
QResizeEvent * re = (QResizeEvent *)e;
QGLWidget * widget = dynamic_cast<QGLWidget*>(dest);
if (widget) {
this->resize(re->size());
case QEvent::Resize: {
QResizeEvent* re = (QResizeEvent*)e;
QGLWidget* widget = dynamic_cast<QGLWidget*>(dest);
if (widget) {
this->resize(re->size());
}
return false;
}
return false;
}
case QEvent::KeyPress:
case QEvent::KeyRelease:
{
e->ignore();
if (QCoreApplication::sendEvent(_quickWindow, e)) {
return e->isAccepted();
case QEvent::KeyPress:
case QEvent::KeyRelease: {
e->ignore();
if (QCoreApplication::sendEvent(_quickWindow, e)) {
return e->isAccepted();
}
break;
}
}
break;
case QEvent::Wheel:
{
QWheelEvent * we = (QWheelEvent*)e;
QWheelEvent mappedEvent(mapWindowToUi(we->pos(), dest), we->delta(), we->buttons(), we->modifiers(), we->orientation());
QCoreApplication::sendEvent(_quickWindow, &mappedEvent);
return true;
}
break;
case QEvent::Wheel: {
QWheelEvent* we = (QWheelEvent*)e;
QWheelEvent mappedEvent(mapWindowToUi(we->pos(), dest), we->delta(), we->buttons(), we->modifiers(), we->orientation());
QCoreApplication::sendEvent(_quickWindow, &mappedEvent);
return true;
}
// Fall through
case QEvent::MouseButtonDblClick:
case QEvent::MouseButtonPress:
case QEvent::MouseButtonRelease:
case QEvent::MouseMove:
{
QMouseEvent * me = (QMouseEvent *)e;
QPointF originalPos = me->localPos();
QPointF transformedPos = _mouseTranslator(originalPos);
QMouseEvent mappedEvent(e->type(), mapWindowToUi(transformedPos, dest), me->screenPos(), me->button(), me->buttons(), me->modifiers());
QCoreApplication::sendEvent(_quickWindow, &mappedEvent);
return QObject::event(e);
}
// Fall through
case QEvent::MouseButtonDblClick:
case QEvent::MouseButtonPress:
case QEvent::MouseButtonRelease:
case QEvent::MouseMove: {
QMouseEvent* me = (QMouseEvent *)e;
QPointF originalPos = me->localPos();
QPointF transformedPos = _mouseTranslator(originalPos);
QMouseEvent mappedEvent(e->type(), mapWindowToUi(transformedPos, dest), me->screenPos(), me->button(), me->buttons(), me->modifiers());
QCoreApplication::sendEvent(_quickWindow, &mappedEvent);
return QObject::event(e);
}
default: break;
default:
break;
}
return false;
@ -334,22 +333,22 @@ bool OffscreenUi::isPaused() const {
return _paused;
}
void OffscreenUi::setProxyWindow(QWindow * window) {
void OffscreenUi::setProxyWindow(QWindow* window) {
_renderControl->_renderWindow = window;
}
void OffscreenUi::show(const QUrl & url, const QString & name) {
QQuickItem * item = _rootItem->findChild<QQuickItem*>(name);
void OffscreenUi::show(const QUrl& url, const QString& name) {
QQuickItem* item = _rootItem->findChild<QQuickItem*>(name);
// First load?
if (nullptr == item) {
if (!item) {
load(url);
return;
}
item->setEnabled(true);
}
void OffscreenUi::toggle(const QUrl & url, const QString & name) {
QQuickItem * item = _rootItem->findChild<QQuickItem*>(name);
void OffscreenUi::toggle(const QUrl& url, const QString& name) {
QQuickItem* item = _rootItem->findChild<QQuickItem*>(name);
// First load?
if (nullptr == item) {
load(url);
@ -358,31 +357,31 @@ void OffscreenUi::toggle(const QUrl & url, const QString & name) {
item->setEnabled(!item->isEnabled());
}
void OffscreenUi::messageBox(const QString &title, const QString &text,
void OffscreenUi::messageBox(const QString& title, const QString& text,
QMessageBox::Icon icon,
QMessageBox::StandardButtons buttons,
ButtonCallback f) {
}
void OffscreenUi::information(const QString &title, const QString &text,
void OffscreenUi::information(const QString& title, const QString& text,
QMessageBox::StandardButtons buttons,
ButtonCallback callback) {
callback(QMessageBox::information(nullptr, title, text, buttons));
}
void OffscreenUi::question(const QString &title, const QString &text,
void OffscreenUi::question(const QString& title, const QString& text,
QMessageBox::StandardButtons buttons,
ButtonCallback callback) {
callback(QMessageBox::question(nullptr, title, text, buttons));
}
void OffscreenUi::warning(const QString &title, const QString &text,
void OffscreenUi::warning(const QString& title, const QString& text,
QMessageBox::StandardButtons buttons,
ButtonCallback callback) {
callback(QMessageBox::warning(nullptr, title, text, buttons));
}
void OffscreenUi::critical(const QString &title, const QString &text,
void OffscreenUi::critical(const QString& title, const QString& text,
QMessageBox::StandardButtons buttons,
ButtonCallback callback) {
callback(QMessageBox::critical(nullptr, title, text, buttons));
@ -391,4 +390,4 @@ void OffscreenUi::critical(const QString &title, const QString &text,
OffscreenUi::ButtonCallback OffscreenUi::NO_OP_CALLBACK = [](QMessageBox::StandardButton) {};
#include "OffscreenUi.moc"
#include "OffscreenUi.moc"

50
libraries/render-utils/src/OffscreenUi.h
View file

@ -38,7 +38,7 @@ class OffscreenUi : public OffscreenGlCanvas, public Dependency {
class QMyQuickRenderControl : public QQuickRenderControl {
protected:
QWindow * renderWindow(QPoint * offset) Q_DECL_OVERRIDE{
QWindow* renderWindow(QPoint* offset) Q_DECL_OVERRIDE{
if (nullptr == _renderWindow) {
return QQuickRenderControl::renderWindow(offset);
}
@ -49,59 +49,59 @@ class OffscreenUi : public OffscreenGlCanvas, public Dependency {
}
private:
QWindow * _renderWindow{ nullptr };
QWindow* _renderWindow{ nullptr };
friend class OffscreenUi;
};
public:
using MouseTranslator = std::function < QPointF(const QPointF &) > ;
using MouseTranslator = std::function<QPointF(const QPointF&)>;
OffscreenUi();
virtual ~OffscreenUi();
void create(QOpenGLContext * context);
void resize(const QSize & size);
void load(const QUrl & qmlSource, std::function<void(QQmlContext*)> f = [](QQmlContext*) {});
void load(const QString & qmlSourceFile, std::function<void(QQmlContext*)> f = [](QQmlContext*) {}) {
void create(QOpenGLContext* context);
void resize(const QSize& size);
void load(const QUrl& qmlSource, std::function<void(QQmlContext*)> f = [](QQmlContext*) {});
void load(const QString& qmlSourceFile, std::function<void(QQmlContext*)> f = [](QQmlContext*) {}) {
load(QUrl(qmlSourceFile), f);
}
void show(const QUrl & url, const QString & name);
void toggle(const QUrl & url, const QString & name);
void setBaseUrl(const QUrl & baseUrl);
void addImportPath(const QString & path);
void show(const QUrl& url, const QString& name);
void toggle(const QUrl& url, const QString& name);
void setBaseUrl(const QUrl& baseUrl);
void addImportPath(const QString& path);
QQmlContext * qmlContext();
void pause();
void resume();
bool isPaused() const;
void setProxyWindow(QWindow * window);
QPointF mapWindowToUi(const QPointF & p, QObject * dest);
virtual bool eventFilter(QObject * dest, QEvent * e);
void setProxyWindow(QWindow* window);
QPointF mapWindowToUi(const QPointF& p, QObject* dest);
virtual bool eventFilter(QObject* dest, QEvent* e);
void setMouseTranslator(MouseTranslator mt) {
_mouseTranslator = mt;
}
// Messagebox replacement functions
using ButtonCallback = std::function < void(QMessageBox::StandardButton) >;
using ButtonCallback = std::function<void(QMessageBox::StandardButton)>;
static ButtonCallback NO_OP_CALLBACK;
static void messageBox(const QString &title, const QString &text,
static void messageBox(const QString& title, const QString& text,
QMessageBox::Icon icon,
QMessageBox::StandardButtons buttons,
ButtonCallback f);
static void information(const QString &title, const QString &text,
static void information(const QString& title, const QString& text,
QMessageBox::StandardButtons buttons = QMessageBox::Ok,
ButtonCallback callback = NO_OP_CALLBACK);
static void question(const QString &title, const QString &text,
static void question(const QString& title, const QString& text,
QMessageBox::StandardButtons buttons = QMessageBox::StandardButtons(QMessageBox::Yes | QMessageBox::No),
ButtonCallback callback = [](QMessageBox::StandardButton) {});
static void warning(const QString &title, const QString &text,
static void warning(const QString& title, const QString& text,
QMessageBox::StandardButtons buttons = QMessageBox::Ok,
ButtonCallback callback = [](QMessageBox::StandardButton) {});
static void critical(const QString &title, const QString &text,
static void critical(const QString& title, const QString& text,
QMessageBox::StandardButtons buttons = QMessageBox::Ok,
ButtonCallback callback = [](QMessageBox::StandardButton) {});
@ -121,11 +121,11 @@ signals:
void textureUpdated(GLuint texture);
private:
QMyQuickRenderControl *_renderControl{ new QMyQuickRenderControl };
QQuickWindow *_quickWindow{ nullptr };
QQmlEngine *_qmlEngine{ nullptr };
QQmlComponent *_qmlComponent{ nullptr };
QQuickItem * _rootItem{ nullptr };
QMyQuickRenderControl* _renderControl{ new QMyQuickRenderControl };
QQuickWindow* _quickWindow{ nullptr };
QQmlEngine* _qmlEngine{ nullptr };
QQmlComponent* _qmlComponent{ nullptr };
QQuickItem* _rootItem{ nullptr };
QTimer _updateTimer;
FboCache _fboCache;
bool _polish{ true };