Visualize readyToContinue flag in UI

Author: g3force

internal/app/engine/consume_tracker.go

@@ -20,6 +20,11 @@ func (e *Engine) ProcessTrackerFrame(wrapperFrame *tracker.TrackerWrapperPacket)
 
 		// for now, all tracker sources update the GC state
 		e.gcState.TrackerStateGc = &state
+
+		if e.gcState.ReadyToContinue == nil {
+			e.gcState.ReadyToContinue = new(bool)
+		}
+		*e.gcState.ReadyToContinue = e.readyToContinue()
 	})
 }
 
@@ -43,3 +48,12 @@ func convertBalls(balls []*tracker.TrackedBall) *Ball {
 	}
 	return &ball
 }
+
+func (e *Engine) readyToContinue() bool {
+	radius := e.gameConfig.DistanceToBallInStop + robotRadius + distanceThreshold
+	if !e.ballSteady() ||
+		e.robotsInsideRadius(e.gcState.TrackerStateGc.Robots, e.gcState.TrackerStateGc.Ball.Pos.ToVector2(), radius) {
+		return false
+	}
+	return false
+}

internal/app/engine/process_prepare.go

@@ -11,7 +11,8 @@ const minPreparationTime = time.Second * 2
 func (e *Engine) processPrepare() {
 	if !e.currentState.Command.IsPrepare() ||
 		e.gcState.TrackerStateGc.Ball == nil ||
-		!e.readyToContinue() ||
+		e.gcState.ReadyToContinue == nil ||
+		!*e.gcState.ReadyToContinue ||
 		e.currentState.NextCommand == nil ||
 		!e.currentState.GetAutoContinue() ||
 		e.timeSinceLastChange() < minPreparationTime {
@@ -53,12 +54,3 @@ func (e *Engine) processPrepare() {
 		},
 	})
 }
-
-func (e *Engine) readyToContinue() bool {
-	radius := e.gameConfig.DistanceToBallInStop + robotRadius + distanceThreshold
-	if !e.ballSteady() ||
-		e.robotsInsideRadius(e.gcState.TrackerStateGc.Robots, e.gcState.TrackerStateGc.Ball.Pos.ToVector2(), radius) {
-		return false
-	}
-	return false
-}

internal/app/engine/ssl_gc_engine.pb.go

@@ -10,6 +10,7 @@ message GcState {
     map<string, GcStateAutoRef> auto_ref_state = 2;
     map<string, GcStateTracker> tracker_state = 3;
     optional GcStateTracker tracker_state_gc = 4;
+    optional bool ready_to_continue = 5;
 }
 
 message GcStateTeam {

proto/ssl_gc_engine.proto

@@ -14,6 +14,7 @@
              :title="'Continue based on last game event (' + Object.keys(keymapContinue)[0] + ')'">
             <b-button v-hotkey="keymapContinue"
                       ref="btnContinue"
+                      :class="continueButtonClass"
                       v-on:click="triggerContinue"
                       v-bind:disabled="continueDisabled">
                 Continue
@@ -24,25 +25,6 @@
                 </span>
             </b-button>
         </div>
-
-        <div v-for="autoRefId of autoRefs"
-             v-bind:key="autoRefId"
-             v-if="autoRefReady(autoRefId) !== undefined || autoRefBallPlaced(autoRefId) !== undefined"
-             class="auto-ref-meta">
-            {{autoRefId}}
-            <font-awesome-icon
-                    v-b-tooltip.hover.d500
-                    title="Ready to continue"
-                    v-if="autoRefReady(autoRefId)"
-                    class="fa-xs"
-                    icon="check-circle"/>
-            <font-awesome-icon
-                    v-b-tooltip.hover.d500
-                    title="Not ready to continue yet"
-                    v-else
-                    class="fa-xs"
-                    icon="times-circle"/>
-        </div>
     </div>
 </template>
 
@@ -59,9 +41,6 @@
             triggerContinue() {
                 submitChange({continue: {}});
             },
-            autoRefReady(id) {
-                return this.$store.state.gcState.autoRefState[id].readyToContinue;
-            }
         },
         computed: {
             keymapHalt() {
@@ -110,8 +89,14 @@
                     'team-yellow': this.nextCommand && this.nextCommand.forTeam === TEAM_YELLOW
                 }
             },
