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

Merge pull request #9391 from sethalves/tablet-ui

Browse source 
Tablet ui
This commit is contained in:
Seth Alves 2017-01-16 06:49:15 -08:00 committed by GitHub
commit e434defc7f
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -647,6 +647,12 @@ bool RenderableModelEntityItem::isReadyToComputeShape() {
// the model is still being downloaded. // the model is still being downloaded.
return false; return false;
} else if (type >= SHAPE_TYPE_SIMPLE_HULL && type <= SHAPE_TYPE_STATIC_MESH) { } else if (type >= SHAPE_TYPE_SIMPLE_HULL && type <= SHAPE_TYPE_STATIC_MESH) {
if (!_model) {
EntityTreePointer tree = getTree();
if (tree) {
QMetaObject::invokeMethod(tree.get(), "callLoader", Qt::QueuedConnection, Q_ARG(EntityItemID, getID()));
}
}
return (_model && _model->isLoaded()); return (_model && _model->isLoaded());
} }
return true; return true;

1
scripts/system/libraries/WebTablet.js
View file

@ -101,6 +101,7 @@ WebTablet = function (url, width, dpi, hand, clientOnly) {
name: "homeButton", name: "homeButton",
type: "Model", type: "Model",
modelURL: HOME_BUTTON_URL, modelURL: HOME_BUTTON_URL,
dimensions: { x: 0.04, y: 0.04, z: 0.02 },
collisionless: true, collisionless: true,
localPosition: {x: 0, y: HOME_BUTTON_Y_OFFSET, z: -0.01}, localPosition: {x: 0, y: HOME_BUTTON_Y_OFFSET, z: -0.01},
parentID: this.tabletEntityID, parentID: this.tabletEntityID,