Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-15 13:15:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

refer to ungrabbable wearables as 'frozen' rather than locked, because locked is such an overloaded term

Browse source
This commit is contained in:
Seth Alves 2019-03-25 17:06:24 -07:00
parent e6c279ee5b
commit d25d290394
2 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/resources/qml/hifi/AvatarApp.qml
View file

@ -50,7 +50,7 @@ Rectangle {
property var jointNames: [] property var jointNames: []
property var currentAvatarSettings; property var currentAvatarSettings;
property bool wearablesLocked; property bool wearablesFrozen;
function fetchAvatarModelName(marketId, avatar) { function fetchAvatarModelName(marketId, avatar) {
var xmlhttp = new XMLHttpRequest(); var xmlhttp = new XMLHttpRequest();
@ -190,8 +190,8 @@ Rectangle {
updateCurrentAvatarInBookmarks(currentAvatar); updateCurrentAvatarInBookmarks(currentAvatar);
} else if (message.method === 'selectAvatarEntity') { } else if (message.method === 'selectAvatarEntity') {
adjustWearables.selectWearableByID(message.entityID); adjustWearables.selectWearableByID(message.entityID);
} else if (message.method === 'wearablesLockedChanged') { } else if (message.method === 'wearablesFrozenChanged') {
wearablesLocked = message.wearablesLocked; wearablesFrozen = message.wearablesFrozen;
} }
} }
@ -526,10 +526,10 @@ Rectangle {
anchors.right: adjustLabel.left anchors.right: adjustLabel.left
anchors.verticalCenter: wearablesLabel.verticalCenter anchors.verticalCenter: wearablesLabel.verticalCenter
anchors.rightMargin: 15 anchors.rightMargin: 15
glyphText: wearablesLocked ? hifi.glyphs.lock : hifi.glyphs.unlock; glyphText: wearablesFrozen ? hifi.glyphs.lock : hifi.glyphs.unlock;
onClicked: { onClicked: {
emitSendToScript({'method' : 'toggleWearablesLock'}); emitSendToScript({'method' : 'toggleWearablesFrozen'});
} }
} }
} }

40
scripts/system/avatarapp.js
View file

