Nouvelles TMRs

module/tmr/pixi-tmr.js

@@ -1,6 +1,8 @@
+import { RdDTMRDialog } from "../rdd-tmr-dialog.js";
 import { tmrConstants, tmrTokenZIndex } from "../tmr-constants.js";
+import { TMRUtility } from "../tmr-utility.js";
 
-const tooltipStyle = new PIXI.TextStyle({
+export const tooltipStyle = new PIXI.TextStyle({
   fontFamily: 'CaslonAntique',
   fontSize: 18,
   fill: '#FFFFFF',
@@ -20,7 +22,7 @@ export class PixiTMR {
     this.callbacksOnAnimate = [];
   }
 
-  async load( onLoad = (loader, resources) => {} )  {
+  async load(onLoad = (loader, resources) => { }) {
     // WIP - Deprecated since v7 : let loader = new PIXI.Loader();
     for (const [name, img] of Object.entries(PixiTMR.textures)) {
       const texture = await PIXI.Assets.load(img);
@@ -40,40 +42,17 @@ export class PixiTMR {
     PixiTMR.textures[name] = img;
   }
 
-  animate(animation = pixiApp=>{})
-  {
+  animate(animation = pixiApp => { }) {
     this.callbacksOnAnimate.push(() => animation(this.pixiApp));
   }
 
-  carteTmr(code) {
-    let img = PixiTMR.getImgFromCode(code)
-    const carteTmr = new PIXI.Sprite(PIXI.utils.TextureCache[img]);
-    console.log(code, carteTmr)
-    // Setup the position of the TMR
-    carteTmr.x = 0;
-    carteTmr.y = 0;
-    carteTmr.width = 720;
-    carteTmr.height = 860;
-    // Rotate around the center
-    carteTmr.anchor.set(0);
-    carteTmr.eventMode = 'dynamic'; // PIXI 7 : Not sure ..
-    // This one is deprecated ; carteTmr.interactive = true;
-    carteTmr.buttonMode = true;
-    carteTmr.tmrObject = this;
-    if (!this.tmrObject.viewOnly) {
-      carteTmr.on('pointerdown', event => this.onClickBackground(event));
-    }
-    this.pixiApp.stage.addChild(carteTmr);
-    return carteTmr;
-  }
-
   sprite(code, options = {}) {
     let img = PixiTMR.getImgFromCode(code)
     const texture = PIXI.utils.TextureCache[img];
     if (!texture) {
       console.error("Texture manquante", code, PIXI.utils.TextureCache)
       return;
-    }  
+    }
     let sprite = new PIXI.Sprite(texture);
     sprite.width = options.taille ?? tmrConstants.half;
     sprite.height = options.taille ?? tmrConstants.half;
@@ -81,13 +60,13 @@ export class PixiTMR {
     if (options.color) {
       sprite.tint = options.color;
     }
-    sprite.zIndex = options.zIndex ?? tmrTokenZIndex.casehumide+1;
+    sprite.zIndex = options.zIndex ?? tmrTokenZIndex.casehumide + 1;
     sprite.alpha = options.alpha ?? 0.75;
     sprite.decallage = options.decallage ?? tmrConstants.center;
     this.pixiApp.stage.addChild(sprite);
     return sprite;
-  }  
-  
+  }
+
   circle(name, options = {}) {
     let sprite = new PIXI.Graphics();
     sprite.beginFill(options.color, options.opacity);
@@ -98,27 +77,37 @@ export class PixiTMR {
     return sprite;
   }
 
-  addTooltip(sprite, text) {
-    if (text) {
-      sprite.tooltip = new PIXI.Text(text, tooltipStyle);
-      sprite.tooltip.zIndex = tmrTokenZIndex.tooltip;
-      sprite.isOver = false;
-      // Deprecated : sprite.interactive = true; 
-      sprite.eventMode = 'dynamic'; // PIXI 7 To be checked
-      sprite.on('pointerdown', event => this.onClickBackground(event))
-        .on('pointerover', () => this.onShowTooltip(sprite))
-        .on('pointerout', () => this.onHideTooltip(sprite));
-    }
+  addTooltip(sprite, computeTooltip) {
+    sprite.tooltip = new PIXI.Text('', tooltipStyle);
+    sprite.tooltip.zIndex = tmrTokenZIndex.tooltip;
+    sprite.isOver = false;
+    sprite.eventMode = 'dynamic'; // PIXI 7 To be checked
+    sprite
+      .on('pointermove', event => this.onPointerMove(event, sprite, computeTooltip))
+      .on('pointerdown', event => this.onClickBackground(event))
+      .on('pointerover', event => this.onShowTooltip(event, sprite))
+      .on('pointerout', event => this.onHideTooltip(event, sprite));
   }
-  
 
   onClickBackground(event) {
-    this.tmrObject.onClickTMR(event)
+    if (!this.viewOnly) {
+      this.tmrObject.onClickTMR(event)
+    }
   }
 
-  onShowTooltip(sprite) {
-    if (sprite.tooltip) {
+  onPointerMove(event, sprite, computeTooltip) {
+    if (sprite.isOver && sprite.tooltip) {
+      var { x, y } = TMRUtility.computeEventPosition(event);
+      const oddq = TMRUtility.computeOddq(x, y);
 
+      sprite.tooltip.x = x + (oddq.col > 8 ? - 3 * tmrConstants.full : tmrConstants.half)
+      sprite.tooltip.y = y + (oddq.row > 10 ? - tmrConstants.half : tmrConstants.half)
+      sprite.tooltip.text = computeTooltip(event, sprite);
+    }
+  }
+
+  onShowTooltip(event, sprite) {
+    if (sprite.tooltip) {
       if (!sprite.isOver) {
         sprite.tooltip.x = sprite.x;
         sprite.tooltip.y = sprite.y;
@@ -128,7 +117,7 @@ export class PixiTMR {
     }
   }
 
-  onHideTooltip(sprite) {
+  onHideTooltip(event, sprite) {
     if (sprite.tooltip) {
       if (sprite.isOver) {
         this.pixiApp.stage.removeChild(sprite.tooltip);
@@ -137,7 +126,7 @@ export class PixiTMR {
     }
   }
 
-  setPosition( sprite, oddq) {
+  setPosition(sprite, oddq) {
     let decallagePairImpair = (oddq.col % 2 == 0) ? tmrConstants.col1_y : tmrConstants.col2_y;
     let dx = (sprite.decallage == undefined) ? 0 : sprite.decallage.x;
     let dy = (sprite.decallage == undefined) ? 0 : sprite.decallage.y;