From 563be9ab9171dd03acbbf7303fa4493e883f0181 Mon Sep 17 00:00:00 2001
From: Triplelexx <void>
Date: Fri, 16 Mar 2018 20:13:02 +0000
Subject: [PATCH 1/2] tidy inspect.js

---
 script-archive/inspect.js | 411 +++++++++++++++++++-------------------
 1 file changed, 201 insertions(+), 210 deletions(-)

diff --git a/script-archive/inspect.js b/script-archive/inspect.js
index 555b4105b7..45fc281792 100644
--- a/script-archive/inspect.js
+++ b/script-archive/inspect.js
@@ -26,14 +26,14 @@ var RADIUS_RATE = 1.0 / 100.0;
 var PAN_RATE = 250.0;
 
 var Y_AXIS = {
-  x: 0,
-  y: 1,
-  z: 0
+    x: 0,
+    y: 1,
+    z: 0
 };
 var X_AXIS = {
-  x: 1,
-  y: 0,
-  z: 0
+    x: 1,
+    y: 0,
+    z: 0
 };
 
 var LOOK_AT_TIME = 500;
@@ -58,19 +58,19 @@ var mouseLastY = 0;
 
 
 var center = {
-  x: 0,
-  y: 0,
-  z: 0
+    x: 0,
+    y: 0,
+    z: 0
 };
 var position = {
-  x: 0,
-  y: 0,
-  z: 0
+    x: 0,
+    y: 0,
+    z: 0
 };
 var vector = {
-  x: 0,
-  y: 0,
-  z: 0
+    x: 0,
+    y: 0,
+    z: 0
 };
 var radius = 0.0;
 var azimuth = 0.0;
@@ -83,258 +83,249 @@ var rotatingTowardsTarget = false;
 var targetCamOrientation;
 var oldPosition, oldOrientation;
 
-
 function orientationOf(vector) {
-  var direction,
-    yaw,
-    pitch;
+    var direction,
+        yaw,
+        pitch;
 
-  direction = Vec3.normalize(vector);
-  yaw = Quat.angleAxis(Math.atan2(direction.x, direction.z) * RAD_TO_DEG, Y_AXIS);
-  pitch = Quat.angleAxis(Math.asin(-direction.y) * RAD_TO_DEG, X_AXIS);
-  return Quat.multiply(yaw, pitch);
+    direction = Vec3.normalize(vector);
+    yaw = Quat.angleAxis(Math.atan2(direction.x, direction.z) * RAD_TO_DEG, Y_AXIS);
+    pitch = Quat.angleAxis(Math.asin(-direction.y) * RAD_TO_DEG, X_AXIS);
+    return Quat.multiply(yaw, pitch);
 }
 
-
 function handleRadialMode(dx, dy) {
-  azimuth += dx / AZIMUTH_RATE;
-  radius += radius * dy * RADIUS_RATE;
-  if (radius < 1) {
-    radius = 1;
-  }
+    azimuth += dx / AZIMUTH_RATE;
+    radius += radius * dy * RADIUS_RATE;
+    if (radius < 1) {
+        radius = 1;
+    }
 
-  vector = {
-    x: (Math.cos(altitude) * Math.cos(azimuth)) * radius,
-    y: Math.sin(altitude) * radius,
-    z: (Math.cos(altitude) * Math.sin(azimuth)) * radius
-  };
-  position = Vec3.sum(center, vector);
-  Camera.setPosition(position);
-  Camera.setOrientation(orientationOf(vector));
+    vector = {
+        x: (Math.cos(altitude) * Math.cos(azimuth)) * radius,
+        y: Math.sin(altitude) * radius,
+        z: (Math.cos(altitude) * Math.sin(azimuth)) * radius
+    };
+    position = Vec3.sum(center, vector);
+    Camera.setPosition(position);
+    Camera.setOrientation(orientationOf(vector));
 }
 
 function handleOrbitMode(dx, dy) {
-  azimuth += dx / AZIMUTH_RATE;
-  altitude += dy / ALTITUDE_RATE;
-  if (altitude > PI / 2.0) {
-    altitude = PI / 2.0;
-  }
-  if (altitude < -PI / 2.0) {
-    altitude = -PI / 2.0;
-  }
+    azimuth += dx / AZIMUTH_RATE;
+    altitude += dy / ALTITUDE_RATE;
+    if (altitude > PI / 2.0) {
+        altitude = PI / 2.0;
+    }
+    if (altitude < -PI / 2.0) {
+        altitude = -PI / 2.0;
+    }
 
-  vector = {
-    x: (Math.cos(altitude) * Math.cos(azimuth)) * radius,
-    y: Math.sin(altitude) * radius,
-    z: (Math.cos(altitude) * Math.sin(azimuth)) * radius
-  };
-  position = Vec3.sum(center, vector);
-  Camera.setPosition(position);
-  Camera.setOrientation(orientationOf(vector));
+    vector = {
+        x: (Math.cos(altitude) * Math.cos(azimuth)) * radius,
+        y: Math.sin(altitude) * radius,
+        z: (Math.cos(altitude) * Math.sin(azimuth)) * radius
+    };
+    position = Vec3.sum(center, vector);
+    Camera.setPosition(position);
+    Camera.setOrientation(orientationOf(vector));
 }
 
