From f31e014e8b3137b0a1fd01bad1a5173b78e4d766 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Wed, 18 Oct 2017 20:34:55 +1300
Subject: [PATCH] Quat.ZERO --> Quat.IDENTITY

---
 libraries/script-engine/src/Quat.h                        | 4 ++--
 scripts/system/libraries/entityCameraTool.js              | 2 +-
 scripts/system/libraries/entitySelectionTool.js           | 8 ++++----
 scripts/system/libraries/overlayUtils.js                  | 4 ++--
 .../marketplace/shapes/utilities/utilities.js             | 1 +
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/libraries/script-engine/src/Quat.h b/libraries/script-engine/src/Quat.h
index 796b2a4811..d3fb2ed5c2 100644
--- a/libraries/script-engine/src/Quat.h
+++ b/libraries/script-engine/src/Quat.h
@@ -33,7 +33,7 @@
 /// Scriptable interface a Quaternion helper class object. Used exclusively in the JavaScript API
 class Quat : public QObject, protected QScriptable {
     Q_OBJECT
-    Q_PROPERTY(glm::quat ZERO READ ZERO CONSTANT)
+    Q_PROPERTY(glm::quat IDENTITY READ IDENTITY CONSTANT)
 
 public slots:
     glm::quat multiply(const glm::quat& q1, const glm::quat& q2);
@@ -66,7 +66,7 @@ public slots:
     glm::quat cancelOutRoll(const glm::quat& q);
 
 private:
-    const glm::quat& ZERO() { return Quaternions::IDENTITY; }
+    const glm::quat& IDENTITY() const { return Quaternions::IDENTITY; }
 
 };
 
diff --git a/scripts/system/libraries/entityCameraTool.js b/scripts/system/libraries/entityCameraTool.js
index 61280013ba..0e52353dfb 100644
--- a/scripts/system/libraries/entityCameraTool.js
+++ b/scripts/system/libraries/entityCameraTool.js
@@ -123,7 +123,7 @@ CameraManager = function() {
 
     easing = false;
     easingTime = 0;
-    startOrientation = Quat.ZERO;
+    startOrientation = Quat.IDENTITY;
 
     that.previousCameraMode = null;
 
diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 0e6a9d5310..88d1e627c3 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -71,12 +71,12 @@ SelectionManager = (function() {
     that.selections = [];
     var listeners = [];
 
-    that.localRotation = Quat.ZERO;
+    that.localRotation = Quat.IDENTITY;
     that.localPosition = Vec3.ZERO;
     that.localDimensions = Vec3.ZERO;
     that.localRegistrationPoint = Vec3.HALF;
 
-    that.worldRotation = Quat.ZERO;
+    that.worldRotation = Quat.IDENTITY;
     that.worldPosition = Vec3.ZERO;
     that.worldDimensions = Vec3.ZERO;
     that.worldRegistrationPoint = Vec3.HALF;
@@ -1508,7 +1508,7 @@ SelectionDisplay = (function() {
             position = SelectionManager.localPosition;
             registrationPoint = SelectionManager.localRegistrationPoint;
         } else {
-            rotation = Quat.ZERO;
+            rotation = Quat.IDENTITY;
             dimensions = SelectionManager.worldDimensions;
             position = SelectionManager.worldPosition;
             registrationPoint = SelectionManager.worldRegistrationPoint;
@@ -2564,7 +2564,7 @@ SelectionDisplay = (function() {
         var onBegin = function(event, pickRay, pickResult) {
             var properties = Entities.getEntityProperties(SelectionManager.selections[0]);
             initialProperties = properties;
-            rotation = (spaceMode === SPACE_LOCAL) ? properties.rotation : Quat.ZERO;
+            rotation = (spaceMode === SPACE_LOCAL) ? properties.rotation : Quat.IDENTITY;
 
             if (spaceMode === SPACE_LOCAL) {
                 rotation = SelectionManager.localRotation;
diff --git a/scripts/system/libraries/overlayUtils.js b/scripts/system/libraries/overlayUtils.js
index 3ba5c2bad2..366cdbcc97 100644
--- a/scripts/system/libraries/overlayUtils.js
+++ b/scripts/system/libraries/overlayUtils.js
@@ -18,7 +18,7 @@ OverlayGroup = function(opts) {
     var overlays = {};
 
     var rootPosition = opts.position || { x: 0, y: 0, z: 0 };
-    var rootRotation = opts.rotation || Quat.ZERO;
+    var rootRotation = opts.rotation || Quat.IDENTITY;
     var visible = opts.visible == true;
 
     function updateOverlays() {
@@ -36,7 +36,7 @@ OverlayGroup = function(opts) {
 
     that.createOverlay = function(type, properties) {
         properties.position = properties.position || { x: 0, y: 0, z: 0 };
-        properties.rotation = properties.rotation || Quat.ZERO;
+        properties.rotation = properties.rotation || Quat.IDENTITY;
 
         var overlay = Overlays.addOverlay(type, properties);
 
diff --git a/unpublishedScripts/marketplace/shapes/utilities/utilities.js b/unpublishedScripts/marketplace/shapes/utilities/utilities.js
index 71986455d4..b67ba0d9d2 100644
--- a/unpublishedScripts/marketplace/shapes/utilities/utilities.js
+++ b/unpublishedScripts/marketplace/shapes/utilities/utilities.js
@@ -27,6 +27,7 @@ if (typeof Vec3.abs !== "function") {
 }
 
 if (typeof Quat.ZERO !== "object") {
+    // TODO: Change to Quat.IDENTITY.
     Quat.ZERO = Quat.fromVec3Radians(Vec3.ZERO);
 }