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

Merge pull request #13781 from thoys/fix/localAngularVelocityZeroesOut

Browse source 
MS17380: Create App fix for angularVelocity zeroing out on duplication or undo
This commit is contained in:
John Conklin II 2018-08-14 11:37:33 -07:00 committed by GitHub
commit 8c5344ad1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
scripts/system/libraries/entitySelectionTool.js
View file

@ -28,6 +28,17 @@ Script.include([
SelectionManager = (function() {
var that = {};
/**
* @description Removes known to be broken properties from a properties object
* @param properties
* @return properties
*/
var fixRemoveBrokenProperties = function (properties) {
// Reason: Entity property is always set to 0,0,0 which causes it to override angularVelocity (see MS17131)
delete properties.localAngularVelocity;
return properties;
}
// FUNCTION: SUBSCRIBE TO UPDATE MESSAGES
function subscribeToUpdateMessages() {
Messages.subscribe("entityToolUpdates");
@ -118,7 +129,7 @@ SelectionManager = (function() {
that.savedProperties = {};
for (var i = 0; i < that.selections.length; i++) {
var entityID = that.selections[i];
that.savedProperties[entityID] = Entities.getEntityProperties(entityID);
that.savedProperties[entityID] = fixRemoveBrokenProperties(Entities.getEntityProperties(entityID));
}
};
@ -246,7 +257,7 @@ SelectionManager = (function() {
var originalEntityID = entitiesToDuplicate[i];
var properties = that.savedProperties[originalEntityID];
if (properties === undefined) {
properties = Entities.getEntityProperties(originalEntityID);
properties = fixRemoveBrokenProperties(Entities.getEntityProperties(originalEntityID));
}
if (!properties.locked && (!properties.clientOnly || properties.owningAvatarID === MyAvatar.sessionUUID)) {
if (nonDynamicEntityIsBeingGrabbedByAvatar(properties)) {