Skip to content

Commit 2663f2f

Browse files
update
1 parent 1aaf020 commit 2663f2f

1 file changed

Lines changed: 25 additions & 9 deletions

File tree

src/volumetricdisplay/index.html

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1398,9 +1398,9 @@
13981398
{
13991399
name: 'color cube',
14001400
uiHtml: `
1401-
x pixels = #FF00000A (red)<br />
1402-
y pixels = #00FF000A (green)<br />
1403-
z pixels = #0000FF0A (blue)<br />
1401+
x-pixels = #FF00000A (red)<br />
1402+
y-pixels = #00FF000A (green)<br />
1403+
z-pixels = #0000FF0A (blue)<br />
14041404
<br />
14051405
Look at the display from different angles to see the colors.
14061406
`,
@@ -1597,14 +1597,21 @@
15971597
timeMs: 0,
15981598
lastTimeMs: 0,
15991599
isPaused: false,
1600+
requestAnimate: false,
16001601
pauseRippleButton: null
16011602
},
16021603
init() {
1603-
this.instanceData.isPaused = false;
16041604
this.instanceData.pauseRippleButton = VolumetricDisplayControl.uiDisplayRightPanelBody.querySelector('#pauseRipple');
1605-
this.instanceData.pauseRippleButton.innerText = 'pause ripple';
1606-
this.instanceData.pauseRippleButton.style.backgroundColor = '#000000';
1607-
this.instanceData.pauseRippleButton.style.color = '#88ffff';
1605+
if (this.instanceData.isPaused) {
1606+
this.instanceData.pauseRippleButton.innerText = 'resume ripple';
1607+
this.instanceData.pauseRippleButton.style.backgroundColor = '#88ffff';
1608+
this.instanceData.pauseRippleButton.style.color = '#000000';
1609+
} else {
1610+
this.instanceData.lastTimeMs = Date.now();
1611+
this.instanceData.pauseRippleButton.innerText = 'pause ripple';
1612+
this.instanceData.pauseRippleButton.style.backgroundColor = '#000000';
1613+
this.instanceData.pauseRippleButton.style.color = '#88ffff';
1614+
}
16081615
this.instanceData.pauseRippleButton.addEventListener('click', (event) => {
16091616
event.stopPropagation();
16101617
event.preventDefault();
@@ -1613,6 +1620,7 @@
16131620
this.instanceData.pauseRippleButton.innerText = 'resume ripple';
16141621
this.instanceData.pauseRippleButton.style.backgroundColor = '#88ffff';
16151622
this.instanceData.pauseRippleButton.style.color = '#000000';
1623+
this.instanceData.requestAnimate = true;
16161624
} else {
16171625
this.instanceData.lastTimeMs = Date.now();
16181626
this.instanceData.pauseRippleButton.innerText = 'pause ripple';
@@ -1622,12 +1630,19 @@
16221630
});
16231631
VolumetricDisplay.fill();
16241632
VolumetricDisplay.update();
1633+
if (this.instanceData.isPaused) {
1634+
this.instanceData.requestAnimate = true;
1635+
} else {
1636+
this.instanceData.lastTimeMs = Date.now();
1637+
}
16251638
},
16261639
animate() {
1627-
if (this.instanceData.isPaused) {
1640+
if (this.instanceData.isPaused && !this.instanceData.requestAnimate) {
16281641
return;
16291642
}
1630-
this.instanceData.timeMs += (Date.now() - this.instanceData.lastTimeMs) | 0;
1643+
if (!this.instanceData.isPaused) {
1644+
this.instanceData.timeMs += (Date.now() - this.instanceData.lastTimeMs) | 0;
1645+
}
16311646
this.instanceData.lastTimeMs = Date.now();
16321647
const timeMs = this.instanceData.timeMs;
16331648
VolumetricDisplay.fill();
@@ -1665,6 +1680,7 @@
16651680
}
16661681
}
16671682
VolumetricDisplay.update();
1683+
this.instanceData.requestAnimate = false;
16681684
}
16691685
},
16701686
{

0 commit comments

Comments
 (0)