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

adding constants, removing entity creation in cpp

Browse source
This commit is contained in:
Wayne Chen 2019-03-19 09:44:08 -07:00
parent 44ed9e607b
commit ee1a14505a
2 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
interface/src/Application.cpp
View file

@ -1298,15 +1298,15 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
connect(this, &Application::activeDisplayPluginChanged, this, [&](){
#if !defined(Q_OS_ANDROID)
if (!getLoginDialogPoppedUp() && _desktopRootItemCreated) {
if (isHMDMode()) {
createAvatarInputsBar();
auto offscreenUi = getOffscreenUI();
offscreenUi->hide(AVATAR_INPUTS_BAR_QML.toString());
} else {
destroyAvatarInputsBar();
auto offscreenUi = getOffscreenUI();
offscreenUi->show(AVATAR_INPUTS_BAR_QML.toString(), "AvatarInputsBar");
}
/* if (isHMDMode()) {*/
//createAvatarInputsBar();
//auto offscreenUi = getOffscreenUI();
//offscreenUi->hide(AVATAR_INPUTS_BAR_QML.toString());
//} else {
//destroyAvatarInputsBar();
//auto offscreenUi = getOffscreenUI();
//offscreenUi->show(AVATAR_INPUTS_BAR_QML.toString(), "AvatarInputsBar");
/*}*/
}
#endif
});

16
scripts/system/createAvatarInputsBarEntity.js
View file

@ -11,10 +11,16 @@
function onClicked(){
onCreateAvatarInputsBarEntity = !onCreateAvatarInputsBarEntity;
button.editProperties({isActive: onCreateAvatarInputsBarEntity});
var micBarDimensions = {x: 0.036, y: 0.048, z: 0.3};
var bubbleIconDimensions = {x: 0.036, y: 0.036, z: 0.3};
var micBarLocalPosition = {x: (-(micBarDimensions.x / 2)) - 0.2, y: -0.125, z: -0.5};
var bubbleIconLocalPosition = {x: (micBarDimensions.x * 1.2 / 2) - 0.2, y: ((micBarDimensions.y - bubbleIconDimensions.y) / 2 - 0.125), z: -0.5};
// QML NATURAL DIMENSIONS
var MIC_BAR_DIMENSIONS = {x: 0.036, y: 0.048, z: 0.3};
var BUBBLE_ICON_DIMENSIONS = {x: 0.036, y: 0.036, z: 0.3};
// CONSTANTS
var LOCAL_POSITION_X_OFFSET = -0.2;
var LOCAL_POSITION_Y_OFFSET = -0.125;
var LOCAL_POSITION_Z_OFFSET = -0.5;
// POSITIONS
var micBarLocalPosition = {x: (-(micBarDimensions.x / 2)) + LOCAL_POSITION_X_OFFSET, y: LOCAL_POSITION_Y_OFFSET, z: LOCAL_POSITION_Z_OFFSET};
var bubbleIconLocalPosition = {x: (micBarDimensions.x * 1.2 / 2) + LOCAL_POSITION_X_OFFSET, y: ((micBarDimensions.y - bubbleIconDimensions.y) / 2 + LOCAL_POSITION_Y_OFFSET), z: LOCAL_POSITION_Z_OFFSET};
if (onCreateAvatarInputsBarEntity) {
var props = {
type: "Web",
@ -33,8 +39,6 @@
type: "Web",
parentID: MyAvatar.SELF_ID,
parentJointIndex: MyAvatar.getJointIndex("_CAMERA_MATRIX"),
// y is 0.01 - (0.048 + 0.036) / 2
// have 10% spacing separation between the entities
localPosition: bubbleIconLocalPosition,
localRotation: Quat.cancelOutRollAndPitch(Quat.lookAtSimple(Camera.orientation, bubbleIconLocalPosition)),
sourceUrl: Script.resourcesPath() + "qml/BubbleIcon.qml",