Merge branch 'develop' into pathfinding

This partially reverts commit db7dd1c1c9.

CHANGELOG.md

@@ -1,19 +1,3 @@
-## 1.12.2
-### Bugfixes
-- Fixed a bug where the pathfinder on gridless scenes sometimes wasn't able to find a way around corners with specific angles
-- Pathfinding will now be disabled when the hotkey to move tokens without animation is being pressed, to allow GMs to move their tokens through walls
-
-
-## 1.12.1
-### Hotfix
-- Version 1.12.0 was incorrectly packaged, which caused it to fail to load
-
-
-## 1.12.0
-### New features
-- Pathfinding is now supported on gridless scenes
-
-
 ## 1.11.5
 ### Bugfixes
 - Fixed a bug that was causing Drag Ruler to spam useless warnings into the console (this was a regression introduced in 1.11.4)

build_release.py

@@ -11,7 +11,7 @@ wasm_pack = Path("~/.cargo/bin/wasm-pack").expanduser()
 root_files = ["module.json", "README.md", "CHANGELOG.md", "LICENSE"]
 wasm_files = ["gridless_pathfinding_bg.wasm", "gridless_pathfinding.js"]
 output_dir = Path("artifact")
-copy_everything_directories = ["js", "lang", "templates"]
+copy_everything_directories = ["js", "lang", "templates", "wasm/snippets"]
 wasm_dir = Path("wasm")
 root_dir = Path(".")
 rust_dir = Path("rust")

js/keybindings.js

@@ -113,16 +113,6 @@ function handleDisableSnap(event) {
 
 function handleMoveWithoutAnimation(event) {
 	moveWithoutAnimation = !event.up;
-
-	const ruler = canvas.controls.ruler;
-	if (!ruler?.isDragRuler)
-		return false;
-	if (ruler._state !== Ruler.STATES.MEASURING)
-		return false;
-
-	ruler.measure(getMeasurePosition(), {snap: !disableSnap});
-	ruler.dragRulerSendState();
-	return false;
 }
 
 function handleTogglePathfinding(event) {

js/pathfinding.js

@@ -1,5 +1,5 @@
 import {getGridPositionFromPixelsObj, getPixelsFromGridPositionObj} from "./foundry_fixes.js";
-import {moveWithoutAnimation, togglePathfinding} from "./keybindings.js";
+import {togglePathfinding} from "./keybindings.js";
 import {debugGraphics} from "./main.js";
 import {settingsKey} from "./settings.js";
 import {getSnapPointForTokenObj, iterPairs} from "./util.js";
@@ -15,8 +15,6 @@ export function isPathfindingEnabled() {
 		return false;
 	if (!game.user.isGM && !game.settings.get(settingsKey, "allowPathfinding"))
 		return false;
-	if (moveWithoutAnimation)
-		return false;
 	return game.settings.get(settingsKey, "autoPathfinding") != togglePathfinding;
 }
 

js/settings.js

@@ -10,10 +10,6 @@ export const RightClickAction = Object.freeze({
 	ABORT_DRAG:2,
 });
 
-function delayedReload() {
-	window.setTimeout(() => location.reload(), 500);
-}
-
 export function registerSettings() {
 	game.settings.register(settingsKey, "dataVersion", {
 		scope: "world",
@@ -94,7 +90,7 @@ export function registerSettings() {
 		config: true,
 		type: Boolean,
 		default: false,
-		onChange: delayedReload,
+		onChange: () => location.reload(),
 	});
 
 	game.settings.register(settingsKey, "autoPathfinding", {

module.json

@@ -2,7 +2,7 @@
 	"name": "drag-ruler",
 	"title": "Drag Ruler",
 	"description": "When dragging a token displays a ruler showing how far you've moved that token.",
-	"version": "1.12.2",
+	"version": "1.11.5",
 	"minimumCoreVersion" : "9.245",
 	"compatibleCoreVersion" : "9",
 	"authors": [
@@ -65,7 +65,7 @@
 	],
 	"socket": true,
 	"url": "https://github.com/manuelVo/foundryvtt-drag-ruler",
-	"download": "https://github.com/manuelVo/foundryvtt-drag-ruler/releases/download/v1.12.2/drag-ruler-1.12.2.zip",
+	"download": "https://github.com/manuelVo/foundryvtt-drag-ruler/archive/v1.11.5.zip",
 	"manifest": "https://raw.githubusercontent.com/manuelVo/foundryvtt-drag-ruler/master/module.json",
 	"readme": "https://github.com/manuelVo/foundryvtt-drag-ruler/blob/master/README.md",
 	"changelog": "https://github.com/manuelVo/foundryvtt-drag-ruler/blob/master/CHANGELOG.md",

rust/Cargo.lock

@@ -26,7 +26,7 @@ dependencies = [
 
 [[package]]
 name = "gridless-pathfinding"
-version = "1.12.2"
+version = "0.1.0"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",

rust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gridless-pathfinding"
-version = "1.12.2"
+version = "0.1.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

rust/src/pathfinder.rs

@@ -188,13 +188,18 @@ impl Pathfinder {
 				if angle_diff <= PI {
 					continue;
 				}
-				let angle_between = angle_diff / 2.0 + angle1;
-				nodes.push(calc_pathfinding_node(
-					point,
-					angle_between,
-					distance_from_walls,
-					&mut line_segments,
-				));
+				{
+					let angle_between = angle_diff / 2.0 + angle1;
+					let pathfinding_node = calc_pathfinding_node(
+						point,
+						angle_between,
+						distance_from_walls,
+						&mut line_segments,
+					);
+					if angle_diff > 1.5 * PI {
+						nodes.push(pathfinding_node);
+					}
+				}
 				nodes.push(calc_pathfinding_node(
 					point,
 					angle1 + 0.5 * PI,
@@ -214,13 +219,15 @@ impl Pathfinder {
 			if angle_diff <= PI {
 				continue;
 			}
-			let angle_between = angle_diff / 2.0 + angle1;
-			nodes.push(calc_pathfinding_node(
-				point,
-				angle_between,
-				distance_from_walls,
-				&mut line_segments,
-			));
+			if angle_diff > 1.5 * PI {
+				let angle_between = angle_diff / 2.0 + angle1;
+				nodes.push(calc_pathfinding_node(
+					point,
+					angle_between,
+					distance_from_walls,
+					&mut line_segments,
+				));
+			}
 			nodes.push(calc_pathfinding_node(
 				point,
 				angle1 + 0.5 * PI,