Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add combat marker to primary canvas group so it can be sorted #17

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add combat marker to primary canvas group so it can be sorted #17

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47e07c1
Add markers to primary canvas group and set the sort layer just below…
Sep 1, 2024
dcc8964
Set elevation of marker
Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions monks-combat-marker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,18 @@ export let patchFunc = (prop, func, type = "WRAPPER") => {
}
}



class CombatMarker extends PIXI.Sprite {
constructor(texture) {
super(texture);
}

get sortLayer() {
return PrimaryCanvasGroup.SORT_LAYERS.TOKENS - 1;
}
}

export class MonksCombatMarker {
static _setting = {};
static markerCache = {};
Expand Down Expand Up @@ -190,7 +202,7 @@ export class MonksCombatMarker {
if (token.combatMarker != undefined) {
token.combatMarker.destroy();
}
const markericon = new PIXI.Sprite(tex);
const markericon = new CombatMarker(tex);
if (highlightFile.endsWith('webm') && tex?.baseTexture?.resource?.source) {
tex.baseTexture.resource.source.autoplay = true;
tex.baseTexture.resource.source.loop = true;
Expand All @@ -209,9 +221,10 @@ export class MonksCombatMarker {
markericon.alpha = 0.8;
markericon.pulse = { value: null, dir: 1 };
token.combatMarker = markericon;
canvas.regions.combatmarkers.addChild(token.combatMarker);
canvas.primary.addChild(token.combatMarker);
token.combatMarker.visible = visible && token.isVisible && !MonksCombatMarker.isDefeated(token);
token.combatMarker._visible = visible;
token.combatMarker.elevation = token.document.elevation;
}

if (MonksCombatMarker.markerCache[highlightFile] && !MonksCombatMarker.markerCache[highlightFile]?.baseTexture?.destroyed)
Expand All @@ -229,6 +242,7 @@ export class MonksCombatMarker {
const size = Math.max(token.w, token.h) * scale;
token.combatMarker.width = token.combatMarker.height = size;
token.combatMarker.alpha = 0.8;
token.combatMarker.elevation = token.document.elevation;
}

if (visible)
Expand Down Expand Up @@ -425,6 +439,11 @@ Hooks.on("updateToken", function (document, data, options, userid) {
token.preventMarker = true;
MonksCombatMarker.removeTurnMarker(token);
}
if (token.combatMarker) {
if (data.elevation !== undefined) {
token.combatMarker.elevation = data.elevation;
}
}
});

Hooks.on("refreshToken", function (token) {
Expand Down Expand Up @@ -561,8 +580,4 @@ Hooks.on("destroyToken", (token) => {
token.combatMarker.destroy();
delete token.combatMarker;
}
});

Hooks.on("drawRegionLayer", function (layer) {
layer.combatmarkers = layer.addChildAt(new PIXI.Container(), layer.children.length - 1);
});