Skip to content

Commit fd5274b

Browse files
committed
Correctly set mode3d for frame with TGeo
1 parent 20d171d commit fd5274b

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

scripts/JSRoot.geom.js

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3289,6 +3289,7 @@ JSROOT.define(['d3', 'three', 'geobase', 'painter', 'base3d'], (d3, THREE, geo,
32893289
let fp = this.getFramePainter(),
32903290
render3d = jsrp.getRender3DKind();
32913291
jsrp.assign3DHandler(fp);
3292+
fp.mode3d = true;
32923293

32933294
let size = fp.getSizeFor3d(undefined, render3d);
32943295

@@ -4098,7 +4099,16 @@ JSROOT.define(['d3', 'three', 'geobase', 'painter', 'base3d'], (d3, THREE, geo,
40984099

40994100
this.clearTopPainter(); // remove as pointer
41004101

4101-
let can3d = this._on_pad ? 0 : this.clear3dCanvas(); // remove 3d canvas from main HTML element
4102+
let can3d = 0;
4103+
if (this._on_pad) {
4104+
let fp = this.getFramePainter();
4105+
if (fp && fp.mode3d) {
4106+
fp.clear3dCanvas();
4107+
fp.mode3d = false;
4108+
}
4109+
} else {
4110+
can3d = this.clear3dCanvas(); // remove 3d canvas from main HTML element
4111+
}
41024112

41034113
if (this._toolbar) this._toolbar.cleanup(); // remove toolbar
41044114

0 commit comments

Comments
 (0)