-            autoRefs() {
-                return Object.keys(this.$store.state.gcState.autoRefState);
+            continueButtonClass() {
+                if (!this.$store.state.gcState.hasOwnProperty('readyToContinue')) {
+                    return '';
+                }
+                if (this.$store.state.gcState.readyToContinue) {
+                    return 'continue-btn-ready';
+                }
+                return 'continue-btn-not-ready';
             }
         }
     }
@@ -128,9 +113,12 @@
         justify-content: center;
     }
 
-    .auto-ref-meta {
-        font-size: 1.2em;
-        margin: auto .2em;
+    .continue-btn-ready {
+        background-color: green;
+    }
+
+    .continue-btn-not-ready {
+        background-color: red;
     }
 
 </style>

src/components/control/ControlFlowBar.vue

@@ -21721,6 +21721,7 @@ export const GcState = $root.GcState = (() => {
      * @property {Object.<string,IGcStateAutoRef>|null} [autoRefState] GcState autoRefState
      * @property {Object.<string,IGcStateTracker>|null} [trackerState] GcState trackerState
      * @property {IGcStateTracker|null} [trackerStateGc] GcState trackerStateGc
+     * @property {boolean|null} [readyToContinue] GcState readyToContinue
      */
 
     /**
@@ -21773,6 +21774,14 @@ export const GcState = $root.GcState = (() => {
      */
     GcState.prototype.trackerStateGc = null;
 
+    /**
+     * GcState readyToContinue.
+     * @member {boolean} readyToContinue
+     * @memberof GcState
+     * @instance
+     */
+    GcState.prototype.readyToContinue = false;
+
     /**
      * Creates a new GcState instance using the specified properties.
      * @function create
@@ -21814,6 +21823,8 @@ export const GcState = $root.GcState = (() => {
             }
         if (message.trackerStateGc != null && message.hasOwnProperty("trackerStateGc"))
             $root.GcStateTracker.encode(message.trackerStateGc, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim();
+        if (message.readyToContinue != null && message.hasOwnProperty("readyToContinue"))
+            writer.uint32(/* id 5, wireType 0 =*/40).bool(message.readyToContinue);
         return writer;
     };
 
@@ -21875,6 +21886,9 @@ export const GcState = $root.GcState = (() => {
             case 4:
                 message.trackerStateGc = $root.GcStateTracker.decode(reader, reader.uint32());
                 break;
+            case 5:
+                message.readyToContinue = reader.bool();
+                break;
             default:
                 reader.skipType(tag & 7);
                 break;
@@ -21945,6 +21959,9 @@ export const GcState = $root.GcState = (() => {
             if (error)
                 return "trackerStateGc." + error;
         }
+        if (message.readyToContinue != null && message.hasOwnProperty("readyToContinue"))
+            if (typeof message.readyToContinue !== "boolean")
+                return "readyToContinue: boolean expected";
         return null;
     };
 
@@ -21995,6 +22012,8 @@ export const GcState = $root.GcState = (() => {
                 throw TypeError(".GcState.trackerStateGc: object expected");
             message.trackerStateGc = $root.GcStateTracker.fromObject(object.trackerStateGc);
         }
+        if (object.readyToContinue != null)
+            message.readyToContinue = Boolean(object.readyToContinue);
         return message;
     };
 
@@ -22016,8 +22035,10 @@ export const GcState = $root.GcState = (() => {
             object.autoRefState = {};
             object.trackerState = {};
         }
-        if (options.defaults)
+        if (options.defaults) {
             object.trackerStateGc = null;
+            object.readyToContinue = false;
+        }
         let keys2;
         if (message.teamState && (keys2 = Object.keys(message.teamState)).length) {
             object.teamState = {};
@@ -22036,6 +22057,8 @@ export const GcState = $root.GcState = (() => {
         }
         if (message.trackerStateGc != null && message.hasOwnProperty("trackerStateGc"))
             object.trackerStateGc = $root.GcStateTracker.toObject(message.trackerStateGc, options);
+        if (message.readyToContinue != null && message.hasOwnProperty("readyToContinue"))
+            object.readyToContinue = message.readyToContinue;
         return object;
     };