Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-17 04:46:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1316 from AleziaKurdis/CreateApp-ZeroRotationButton

Browse source 
Create app - "Reset Rotation" button
This commit is contained in:
Kalila 2021-08-24 02:11:47 -04:00 committed by GitHub
commit c36afe76e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 50 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scripts/system/create/edit.js
View file

@ -2656,6 +2656,24 @@ var PropertiesTool = function (opts) {
} else { } else {
audioFeedback.rejection(); audioFeedback.rejection();
} }
} else if (data.action === "setRotationToZero") {
if (selectionManager.selections.length === 1 && SelectionManager.hasUnlockedSelection()) {
selectionManager.saveProperties();
var parentState = getParentState(selectionManager.selections[0]);
if ((parentState === "PARENT_CHILDREN" || parentState === "CHILDREN") && selectionDisplay.getSpaceMode() === "local" ) {
Entities.editEntity(selectionManager.selections[0], {
localRotation: Quat.IDENTITY
});
} else {
Entities.editEntity(selectionManager.selections[0], {
rotation: Quat.IDENTITY
});
}
pushCommandForSelections();
selectionManager._update(false, this);
} else {
audioFeedback.rejection();
}
} }
} else if (data.type === "propertiesPageReady") { } else if (data.type === "propertiesPageReady") {
updateSelections(true); updateSelections(true);

16
scripts/system/create/entityProperties/html/js/entityProperties.js
View file

@ -1383,7 +1383,8 @@ const GROUPS = [
{ {
type: "buttons", type: "buttons",
buttons: [ { id: "copyRotation", label: "Copy Rotation", className: "secondary", onClick: copyRotationProperty }, buttons: [ { id: "copyRotation", label: "Copy Rotation", className: "secondary", onClick: copyRotationProperty },
{ id: "pasteRotation", label: "Paste Rotation", className: "secondary", onClick: pasteRotationProperty } ], { id: "pasteRotation", label: "Paste Rotation", className: "secondary", onClick: pasteRotationProperty },
{ id: "setRotationToZero", label: "Reset Rotation", className: "secondary_red red", onClick: setRotationToZeroProperty }],
propertyID: "copyPasteRotation" propertyID: "copyPasteRotation"
}, },
{ {
@ -1875,9 +1876,15 @@ function setCopyPastePositionAndRotationAvailability (selectionLength, islocked)
if (selectionLength > 0 && !islocked) { if (selectionLength > 0 && !islocked) {
$('#property-copyPastePosition-button-pastePosition').attr('disabled', false); $('#property-copyPastePosition-button-pastePosition').attr('disabled', false);
$('#property-copyPasteRotation-button-pasteRotation').attr('disabled', false); $('#property-copyPasteRotation-button-pasteRotation').attr('disabled', false);
if (selectionLength === 1) {
$('#property-copyPasteRotation-button-setRotationToZero').attr('disabled', false);
} else {
$('#property-copyPasteRotation-button-setRotationToZero').attr('disabled', true);
}
} else { } else {
$('#property-copyPastePosition-button-pastePosition').attr('disabled', true); $('#property-copyPastePosition-button-pastePosition').attr('disabled', true);
$('#property-copyPasteRotation-button-pasteRotation').attr('disabled', true); $('#property-copyPasteRotation-button-pasteRotation').attr('disabled', true);
$('#property-copyPasteRotation-button-setRotationToZero').attr('disabled', true);
} }
} }
@ -3273,7 +3280,12 @@ function pasteRotationProperty() {
action: "pasteRotation" action: "pasteRotation"
})); }));
} }
function setRotationToZeroProperty() {
EventBridge.emitWebEvent(JSON.stringify({
type: "action",
action: "setRotationToZero"
}));
}
/** /**
* USER DATA FUNCTIONS * USER DATA FUNCTIONS
*/ */

17
scripts/system/html/css/edit-style.css
View file

@ -479,7 +479,22 @@ input[type=button].secondary, button.hifi-edit-button.secondary {
background: linear-gradient(#343434 20%, #000 100%); background: linear-gradient(#343434 20%, #000 100%);
cursor: pointer; cursor: pointer;
} }
input[type=button].secondary_red, button.hifi-edit-button.secondary_red {
font-family: Raleway-Bold;
font-size: 10px;
text-transform: uppercase;
vertical-align: top;
height: 18px;
min-width: 60px;
padding: 0 14px;
margin-right: 6px;
border-radius: 4px;
border: none;
color: #fff;
background-color: #94132e;
background: linear-gradient(#d42043 20%, #94132e 100%);
cursor: pointer;
}
input[type=button]:enabled:hover, button.hifi-edit-button:enabled:hover { input[type=button]:enabled:hover, button.hifi-edit-button:enabled:hover {
background: linear-gradient(#000, #000); background: linear-gradient(#000, #000);
border: none; border: none;