From 2728654d352ba22f7133e810afe16af96a97d916 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 12 Feb 2019 10:09:28 -0800 Subject: [PATCH 1/2] Fix duplicating non-dynamic grabbed entities in edit.js --- scripts/system/libraries/entitySelectionTool.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js index 01e5f6e22b..3e16315c6d 100644 --- a/scripts/system/libraries/entitySelectionTool.js +++ b/scripts/system/libraries/entitySelectionTool.js @@ -284,6 +284,8 @@ SelectionManager = (function() { properties.parentJointIndex = null; properties.localPosition = properties.position; properties.localRotation = properties.rotation; + properties.velocity = { x: 0, y: 0, z: 0 }; + properties.angularVelocity = { x: 0, y: 0, z: 0 }; } delete properties.actionData; var newEntityID = Entities.addEntity(properties); From e800a6e0306515993b4c5573dcf5bee00b4266fd Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Thu, 14 Feb 2019 11:59:04 -0800 Subject: [PATCH 2/2] Update hard-coded vec3 zero with Vec3.ZERO --- scripts/system/libraries/entitySelectionTool.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js index 3e16315c6d..13c14f2010 100644 --- a/scripts/system/libraries/entitySelectionTool.js +++ b/scripts/system/libraries/entitySelectionTool.js @@ -284,9 +284,11 @@ SelectionManager = (function() { properties.parentJointIndex = null; properties.localPosition = properties.position; properties.localRotation = properties.rotation; - properties.velocity = { x: 0, y: 0, z: 0 }; - properties.angularVelocity = { x: 0, y: 0, z: 0 }; } + + properties.localVelocity = Vec3.ZERO; + properties.localAngularVelocity = Vec3.ZERO; + delete properties.actionData; var newEntityID = Entities.addEntity(properties);