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

Merge branch 'master' into login_dialog_rework

Browse source
This commit is contained in:
vladest 2017-10-04 19:37:38 +02:00
commit 073fa81d5b
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/main.cpp
View file

@ -48,9 +48,11 @@ int main(int argc, const char* argv[]) {
static QString BUG_SPLAT_APPLICATION_NAME = "Interface";
CrashReporter crashReporter { BUG_SPLAT_DATABASE, BUG_SPLAT_APPLICATION_NAME, BuildInfo::VERSION };
#endif
#ifdef Q_OS_UNIX
#ifdef Q_OS_LINUX
QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar);
#endif
disableQtBearerPoll(); // Fixes wifi ping spikes
QElapsedTimer startupTime;

16
libraries/entities/src/ModelEntityItem.cpp
View file

@ -217,7 +217,7 @@ void ModelEntityItem::debugDump() const {
void ModelEntityItem::setShapeType(ShapeType type) {
withWriteLock([&] {
if (type != _shapeType) {
if (type == SHAPE_TYPE_STATIC_MESH && _dynamic) {
if (type == SHAPE_TYPE_STATIC_MESH && _dynamic) {
// dynamic and STATIC_MESH are incompatible
// since the shape is being set here we clear the dynamic bit
_dynamic = false;
@ -260,9 +260,9 @@ void ModelEntityItem::setModelURL(const QString& url) {
void ModelEntityItem::setCompoundShapeURL(const QString& url) {
withWriteLock([&] {
if (_compoundShapeURL != url) {
if (_compoundShapeURL.get() != url) {
ShapeType oldType = computeTrueShapeType();
_compoundShapeURL = url;
_compoundShapeURL.set(url);
if (oldType != computeTrueShapeType()) {
_dirtyFlags |= Simulation::DIRTY_SHAPE | Simulation::DIRTY_MASS;
}
@ -496,10 +496,8 @@ bool ModelEntityItem::hasModel() const {
return !_modelURL.isEmpty();
});
}
bool ModelEntityItem::hasCompoundShapeURL() const {
return resultWithReadLock<bool>([&] {
return !_compoundShapeURL.isEmpty();
});
bool ModelEntityItem::hasCompoundShapeURL() const {
return _compoundShapeURL.get().isEmpty();
}
QString ModelEntityItem::getModelURL() const {
@ -509,9 +507,7 @@ QString ModelEntityItem::getModelURL() const {
}
QString ModelEntityItem::getCompoundShapeURL() const {
return resultWithReadLock<QString>([&] {
return _compoundShapeURL;
});
return _compoundShapeURL.get();
}
void ModelEntityItem::setColor(const rgbColor& value) {

4
libraries/entities/src/ModelEntityItem.h
View file

@ -14,6 +14,7 @@
#include "EntityItem.h"
#include <JointData.h>
#include <ThreadSafeValueCache.h>
#include "AnimationPropertyGroup.h"
class ModelEntityItem : public EntityItem {
@ -153,7 +154,8 @@ protected:
rgbColor _color;
QString _modelURL;
QString _compoundShapeURL;
ThreadSafeValueCache<QString> _compoundShapeURL;
AnimationPropertyGroup _animationProperties;

2
scripts/system/controllers/controllerModules/hudOverlayPointer.js
View file

@ -178,7 +178,7 @@
}
var hudRayPick = controllerData.hudRayPicks[this.hand];
var point2d = this.calculateNewReticlePosition(hudRayPick.intersection);
if (!Window.isPointOnDesktopWindow(point2d) && !controllerData.triggerClicks[this.hand]) {
if (!Window.isPointOnDesktopWindow(point2d) && !this.triggerClicked) {
this.exitModule();
return false;
}