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

Merge pull request #12182 from highfidelity/stable

Browse source 
Merge stable (RC62) to master
This commit is contained in:
Clément Brisset 2018-01-16 11:01:07 -08:00 committed by GitHub
commit 1949471dad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
interface/resources/meshes/tablet-with-home-button.fbx
View file

Binary file not shown.

4
interface/resources/qml/hifi/NameCard.qml
View file

@ -50,7 +50,7 @@ Item {
id: avatarImage id: avatarImage
visible: profileUrl !== "" && userName !== ""; visible: profileUrl !== "" && userName !== "";
// Size // Size
height: isMyCard ? 70 : 42; height: isMyCard ? 84 : 42;
width: visible ? height : 0; width: visible ? height : 0;
anchors.top: parent.top; anchors.top: parent.top;
anchors.topMargin: isMyCard ? 0 : 8; anchors.topMargin: isMyCard ? 0 : 8;
@ -520,7 +520,7 @@ Item {
Slider { Slider {
id: gainSlider id: gainSlider
// Size // Size
width: thisNameCard.width; width: isMyCard ? thisNameCard.width - 20 : thisNameCard.width;
height: 14 height: 14
// Anchors // Anchors
anchors.verticalCenter: nameCardVUMeter.verticalCenter; anchors.verticalCenter: nameCardVUMeter.verticalCenter;

2
interface/resources/qml/hifi/Pal.qml
View file

@ -28,7 +28,7 @@ Rectangle {
// Properties // Properties
property bool debug: false; property bool debug: false;
property int myCardWidth: width - upperRightInfoContainer.width; property int myCardWidth: width - upperRightInfoContainer.width;
property int myCardHeight: 80; property int myCardHeight: 100;
property int rowHeight: 60; property int rowHeight: 60;
property int actionButtonWidth: 55; property int actionButtonWidth: 55;
property int locationColumnWidth: 170; property int locationColumnWidth: 170;

12
interface/src/Application.cpp
View file

@ -7398,11 +7398,13 @@ void Application::updateThreadPoolCount() const {
} }
void Application::updateSystemTabletMode() { void Application::updateSystemTabletMode() {
qApp->setProperty(hifi::properties::HMD, isHMDMode()); if (_settingsLoaded) {
if (isHMDMode()) { qApp->setProperty(hifi::properties::HMD, isHMDMode());
DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getHmdTabletBecomesToolbarSetting()); if (isHMDMode()) {
} else { DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getHmdTabletBecomesToolbarSetting());
DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getDesktopTabletBecomesToolbarSetting()); } else {
DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getDesktopTabletBecomesToolbarSetting());
}
} }
} }

8
scripts/system/controllers/controllerDispatcher.js
View file

@ -148,8 +148,8 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
this.setIgnorePointerItems = function() { this.setIgnorePointerItems = function() {
if (HMD.tabletID !== this.tabletID) { if (HMD.tabletID !== this.tabletID) {
this.tabletID = HMD.tabletID; this.tabletID = HMD.tabletID;
Pointers.setIgnoreItems(_this.leftPointer, _this.blacklist.concat([HMD.tabletID])); Pointers.setIgnoreItems(_this.leftPointer, _this.blacklist);
Pointers.setIgnoreItems(_this.rightPointer, _this.blacklist.concat([HMD.tabletID])); Pointers.setIgnoreItems(_this.rightPointer, _this.blacklist);
} }
}; };
@ -378,8 +378,8 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
}; };
this.setBlacklist = function() { this.setBlacklist = function() {
RayPick.setIgnoreItems(_this.leftControllerRayPick, this.blacklist.concat([HMD.tabletID])); RayPick.setIgnoreItems(_this.leftControllerRayPick, this.blacklist);
RayPick.setIgnoreItems(_this.rightControllerRayPick, this.blacklist.concat([HMD.tabletID])); RayPick.setIgnoreItems(_this.rightControllerRayPick, this.blacklist);
}; };
var MAPPING_NAME = "com.highfidelity.controllerDispatcher"; var MAPPING_NAME = "com.highfidelity.controllerDispatcher";

2
scripts/system/libraries/utils.js
View file

@ -400,7 +400,7 @@ resizeTablet = function (width, newParentJointIndex, sensorToWorldScaleOverride)
}); });
// update webOverlay // update webOverlay
var RAYPICK_OFFSET = 0.0001; // Sufficient for raypick to reliably intersect tablet screen before tablet model. var RAYPICK_OFFSET = 0.0007; // Sufficient for raypick to reliably intersect tablet screen before tablet model.
var WEB_ENTITY_Z_OFFSET = (tabletDepth / 2.0) * sensorScaleOffsetOverride + RAYPICK_OFFSET; var WEB_ENTITY_Z_OFFSET = (tabletDepth / 2.0) * sensorScaleOffsetOverride + RAYPICK_OFFSET;
var WEB_ENTITY_Y_OFFSET = 0.004 * sensorScaleFactor * sensorScaleOffsetOverride; var WEB_ENTITY_Y_OFFSET = 0.004 * sensorScaleFactor * sensorScaleOffsetOverride;
var screenWidth = 0.82 * tabletWidth; var screenWidth = 0.82 * tabletWidth;