-
 function handlePanMode(dx, dy) {
-  var up = Quat.getUp(Camera.getOrientation());
-  var right = Quat.getRight(Camera.getOrientation());
-  var distance = Vec3.length(vector);
+    var up = Quat.getUp(Camera.getOrientation());
+    var right = Quat.getRight(Camera.getOrientation());
+    var distance = Vec3.length(vector);
 
-  var dv = Vec3.sum(Vec3.multiply(up, distance * dy / PAN_RATE), Vec3.multiply(right, -distance * dx / PAN_RATE));
+    var dv = Vec3.sum(Vec3.multiply(up, distance * dy / PAN_RATE), Vec3.multiply(right, -distance * dx / PAN_RATE));
 
-  center = Vec3.sum(center, dv);
-  position = Vec3.sum(position, dv);
+    center = Vec3.sum(center, dv);
+    position = Vec3.sum(position, dv);
 
-  Camera.setPosition(position);
-  Camera.setOrientation(orientationOf(vector));
+    Camera.setPosition(position);
+    Camera.setOrientation(orientationOf(vector));
 }
 
 function saveCameraState() {
-  oldMode = Camera.mode;
-  oldPosition = Camera.getPosition();
-  oldOrientation = Camera.getOrientation();
+    oldMode = Camera.mode;
+    oldPosition = Camera.getPosition();
+    oldOrientation = Camera.getOrientation();
 
-  Camera.mode = "independent";
-  Camera.setPosition(oldPosition);
+    Camera.mode = "independent";
+    Camera.setPosition(oldPosition);
 }
 
 function restoreCameraState() {
-  Camera.mode = oldMode;
-  Camera.setPosition(oldPosition);
-  Camera.setOrientation(oldOrientation);
+    Camera.mode = oldMode;
+    Camera.setPosition(oldPosition);
+    Camera.setOrientation(oldOrientation);
 }
 
 function handleModes() {
-  var newMode = (mode == noMode) ? noMode : detachedMode;
-  if (alt) {
-    if (control) {
-      if (shift) {
-        newMode = panningMode;
-      } else {
-        newMode = orbitMode;
-      }
-    } else {
-      newMode = radialMode;
+    var newMode = (mode == noMode) ? noMode : detachedMode;
+    if (alt) {
+        if (control) {
+            if (shift) {
+                newMode = panningMode;
+            } else {
+                newMode = orbitMode;
+            }
+        } else {
+            newMode = radialMode;
+        }
     }
-  }
 
-  // if entering detachMode
-  if (newMode == detachedMode && mode != detachedMode) {
-    avatarPosition = MyAvatar.position;
-    avatarOrientation = MyAvatar.orientation;
-  }
-  // if leaving detachMode
-  if (mode == detachedMode && newMode == detachedMode &&
-    (avatarPosition.x != MyAvatar.position.x ||
-      avatarPosition.y != MyAvatar.position.y ||
-      avatarPosition.z != MyAvatar.position.z ||
-      avatarOrientation.x != MyAvatar.orientation.x ||
-      avatarOrientation.y != MyAvatar.orientation.y ||
-      avatarOrientation.z != MyAvatar.orientation.z ||
-      avatarOrientation.w != MyAvatar.orientation.w)) {
-    newMode = noMode;
-  }
+    // if entering detachMode
+    if (newMode == detachedMode && mode != detachedMode) {
+        avatarPosition = MyAvatar.position;
+        avatarOrientation = MyAvatar.orientation;
+    }
+    // if leaving detachMode
+    if (mode == detachedMode && newMode == detachedMode &&
+        (avatarPosition.x != MyAvatar.position.x ||
+            avatarPosition.y != MyAvatar.position.y ||
+            avatarPosition.z != MyAvatar.position.z ||
+            avatarOrientation.x != MyAvatar.orientation.x ||
+            avatarOrientation.y != MyAvatar.orientation.y ||
+            avatarOrientation.z != MyAvatar.orientation.z ||
+            avatarOrientation.w != MyAvatar.orientation.w)) {
+        newMode = noMode;
+    }
 
-  if (mode == noMode && newMode != noMode && Camera.mode == "independent") {
-    newMode = noMode;
-  }
+    if (mode == noMode && newMode != noMode && Camera.mode == "independent") {
+        newMode = noMode;
+    }
 
-  // if leaving noMode
-  if (mode == noMode && newMode != noMode) {
-    saveCameraState();
-  }
-  // if entering noMode
-  if (newMode == noMode && mode != noMode) {
-    restoreCameraState();
-  }
+    // if leaving noMode
+    if (mode == noMode && newMode != noMode) {
+        saveCameraState();
+    }
+    // if entering noMode
+    if (newMode == noMode && mode != noMode) {
+        restoreCameraState();
+    }
 
-  mode = newMode;
+    mode = newMode;
 }
 
 function keyPressEvent(event) {
-  var changed = false;
+    var changed = false;
 
-  if (event.text == "ALT") {
-    alt = true;
-    changed = true;
-  }
-  if (event.text == "CONTROL") {
-    control = true;
-    changed = true;
-  }
-  if (event.text == "SHIFT") {
-    shift = true;
-    changed = true;
-  }
+    if (event.text == "ALT") {
+        alt = true;
+        changed = true;
+    }
+    if (event.text == "CONTROL") {
+        control = true;
+        changed = true;
+    }
+    if (event.text == "SHIFT") {
+        shift = true;
+        changed = true;
+    }
 
-  if (changed) {
-    handleModes();
-  }
+    if (changed) {
+        handleModes();
+    }
 }
 
 function keyReleaseEvent(event) {
-  var changed = false;
+    var changed = false;
 
-  if (event.text == "ALT") {
-    alt = false;
-    changed = true;
-    mode = noMode;
-    restoreCameraState();
-  }
-  if (event.text == "CONTROL") {
-    control = false;
-    changed = true;
-  }
-  if (event.text == "SHIFT") {
-    shift = false;
-    changed = true;
-  }
-
-  if (changed) {
-    handleModes();
-  }
-}
-
-
-
-function mousePressEvent(event) {
-  if (alt && !isActive) {
-    mouseLastX = event.x;
-    mouseLastY = event.y;
-
-    // Compute trajectories related values
-    var pickRay = Camera.computePickRay(mouseLastX, mouseLastY);
-    var modelIntersection = Entities.findRayIntersection(pickRay, true);
-
-    position = Camera.getPosition();
-
-    var avatarTarget = MyAvatar.getTargetAvatarPosition();
-
-
-    var distance = -1;
-    var string;
-
-    if (modelIntersection.intersects && modelIntersection.accurate) {
-      distance = modelIntersection.distance;
-      center = modelIntersection.intersection;
-      string = "Inspecting model";
-      //We've selected our target, now orbit towards it automatically
-      rotatingTowardsTarget = true;
-      //calculate our target cam rotation
-      Script.setTimeout(function() {
-        rotatingTowardsTarget = false;
-      }, LOOK_AT_TIME);
-
-      vector = Vec3.subtract(position, center);
-      targetCamOrientation = orientationOf(vector);
-      radius = Vec3.length(vector);
-      azimuth = Math.atan2(vector.z, vector.x);
-      altitude = Math.asin(vector.y / Vec3.length(vector));
-
-      isActive = true;
+    if (event.text == "ALT") {
+        alt = false;
+        changed = true;
+        mode = noMode;
+        restoreCameraState();
+    }
+    if (event.text == "CONTROL") {
+        control = false;
+        changed = true;
+    }
+    if (event.text == "SHIFT") {
+        shift = false;
+        changed = true;
     }
 
-  }
+    if (changed) {
+        handleModes();
+    }
+}
+
+function mousePressEvent(event) {
+    if (alt && !isActive) {
+        mouseLastX = event.x;
+        mouseLastY = event.y;
+
+        // Compute trajectories related values
+        var pickRay = Camera.computePickRay(mouseLastX, mouseLastY);
+        var modelIntersection = Entities.findRayIntersection(pickRay, true);
+
+        position = Camera.getPosition();
+
+        var distance = -1;
+        var string = "";
+
+        if (modelIntersection.intersects && modelIntersection.accurate) {
+            distance = modelIntersection.distance;
+            center = modelIntersection.intersection;
+            string = "Inspecting model";
+            // We've selected our target, now orbit towards it automatically
+            rotatingTowardsTarget = true;
+            // calculate our target cam rotation
+            Script.setTimeout(function () {
+                rotatingTowardsTarget = false;
+            }, LOOK_AT_TIME);
+
+            vector = Vec3.subtract(position, center);
+            targetCamOrientation = orientationOf(vector);
+            radius = Vec3.length(vector);
+            azimuth = Math.atan2(vector.z, vector.x);
+            altitude = Math.asin(vector.y / Vec3.length(vector));
+
+            isActive = true;
+        }
+
+    }
 }
 
 function mouseReleaseEvent(event) {
-  if (isActive) {
-    isActive = false;
-  }
+    if (isActive) {
+        isActive = false;
+    }
 }
 
 function mouseMoveEvent(event) {
-  if (isActive && mode != noMode && !rotatingTowardsTarget) {
-    if (mode == radialMode) {
-      handleRadialMode(event.x - mouseLastX, event.y - mouseLastY);
+    if (isActive && mode != noMode && !rotatingTowardsTarget) {
+        if (mode == radialMode) {
+            handleRadialMode(event.x - mouseLastX, event.y - mouseLastY);
+        }
+        if (mode == orbitMode) {
+            handleOrbitMode(event.x - mouseLastX, event.y - mouseLastY);
+        }
+        if (mode == panningMode) {
+            handlePanMode(event.x - mouseLastX, event.y - mouseLastY);
+        }
     }
-    if (mode == orbitMode) {
-      handleOrbitMode(event.x - mouseLastX, event.y - mouseLastY);
-    }
-    if (mode == panningMode) {
-      handlePanMode(event.x - mouseLastX, event.y - mouseLastY);
-    }
-
-  }
-  mouseLastX = event.x;
-  mouseLastY = event.y;
+    mouseLastX = event.x;
+    mouseLastY = event.y;
 }
 
 function update() {
-  handleModes();
-  if (rotatingTowardsTarget) {
-    rotateTowardsTarget();
-  }
+    handleModes();
+    if (rotatingTowardsTarget) {
+        rotateTowardsTarget();
+    }
 }
 
 function rotateTowardsTarget() {
-  var newOrientation = Quat.mix(Camera.getOrientation(), targetCamOrientation, .1);
-  Camera.setOrientation(newOrientation);
+    var newOrientation = Quat.mix(Camera.getOrientation(), targetCamOrientation, 0.1);
+    Camera.setOrientation(newOrientation);
 }
 
 function scriptEnding() {
-  if (mode != noMode) {
-    restoreCameraState();
-  }
+    if (mode != noMode) {
+        restoreCameraState();
+    }
 }
 
 Controller.keyPressEvent.connect(keyPressEvent);
@@ -345,4 +336,4 @@ Controller.mouseReleaseEvent.connect(mouseReleaseEvent);
 Controller.mouseMoveEvent.connect(mouseMoveEvent);
 
 Script.update.connect(update);
-Script.scriptEnding.connect(scriptEnding);
\ No newline at end of file
+Script.scriptEnding.connect(scriptEnding);

From 7101a37bf983e890b772adee24c357c25b28c522 Mon Sep 17 00:00:00 2001
From: Triplelexx <void>
Date: Fri, 16 Mar 2018 20:27:05 +0000
Subject: [PATCH 2/2] add inspect avatars

---
 script-archive/inspect.js | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/script-archive/inspect.js b/script-archive/inspect.js
index 45fc281792..18b26ab709 100644
--- a/script-archive/inspect.js
+++ b/script-archive/inspect.js
@@ -56,7 +56,6 @@ var mode = noMode;
 var mouseLastX = 0;
 var mouseLastY = 0;
 
-
 var center = {
     x: 0,
     y: 0,
@@ -259,16 +258,16 @@ function mousePressEvent(event) {
         // Compute trajectories related values
         var pickRay = Camera.computePickRay(mouseLastX, mouseLastY);
         var modelIntersection = Entities.findRayIntersection(pickRay, true);
+        var avatarIntersection = AvatarList.findRayIntersection(pickRay);
 
         position = Camera.getPosition();
 
-        var distance = -1;
-        var string = "";
-
-        if (modelIntersection.intersects && modelIntersection.accurate) {
-            distance = modelIntersection.distance;
-            center = modelIntersection.intersection;
-            string = "Inspecting model";
+        if (avatarIntersection.intersects || (modelIntersection.intersects && modelIntersection.accurate)) {
+            if (avatarIntersection.intersects) {
+                center = avatarIntersection.intersection;
+            } else {
+                center = modelIntersection.intersection;
+            }
             // We've selected our target, now orbit towards it automatically
             rotatingTowardsTarget = true;
             // calculate our target cam rotation
@@ -284,7 +283,6 @@ function mousePressEvent(event) {
 
             isActive = true;
         }
-
     }
 }