Skip to content

Commit d36a234

Browse files
committed
Build with 3d tooltip fix
1 parent 4a47ebf commit d36a234

File tree

2 files changed

+22
-9
lines changed

2 files changed

+22
-9
lines changed

build/jsroot.js

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const version_id = 'dev',
1414

1515
/** @summary version date
1616
* @desc Release date in format day/month/year like '14/04/2022' */
17-
version_date = '9/10/2025',
17+
version_date = '10/10/2025',
1818

1919
/** @summary version id and date
2020
* @desc Produced by concatenation of {@link version_id} and {@link version_date}
@@ -75285,6 +75285,10 @@ function disposeThreejsObject(obj, only_childs) {
7528575285
delete obj.tooltip;
7528675286
delete obj.stack; // used in geom painter
7528775287
delete obj.drawn_highlight; // special highlight object
75288+
// used in lego tooltips
75289+
delete obj.face_to_bins_index;
75290+
delete obj.tip_painter;
75291+
delete obj.handle;
7528875292
}
7528975293

7529075294

@@ -99759,9 +99763,12 @@ function testAxisVisibility(camera, toplevel, fb = false, bb = false) {
9975999763

9976099764
const pos = camera.position;
9976199765
let qudrant = 1;
99762-
if ((pos.x < 0) && (pos.y >= 0)) qudrant = 2;
99763-
if ((pos.x >= 0) && (pos.y >= 0)) qudrant = 3;
99764-
if ((pos.x >= 0) && (pos.y < 0)) qudrant = 4;
99766+
if ((pos.x < 0) && (pos.y >= 0))
99767+
qudrant = 2;
99768+
else if ((pos.x >= 0) && (pos.y >= 0))
99769+
qudrant = 3;
99770+
else if ((pos.x >= 0) && (pos.y < 0))
99771+
qudrant = 4;
9976599772

9976699773
const testVisible = (id, range) => {
9976799774
if (id <= qudrant)
@@ -101303,8 +101310,14 @@ function _meshLegoToolTip(intersect) {
101303101310
if ((intersect.faceIndex < 0) || (intersect.faceIndex >= this.face_to_bins_index.length))
101304101311
return null;
101305101312

101306-
const p = this.painter,
101307-
handle = this.handle,
101313+
const p = this.tip_painter;
101314+
101315+
if (!p) {
101316+
console.error('painter for tip handling is not there');
101317+
return null;
101318+
}
101319+
101320+
const handle = this.handle,
101308101321
fp = p.getFramePainter(),
101309101322
histo = p.getHisto(),
101310101323
tip = p.get3DToolTip(this.face_to_bins_index[intersect.faceIndex]),
@@ -101548,7 +101561,7 @@ function drawBinsLego(painter, is_v7 = false) {
101548101561
mesh = new THREE.Mesh(geometry, material);
101549101562

101550101563
mesh.face_to_bins_index = face_to_bins_index;
101551-
mesh.painter = painter;
101564+
mesh.tip_painter = painter;
101552101565
mesh.zmin = axis_zmin;
101553101566
mesh.zmax = axis_zmax;
101554101567
mesh.baseline = (painter.options.BaseLine !== false) ? painter.options.BaseLine : (painter.options.Zero ? axis_zmin : 0);
@@ -101564,7 +101577,7 @@ function drawBinsLego(painter, is_v7 = false) {
101564101577
material2 = new THREE.MeshBasicMaterial({ color: color2, vertexColors: false }),
101565101578
mesh2 = new THREE.Mesh(geom2, material2);
101566101579
mesh2.face_to_bins_index = face_to_bins_indx2;
101567-
mesh2.painter = painter;
101580+
mesh2.tip_painter = painter;
101568101581
mesh2.handle = mesh.handle;
101569101582
mesh2.tooltip = _meshLegoToolTip;
101570101583
mesh2.zmin = mesh.zmin;

modules/core.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const version_id = 'dev',
66

77
/** @summary version date
88
* @desc Release date in format day/month/year like '14/04/2022' */
9-
version_date = '9/10/2025',
9+
version_date = '10/10/2025',
1010

1111
/** @summary version id and date
1212
* @desc Produced by concatenation of {@link version_id} and {@link version_date}

0 commit comments

Comments
 (0)