@ -77,7 +77,7 @@ function updateAvatarWearables(avatar, callback, wearablesOverride) {
avatar[ENTRY_AVATAR_ENTITIES] = wearables; avatar[ENTRY_AVATAR_ENTITIES] = wearables;
sendToQml({'method' : 'wearablesUpdated', 'wearables' : wearables}); sendToQml({'method' : 'wearablesUpdated', 'wearables' : wearables});
sendToQml({ 'method' : 'wearablesLockedChanged', 'wearablesLocked' : getWearablesLocked()}); sendToQml({ 'method' : 'wearablesFrozenChanged', 'wearablesFrozen' : getWearablesFrozen()});
if(callback) if(callback)
callback(); callback();
@ -179,26 +179,26 @@ var MARKETPLACE_PURCHASES_QML_PATH = "hifi/commerce/wallet/Wallet.qml";
var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace"; var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace";
var MARKETPLACES_INJECT_SCRIPT_URL = Script.resolvePath("html/js/marketplacesInject.js"); var MARKETPLACES_INJECT_SCRIPT_URL = Script.resolvePath("html/js/marketplacesInject.js");
function getWearablesLocked() { function getWearablesFrozen() {
var wearablesLocked = true; var wearablesFrozen = true;
var wearablesArray = getMyAvatarWearables(); var wearablesArray = getMyAvatarWearables();
wearablesArray.forEach(function(wearable) { wearablesArray.forEach(function(wearable) {
if (isGrabbable(wearable.id)) { if (isGrabbable(wearable.id)) {
wearablesLocked = false; wearablesFrozen = false;
} }
}); });
return wearablesLocked; return wearablesFrozen;
} }
function lockWearables() { function freezeWearables() {
var wearablesArray = getMyAvatarWearables(); var wearablesArray = getMyAvatarWearables();
wearablesArray.forEach(function(wearable) { wearablesArray.forEach(function(wearable) {
setGrabbable(wearable.id, false); setGrabbable(wearable.id, false);
}); });
} }
function unlockWearables() { function unfreezeWearables() {
var wearablesArray = getMyAvatarWearables(); var wearablesArray = getMyAvatarWearables();
wearablesArray.forEach(function(wearable) { wearablesArray.forEach(function(wearable) {
setGrabbable(wearable.id, true); setGrabbable(wearable.id, true);
@ -237,7 +237,7 @@ function fromQml(message) { // messages are {method, params}, like json-rpc. See
AvatarBookmarks.loadBookmark(message.name); AvatarBookmarks.loadBookmark(message.name);
Entities.addingWearable.connect(onAddingWearable); Entities.addingWearable.connect(onAddingWearable);
Entities.deletingWearable.connect(onDeletingWearable); Entities.deletingWearable.connect(onDeletingWearable);
sendToQml({ 'method' : 'wearablesLockedChanged', 'wearablesLocked' : getWearablesLocked()}); sendToQml({ 'method' : 'wearablesFrozenChanged', 'wearablesFrozen' : getWearablesFrozen()});
break; break;
case 'deleteAvatar': case 'deleteAvatar':
AvatarBookmarks.removeBookmark(message.name); AvatarBookmarks.removeBookmark(message.name);
@ -262,7 +262,7 @@ function fromQml(message) { // messages are {method, params}, like json-rpc. See
case 'adjustWearablesOpened': case 'adjustWearablesOpened':
currentAvatarWearablesBackup = getMyAvatarWearables(); currentAvatarWearablesBackup = getMyAvatarWearables();
adjustWearables.setOpened(true); adjustWearables.setOpened(true);
unlockWearables(); unfreezeWearables();
Entities.mousePressOnEntity.connect(onSelectedEntity); Entities.mousePressOnEntity.connect(onSelectedEntity);
Messages.subscribe('Hifi-Object-Manipulation'); Messages.subscribe('Hifi-Object-Manipulation');
@ -377,15 +377,15 @@ function fromQml(message) { // messages are {method, params}, like json-rpc. See
currentAvatarSettings = getMyAvatarSettings(); currentAvatarSettings = getMyAvatarSettings();
break; break;
case 'toggleWearablesLock': case 'toggleWearablesFrozen':
var wearablesLocked = getWearablesLocked(); var wearablesFrozen = getWearablesFrozen();
wearablesLocked = !wearablesLocked; wearablesFrozen = !wearablesFrozen;
if (wearablesLocked) { if (wearablesFrozen) {
lockWearables(); freezeWearables();
} else { } else {
unlockWearables(); unfreezeWearables();
} }
sendToQml({'method' : 'wearablesLockedChanged', 'wearablesLocked' : wearablesLocked}); sendToQml({'method' : 'wearablesFrozenChanged', 'wearablesFrozen' : wearablesFrozen});
break; break;
default: default:
print('Unrecognized message from AvatarApp.qml'); print('Unrecognized message from AvatarApp.qml');
@ -410,7 +410,7 @@ function setGrabbable(entityID, grabbable) {
if (properties.avatarEntity && properties.grab.grabbable != grabbable) { if (properties.avatarEntity && properties.grab.grabbable != grabbable) {
var editProps = { grab: { grabbable: grabbable }}; var editProps = { grab: { grabbable: grabbable }};
Entities.editEntity(entityID, editProps); Entities.editEntity(entityID, editProps);
sendToQml({ 'method' : 'wearablesLockedChanged', 'wearablesLocked' : getWearablesLocked()}); sendToQml({ 'method' : 'wearablesFrozenChanged', 'wearablesFrozen' : getWearablesFrozen()});
} }
} }
@ -444,14 +444,14 @@ function onAddingWearable(entityID) {
updateAvatarWearables(currentAvatar, function() { updateAvatarWearables(currentAvatar, function() {
sendToQml({'method' : 'updateAvatarInBookmarks'}); sendToQml({'method' : 'updateAvatarInBookmarks'});
}); });
sendToQml({ 'method' : 'wearablesLockedChanged', 'wearablesLocked' : getWearablesLocked()}); sendToQml({ 'method' : 'wearablesFrozenChanged', 'wearablesFrozen' : getWearablesFrozen()});
} }
function onDeletingWearable(entityID) { function onDeletingWearable(entityID) {
updateAvatarWearables(currentAvatar, function() { updateAvatarWearables(currentAvatar, function() {
sendToQml({'method' : 'updateAvatarInBookmarks'}); sendToQml({'method' : 'updateAvatarInBookmarks'});
}); });
sendToQml({ 'method' : 'wearablesLockedChanged', 'wearablesLocked' : getWearablesLocked()}); sendToQml({ 'method' : 'wearablesFrozenChanged', 'wearablesFrozen' : getWearablesFrozen()});
} }
function handleWearableMessages(channel, message, sender) { function handleWearableMessages(channel, message, sender) {
@ -635,7 +635,7 @@ function onTabletScreenChanged(type, url) {
if(onAvatarAppScreenNow) { if(onAvatarAppScreenNow) {
sendToQml({ 'method' : 'initialize', 'data' : { jointNames : MyAvatar.getJointNames() }}); sendToQml({ 'method' : 'initialize', 'data' : { jointNames : MyAvatar.getJointNames() }});
sendToQml({ 'method' : 'wearablesLockedChanged', 'wearablesLocked' : getWearablesLocked()}); sendToQml({ 'method' : 'wearablesFrozenChanged', 'wearablesFrozen' : getWearablesFrozen()});
} }
} }