Skip to content

Commit 235bc63

Browse files
committed
Do not use timeout when render 3D during interactive changes
1 parent 09bfe66 commit 235bc63

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

scripts/JSRoot3DPainter.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
if (mouseDowned) {
121121
if (INTERSECTED) {
122122
INTERSECTED.material.emissive.setHex(INTERSECTED.currentHex);
123-
painter.Render3D();
123+
painter.Render3D(0);
124124
}
125125
INTERSECTED = null;
126126
if (JSROOT.gStyle.Tooltip)
@@ -143,15 +143,15 @@
143143
INTERSECTED = pick.object;
144144
INTERSECTED.currentHex = INTERSECTED.material.emissive.getHex();
145145
INTERSECTED.material.emissive.setHex(0x5f5f5f);
146-
painter.Render3D();
146+
painter.Render3D(0);
147147
if (JSROOT.gStyle.Tooltip)
148148
tooltip.show(INTERSECTED.name.length > 0 ? INTERSECTED.name
149149
: INTERSECTED.parent.name, 200);
150150
}
151151
} else {
152152
if (INTERSECTED) {
153153
INTERSECTED.material.emissive.setHex(INTERSECTED.currentHex);
154-
painter.Render3D();
154+
painter.Render3D(0);
155155
}
156156
INTERSECTED = null;
157157
if (JSROOT.gStyle.Tooltip)
@@ -200,7 +200,7 @@
200200
painter.toplevel.rotation.x += moveY * 0.02;
201201
}
202202
painter.toplevel.rotation.y += moveX * 0.02;
203-
painter.Render3D();
203+
painter.Render3D(0);
204204
mouseX = touch.pageX;
205205
mouseY = touch.pageY;
206206
} else {
@@ -220,7 +220,7 @@
220220
$(painter.renderer.domElement).on('mousewheel', function(e, d) {
221221
e.preventDefault();
222222
painter.camera.position.z += d * 20;
223-
painter.Render3D();
223+
painter.Render3D(0);
224224
});
225225

226226
$(painter.renderer.domElement).on('contextmenu', function(e) {
@@ -564,9 +564,9 @@
564564
}
565565

566566
JSROOT.Painter.Render3D = function(tmout) {
567-
if (tmout==null) tmout = 10; // by default, rendering happens later
567+
if (tmout === undefined) tmout = 5; // by default, rendering happens with timeout
568568

569-
if (tmout<=0) {
569+
if (tmout <= 0) {
570570
if ('render_tmout' in this)
571571
clearTimeout(this['render_tmout']);
572572

0 commit comments

Comments
 (0)