Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 12:42:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'ui-refactor' into menu2

Browse source
This commit is contained in:
Brad Davis 2015-04-25 16:48:05 -07:00
commit 198224c4ec
13 changed files with 47 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Application.cpp
View file

@ -1088,7 +1088,6 @@ void Application::keyPressEvent(QKeyEvent* event) {
bool isShifted = event->modifiers().testFlag(Qt::ShiftModifier);
bool isMeta = event->modifiers().testFlag(Qt::ControlModifier);
bool isOption = event->modifiers().testFlag(Qt::AltModifier);
bool isKeypad = event->modifiers().testFlag(Qt::KeypadModifier);
switch (event->key()) {
break;
case Qt::Key_Enter:

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

@ -257,7 +257,6 @@ void ApplicationOverlay::displayOverlayTexture() {
if (_alpha == 0.0f) {
return;
}
auto glCanvas = Application::getInstance()->getGLWidget();
glMatrixMode(GL_PROJECTION);
glPushMatrix(); {
glLoadIdentity();

1
libraries/entities/src/EntityItem.cpp
View file

@ -1080,7 +1080,6 @@ const float MIN_ALIGNMENT_DOT = 0.999999f;
const float MIN_VELOCITY_DELTA = 0.01f;
const float MIN_DAMPING_DELTA = 0.001f;
const float MIN_GRAVITY_DELTA = 0.001f;
const float MIN_ACCELERATION_DELTA = 0.001f;
const float MIN_SPIN_DELTA = 0.0003f;
void EntityItem::updatePositionInDomainUnits(const glm::vec3& value) {

6
libraries/gpu/src/gpu/GLBackendTexture.cpp
View file

@ -16,8 +16,8 @@ GLBackend::GLTexture::GLTexture() :
_storageStamp(0),
_contentStamp(0),
_texture(0),
_size(0),
_target(GL_TEXTURE_2D)
_target(GL_TEXTURE_2D),
_size(0)
{}
GLBackend::GLTexture::~GLTexture() {
@ -176,6 +176,8 @@ public:
texel.internalFormat = GL_DEPTH_COMPONENT24;
break;
}
case gpu::NUM_TYPES:
Q_UNREACHABLE();
}
break;
default:

2
libraries/physics/src/DynamicCharacterController.cpp
View file

@ -8,11 +8,9 @@
const btVector3 LOCAL_UP_AXIS(0.0f, 1.0f, 0.0f);
const float DEFAULT_GRAVITY = -5.0f;
const float TERMINAL_VELOCITY = 55.0f;
const float JUMP_SPEED = 3.5f;
const float MAX_FALL_HEIGHT = 20.0f;
const float MIN_HOVER_HEIGHT = 3.0f;
const uint32_t PENDING_FLAG_ADD_TO_SIMULATION = 1U << 0;
const uint32_t PENDING_FLAG_REMOVE_FROM_SIMULATION = 1U << 1;

4
libraries/render-utils/src/Model.cpp
View file

@ -111,7 +111,7 @@ void Model::RenderPipelineLib::addRenderPipeline(Model::RenderKey key,
slotBindings.insert(gpu::Shader::Binding(std::string("emissiveMap"), 3));
gpu::ShaderPointer program = gpu::ShaderPointer(gpu::Shader::createProgram(vertexShader, pixelShader));
bool makeResult = gpu::Shader::makeProgram(*program, slotBindings);
gpu::Shader::makeProgram(*program, slotBindings);
auto locations = std::shared_ptr<Locations>(new Locations());
@ -139,7 +139,7 @@ void Model::RenderPipelineLib::addRenderPipeline(Model::RenderKey key,
// Good to go add the brand new pipeline
auto pipeline = gpu::PipelinePointer(gpu::Pipeline::create(program, state));
auto it = insert(value_type(key.getRaw(), RenderPipeline(pipeline, locations)));
insert(value_type(key.getRaw(), RenderPipeline(pipeline, locations)));
// If not a shadow pass, create the mirror version from the same state, just change the FrontFace
if (!key.isShadow()) {

10
libraries/ui/src/HifiMenu.cpp
View file

@ -1,3 +1,13 @@
//
// HifiMenu.cpp
//
// Created by Bradley Austin Davis on 2015/04/21
// Copyright 2015 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#include "HifiMenu.h"
#include <QtQml>
#include <QMenuBar>

8
libraries/ui/src/HifiMenu.h
View file

@ -1,5 +1,5 @@
//
// MenuConstants.h
// HifiMenu.h
//
// Created by Bradley Austin Davis on 2015/04/21
// Copyright 2015 High Fidelity, Inc.
@ -9,8 +9,8 @@
//
#pragma once
#ifndef hifi_MenuContants_h
#define hifi_MenuConstants_h
#ifndef hifi_HifiMenu_h
#define hifi_HifiMenu_h
#include <QQuickItem>
#include <QHash>
@ -44,7 +44,7 @@ protected:
friend class MenuUserData;
};
#endif // hifi_MenuConstants_h
#endif // hifi_HifiMenu_h

1
libraries/ui/src/MessageDialog.cpp
View file

@ -1,5 +1,4 @@
//
//
// MessageDialog.cpp
//
// Created by Bradley Austin Davis on 2015/04/14

4
libraries/ui/src/MessageDialog.h
View file

@ -98,7 +98,3 @@ private:
};
#endif // hifi_MessageDialog_h

6
libraries/ui/src/OffscreenQmlDialog.cpp
View file

@ -24,9 +24,9 @@ QString OffscreenQmlDialog::title() const {
return _title;
}
void OffscreenQmlDialog::setTitle(const QString &arg) {
if (arg != _title) {
_title = arg;
void OffscreenQmlDialog::setTitle(const QString& title) {
if (title != _title) {
_title = title;
emit titleChanged();
}
}

2
libraries/ui/src/OffscreenQmlDialog.h
View file

@ -59,7 +59,7 @@ protected:
public:
QString title() const;
void setTitle(const QString &arg);
void setTitle(const QString& title);
signals:
void accepted();

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

@ -140,13 +140,6 @@ QQuickItem* OffscreenUi::getRootItem() {
return _rootItem;
}
//QQmlContext* OffscreenUi::qmlContext() {
// if (nullptr == _rootItem) {
// return _qmlComponent->creationContext();
// }
// return QQmlEngine::contextForObject(_rootItem);
//}
void OffscreenUi::setBaseUrl(const QUrl& baseUrl) {
_qmlEngine->setBaseUrl(baseUrl);
}
@ -448,7 +441,7 @@ void OffscreenUi::messageBox(const QString& title, const QString& text,
pDialog->setIcon((MessageDialog::Icon)icon);
pDialog->setTitle(title);
pDialog->setText(text);
pDialog->setStandardButtons(MessageDialog::StandardButtons((int)buttons));
pDialog->setStandardButtons(MessageDialog::StandardButtons(static_cast<int>(buttons)));
pDialog->setResultCallback(callback);
});
pDialog->setEnabled(true);
@ -457,25 +450,29 @@ void OffscreenUi::messageBox(const QString& title, const QString& text,
void OffscreenUi::information(const QString& title, const QString& text,
ButtonCallback callback,
QMessageBox::StandardButtons buttons) {
messageBox(title, text, callback, (QMessageBox::Icon)MessageDialog::Information, buttons);
messageBox(title, text, callback,
static_cast<QMessageBox::Icon>(MessageDialog::Information), buttons);
}
void OffscreenUi::question(const QString& title, const QString& text,
ButtonCallback callback,
QMessageBox::StandardButtons buttons) {
messageBox(title, text, callback, (QMessageBox::Icon)MessageDialog::Question, buttons);
messageBox(title, text, callback,
static_cast<QMessageBox::Icon>(MessageDialog::Question), buttons);
}
void OffscreenUi::warning(const QString& title, const QString& text,
ButtonCallback callback,
QMessageBox::StandardButtons buttons) {
messageBox(title, text, callback, (QMessageBox::Icon)MessageDialog::Warning, buttons);
messageBox(title, text, callback,
static_cast<QMessageBox::Icon>(MessageDialog::Warning), buttons);
}
void OffscreenUi::critical(const QString& title, const QString& text,
ButtonCallback callback,
QMessageBox::StandardButtons buttons) {
messageBox(title, text, callback, (QMessageBox::Icon)MessageDialog::Critical, buttons);
messageBox(title, text, callback,
static_cast<QMessageBox::Icon>(MessageDialog::Critical), buttons);
}