Skip to content

Commit bbf0c50

Browse files
committed
Fixed rotate-tracker state
* Fixed the tracker graphic rotation state to be the saved state on initialisation.
1 parent 6f69fa3 commit bbf0c50

File tree

2 files changed

+32
-24
lines changed

2 files changed

+32
-24
lines changed

RoundMaster/5.057/RoundMaster.js

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4800,21 +4800,27 @@ var RoundMaster = (function() {
48004800
*
48014801
* TODO make the rotation rate a field variable
48024802
*/
4803+
48034804
var animateTracker = function() {
4804-
if (!flags.animating)
4805-
{return;}
48064805

4807-
if (flags.rw_state === RW_StateEnum.ACTIVE) {
4806+
if (!flags.animating) {
4807+
return;
4808+
}
4809+
if (flags.rw_state == RW_StateEnum.ACTIVE) {
4810+
// log('doAnimateTracker: Active');
48084811
if (state.roundMaster.rotation) {
48094812
var graphic = findTrackerGraphic();
4810-
graphic.set('rotation',parseInt(graphic.get('rotation'))+fields.rotation_degree);
4813+
graphic.set('rotation',(parseInt(graphic.get('rotation'))+parseInt(fields.rotation_degree)));
4814+
// log('doAnimateTracker: Rotating');
48114815
}
48124816
setTimeout(function() {animateTracker();},500);
4813-
} else if (flags.rw_state === RW_StateEnum.PAUSED
4814-
|| flags.rw_state === RW_StateEnum.FROZEN) {
4815-
setTimeout(function() {animateTracker();},500);
4817+
} else if (flags.rw_state == RW_StateEnum.PAUSED
4818+
|| flags.rw_state == RW_StateEnum.FROZEN) {
4819+
// log('doAnimateTracker: Paused or Frozen');
4820+
setTimeout(function() {animateTracker();},1000);
48164821
} else {
4817-
flags.animating = false;
4822+
log('doAnimateTracker: Stopped or undefined');
4823+
// flags.animating = false;
48184824
}
48194825
};
48204826

@@ -5164,10 +5170,8 @@ var RoundMaster = (function() {
51645170
}
51655171

51665172
updateTurnorderMarker();
5167-
if (!flags.animating) {
5168-
flags.animating = state.roundMaster.rotation;
5169-
animateTracker();
5170-
}
5173+
flags.animating = state.roundMaster.rotation;
5174+
animateTracker();
51715175
};
51725176

51735177
/**

RoundMaster/RoundMaster.js

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4800,21 +4800,27 @@ var RoundMaster = (function() {
48004800
*
48014801
* TODO make the rotation rate a field variable
48024802
*/
4803+
48034804
var animateTracker = function() {
4804-
if (!flags.animating)
4805-
{return;}
48064805

4807-
if (flags.rw_state === RW_StateEnum.ACTIVE) {
4806+
if (!flags.animating) {
4807+
return;
4808+
}
4809+
if (flags.rw_state == RW_StateEnum.ACTIVE) {
4810+
// log('doAnimateTracker: Active');
48084811
if (state.roundMaster.rotation) {
48094812
var graphic = findTrackerGraphic();
4810-
graphic.set('rotation',parseInt(graphic.get('rotation'))+fields.rotation_degree);
4813+
graphic.set('rotation',(parseInt(graphic.get('rotation'))+parseInt(fields.rotation_degree)));
4814+
// log('doAnimateTracker: Rotating');
48114815
}
48124816
setTimeout(function() {animateTracker();},500);
4813-
} else if (flags.rw_state === RW_StateEnum.PAUSED
4814-
|| flags.rw_state === RW_StateEnum.FROZEN) {
4815-
setTimeout(function() {animateTracker();},500);
4817+
} else if (flags.rw_state == RW_StateEnum.PAUSED
4818+
|| flags.rw_state == RW_StateEnum.FROZEN) {
4819+
// log('doAnimateTracker: Paused or Frozen');
4820+
setTimeout(function() {animateTracker();},1000);
48164821
} else {
4817-
flags.animating = false;
4822+
log('doAnimateTracker: Stopped or undefined');
4823+
// flags.animating = false;
48184824
}
48194825
};
48204826

@@ -5164,10 +5170,8 @@ var RoundMaster = (function() {
51645170
}
51655171

51665172
updateTurnorderMarker();
5167-
if (!flags.animating) {
5168-
flags.animating = state.roundMaster.rotation;
5169-
animateTracker();
5170-
}
5173+
flags.animating = state.roundMaster.rotation;
5174+
animateTracker();
51715175
};
51725176

51735177
/**

0 commit comments

Comments
 (0)