Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 04:03:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of https://github.com/highfidelity/hifi into safe-avatar-list-access

Browse source
This commit is contained in:
Howard Stearns 2015-10-23 16:52:42 -07:00
commit c2a4aab7c3
14 changed files with 24 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
examples/entityScripts/breakdanceCore.js → examples/breakdanceCore.js
View file

2
examples/entityScripts/breakdanceToy.js → examples/breakdanceToy.js
View file

@ -11,7 +11,7 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
Script.include("../libraries/utils.js");
Script.include("libraries/utils.js");
Script.include("breakdanceCore.js");
breakdanceStart();
Script.update.connect(breakdanceUpdate);

2
examples/entityScripts/breakdanceEntity.js
View file

@ -12,7 +12,7 @@
//
(function() {
Script.include("../toys/breakdanceCore.js");
Script.include("../breakdanceCore.js");
Script.include("../libraries/utils.js");
var _this;

0
examples/entityScripts/grenade.js → examples/grenade.js
View file

8
examples/entityScripts/magBalls.js → examples/magBalls.js
View file

@ -7,10 +7,10 @@
//
// FIXME Script paths have to be relative to the caller, in this case libraries/OmniTool.js
Script.include("../entityScripts/magBalls/constants.js");
Script.include("../entityScripts/magBalls/graph.js");
Script.include("../entityScripts/magBalls/edgeSpring.js");
Script.include("../entityScripts/magBalls/magBalls.js");
Script.include("../magBalls/constants.js");
Script.include("../magBalls/graph.js");
Script.include("../magBalls/edgeSpring.js");
Script.include("../magBalls/magBalls.js");
Script.include("avatarRelativeOverlays.js");
OmniToolModuleType = "MagBallsController"

0
examples/entityScripts/magBalls/constants.js → examples/magBalls/constants.js
View file

0
examples/entityScripts/magBalls/debugUtils.js → examples/magBalls/debugUtils.js
View file

0
examples/entityScripts/magBalls/edgeSpring.js → examples/magBalls/edgeSpring.js
View file

0
examples/entityScripts/magBalls/graph.js → examples/magBalls/graph.js
View file

0
examples/entityScripts/magBalls/magBalls.js → examples/magBalls/magBalls.js
View file

1
libraries/octree/src/OctreeHeadlessViewer.h
View file

@ -46,6 +46,7 @@ public slots:
// setters for camera attributes
void setPosition(const glm::vec3& position) { _viewFrustum.setPosition(position); }
void setOrientation(const glm::quat& orientation) { _viewFrustum.setOrientation(orientation); }
void setKeyholeRadius(float keyholdRadius) { _viewFrustum.setKeyholeRadius(keyholdRadius); }
// setters for LOD and PPS
void setVoxelSizeScale(float sizeScale) { _voxelSizeScale = sizeScale; }

6
libraries/render-utils/src/GlWindow.cpp
View file

@ -43,11 +43,9 @@ bool GlWindow::makeCurrent() {
qDebug() << "GL Renderer: " << QString((const char*) glGetString(GL_RENDERER));
});
#ifndef QT_NO_DEBUG
QOpenGLContext * currentContext =
#endif
QOpenGLContext::currentContext();
QOpenGLContext * currentContext = QOpenGLContext::currentContext();
Q_ASSERT(_context == currentContext);
return makeCurrentResult;
}

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

@ -147,7 +147,7 @@ void MeshPartPayload::bindMaterial(gpu::Batch& batch, const ModelRender::Locatio
batch.setResourceTexture(ModelRender::DIFFUSE_MAP_SLOT, textureCache->getGrayTexture());
}
} else {
batch.setResourceTexture(ModelRender::DIFFUSE_MAP_SLOT, textureCache->getGrayTexture());
batch.setResourceTexture(ModelRender::DIFFUSE_MAP_SLOT, textureCache->getWhiteTexture());
}
// Normal map

40
libraries/ui/src/VrMenu.cpp
View file

@ -108,13 +108,10 @@ void VrMenu::addMenu(QMenu* menu) {
Q_ASSERT(false);
}
QVariant returnedValue;
#ifndef QT_NO_DEBUG
bool invokeResult =
#endif
QMetaObject::invokeMethod(this, "addMenu", Qt::DirectConnection,
Q_RETURN_ARG(QVariant, returnedValue),
Q_ARG(QVariant, QVariant::fromValue(qmlParent)),
Q_ARG(QVariant, QVariant::fromValue(menu->title())));
bool invokeResult = QMetaObject::invokeMethod(this, "addMenu", Qt::DirectConnection,
Q_RETURN_ARG(QVariant, returnedValue),
Q_ARG(QVariant, QVariant::fromValue(qmlParent)),
Q_ARG(QVariant, QVariant::fromValue(menu->title())));
Q_ASSERT(invokeResult);
QObject* result = returnedValue.value<QObject*>();
Q_ASSERT(result);
@ -150,13 +147,11 @@ void VrMenu::addAction(QMenu* menu, QAction* action) {
QObject* menuQml = findMenuObject(userData->uuid.toString());
Q_ASSERT(menuQml);
QVariant returnedValue;
#ifndef QT_NO_DEBUG
bool invokeResult =
#endif
QMetaObject::invokeMethod(this, "addItem", Qt::DirectConnection,
Q_RETURN_ARG(QVariant, returnedValue),
Q_ARG(QVariant, QVariant::fromValue(menuQml)),
Q_ARG(QVariant, QVariant::fromValue(action->text())));
bool invokeResult = QMetaObject::invokeMethod(this, "addItem", Qt::DirectConnection,
Q_RETURN_ARG(QVariant, returnedValue),
Q_ARG(QVariant, QVariant::fromValue(menuQml)),
Q_ARG(QVariant, QVariant::fromValue(action->text())));
Q_ASSERT(invokeResult);
QObject* result = returnedValue.value<QObject*>();
Q_ASSERT(result);
@ -173,14 +168,11 @@ void VrMenu::insertAction(QAction* before, QAction* action) {
}
QObject* menu = beforeQml->parent();
QVariant returnedValue;
#ifndef QT_NO_DEBUG
bool invokeResult =
#endif
QMetaObject::invokeMethod(this, "insertItem", Qt::DirectConnection,
Q_RETURN_ARG(QVariant, returnedValue),
Q_ARG(QVariant, QVariant::fromValue(menu)),
Q_ARG(QVariant, QVariant::fromValue(beforeQml)),
Q_ARG(QVariant, QVariant::fromValue(action->text())));
bool invokeResult = QMetaObject::invokeMethod(this, "insertItem", Qt::DirectConnection,
Q_RETURN_ARG(QVariant, returnedValue),
Q_ARG(QVariant, QVariant::fromValue(menu)),
Q_ARG(QVariant, QVariant::fromValue(beforeQml)),
Q_ARG(QVariant, QVariant::fromValue(action->text())));
Q_ASSERT(invokeResult);
QObject* result = returnedValue.value<QObject*>();
Q_ASSERT(result);
@ -199,9 +191,5 @@ void VrMenu::removeAction(QAction* action) {
bool invokeResult = QMetaObject::invokeMethod(this, "removeItem", Qt::DirectConnection,
Q_ARG(QVariant, QVariant::fromValue(menu)),
Q_ARG(QVariant, QVariant::fromValue(item)));
#ifndef QT_NO_DEBUG
Q_ASSERT(invokeResult);
#else
Q_UNUSED(invokeResult);
#endif
}