Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-31 07:40:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'ui-refactor' into vr_menus

Browse source
This commit is contained in:
Brad Davis 2015-04-26 20:14:04 -07:00
commit 3032b1fb67
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/render-utils/src/MatrixStack.h
View file

@ -38,7 +38,7 @@ public:
push(glm::mat4()); push(glm::mat4());
} }
explicit MatrixStack(const MatrixStack & other) { explicit MatrixStack(const MatrixStack& other) {
*((std::stack<glm::mat4>*)this) = *((std::stack<glm::mat4>*)&other); *((std::stack<glm::mat4>*)this) = *((std::stack<glm::mat4>*)&other);
} }
@ -173,12 +173,12 @@ public:
} }
template <typename Function> template <typename Function>
static void withPush(MatrixStack & stack, Function f) { static void withPush(MatrixStack& stack, Function f) {
stack.withPush(f); stack.withPush(f);
} }
template <typename Function> template <typename Function>
static void withPush(MatrixStack & stack1, MatrixStack & stack2, Function f) { static void withPush(MatrixStack& stack1, MatrixStack& stack2, Function f) {
stack1.withPush([&]{ stack1.withPush([&]{
stack2.withPush(f); stack2.withPush(f);
}); });

4
libraries/ui/src/OffscreenUi.cpp
View file

@ -174,7 +174,7 @@ QObject* OffscreenUi::finishQmlLoad(std::function<void(QQmlContext*, QObject*)>
disconnect(_qmlComponent, &QQmlComponent::statusChanged, this, 0); disconnect(_qmlComponent, &QQmlComponent::statusChanged, this, 0);
if (_qmlComponent->isError()) { if (_qmlComponent->isError()) {
QList<QQmlError> errorList = _qmlComponent->errors(); QList<QQmlError> errorList = _qmlComponent->errors();
foreach(const QQmlError &error, errorList) { foreach(const QQmlError& error, errorList) {
qWarning() << error.url() << error.line() << error; qWarning() << error.url() << error.line() << error;
} }
return nullptr; return nullptr;
@ -184,7 +184,7 @@ QObject* OffscreenUi::finishQmlLoad(std::function<void(QQmlContext*, QObject*)>
QObject* newObject = _qmlComponent->beginCreate(newContext); QObject* newObject = _qmlComponent->beginCreate(newContext);
if (_qmlComponent->isError()) { if (_qmlComponent->isError()) {
QList<QQmlError> errorList = _qmlComponent->errors(); QList<QQmlError> errorList = _qmlComponent->errors();
foreach(const QQmlError &error, errorList) foreach(const QQmlError& error, errorList)
qWarning() << error.url() << error.line() << error; qWarning() << error.url() << error.line() << error;
if (!_rootItem) { if (!_rootItem) {
qFatal("Unable to finish loading QML root"); qFatal("Unable to finish loading QML root");