Merge branch 'release/0.6.1'

Changelog.md

@@ -1,3 +1,6 @@
+# 0.6.1
+Fix ruler calculation so the combined elevation distance and 2d distance is shown. (Closes issue #11.)
+
 # 0.6.0
 Drag Ruler compatibility! Some under-the-hood changes extending Ray to a Ray3d class to make segment distance measurements easier to accomplish.
 

module.json

@@ -9,7 +9,7 @@
   "manifestPlusVersion": "1.0.0",
   "compatibility": {
     "minimum": "10",
-    "verified": "10.288"
+    "verified": "10.290"
   },
   "authors": [
     {

scripts/Ray3d.js

@@ -22,7 +22,7 @@ export function registerRayMethods() {
  * @returns {number}
  */
 function gameDistance(gridSpaces) {
-  return canvas.grid.measureDistances([this], { gridSpaces });
+  return canvas.grid.grid.measureDistances([{ ray: this }], { gridSpaces });
 }
 
 /**

scripts/segments.js

@@ -45,7 +45,6 @@ export function _getMeasurementSegmentsDragRulerRuler(wrapped) {
 
 function elevateSegments(ruler, segments) {  // Add destination as the final waypoint
   const waypoints = ruler.waypoints.concat([ruler.destination]);
-
   const { distance, size } = canvas.dimensions;
   const gridUnits = size / distance;
 
@@ -89,8 +88,21 @@ function elevationAtWaypoint(waypoint) {
  * hypotenuse to do the measurement.
  */
 export function measureDistancesGridLayer(wrapped, segments, options = {}) {
-  if ( segments[0] instanceof Ray ) return segments.map(s => s.gameDistance(options.gridSpaces));
-  return wrapped(segments, options);
+  if ( !segments.length || !(segments[0]?.ray instanceof Ray3d) ) return wrapped(segments, options);
+
+  // Avoid modifying the segment rays.
+  const ln = segments.length;
+  const origRays = Array(ln);
+  for ( let i = 0; i < ln; i += 1 ) {
+    const s = segments[i];
+    origRays[i] = s.ray;
+    s.ray = s.ray.projectOntoCanvas();
+  }
+
+  const out = wrapped(segments, options);
+
+  for ( let i = 0; i < ln; i += 1 ) segments[i].ray = origRays[i];
+  return out;
 }
 
 /**