Remove terrain readiness diagnostic and fix graphics container name

code/GameDiagnosticsReport.pas

@@ -15,13 +15,6 @@ type
     dsiSeekReadConsistency
   );
 
-  TTerrainReadinessDiagnosticStageId = (
-    trsiRxTilesLoad,
-    trsiMapStreamLoad,
-    trsiMapHeader,
-    trsiTileRecords
-  );
-
   TGraphicsReadinessDiagnosticStageId = (
     grsiContextReady, grsiPhysicalSurface, grsiRendererSizeMatch,
     grsiTextureBackend, grsiSampledProgram, grsiMaxTextureSize
@@ -56,11 +49,6 @@ type
     Value: TDiagnosticStageId;
   end;
 
-  TOptionalTerrainReadinessDiagnosticStageId = record
-    HasValue: Boolean;
-    Value: TTerrainReadinessDiagnosticStageId;
-  end;
-
   TOptionalGraphicsReadinessDiagnosticStageId = record
     HasValue: Boolean;
     Value: TGraphicsReadinessDiagnosticStageId;
@@ -103,24 +91,6 @@ type
     Stream: TFileIODiagnosticStreamResult;
   end;
 
-  TTerrainReadinessDiagnosticEvidence = record
-    RxTilesLoaded: TOptionalBoolean;
-    GeneratedTransitionsReady: TOptionalBoolean;
-    MapX: TOptionalInt64;
-    MapY: TOptionalInt64;
-    GameRev: TOptionalInt64;
-    ExpectedTileCount: TOptionalInt64;
-    CompletedTileCount: TOptionalInt64;
-  end;
-
-  TTerrainReadinessDiagnosticResult = record
-    Status: TDiagnosticStatus;
-    FailureStage: TOptionalTerrainReadinessDiagnosticStageId;
-    Error: TDiagnosticError;
-    Stages: array[TTerrainReadinessDiagnosticStageId] of TDiagnosticStatus;
-    Evidence: TTerrainReadinessDiagnosticEvidence;
-  end;
-
   TGraphicsReadinessDiagnosticEvidence = record
     ContextAvailable, RendererContextSynced, PhysicalSizeKnown,
       TextureBackendReady, SampledProgramReady: TOptionalBoolean;
@@ -199,7 +169,6 @@ type
     SelectedMap: TDiagnosticSelectedMapMetadata;
     OverallStatus: TDiagnosticStatus;
     FileIO: TFileIODiagnosticResult;
-    TerrainReadiness: TTerrainReadinessDiagnosticResult;
     GraphicsReadiness: TGraphicsReadinessDiagnosticResult;
     GraphicsTexture: TGraphicsTextureDiagnosticResult;
     GraphicsVisibleDraw: TGraphicsVisibleDrawDiagnosticResult;
@@ -207,8 +176,6 @@ type
 
 function CurrentDiagnosticReport: TDiagnosticReportState;
 procedure ReplaceFileIODiagnosticResult(const AResult: TFileIODiagnosticResult);
-procedure ReplaceTerrainReadinessDiagnosticResult(
-  const AResult: TTerrainReadinessDiagnosticResult);
 procedure ReplaceGraphicsReadinessDiagnosticResult(
   const AResult: TGraphicsReadinessDiagnosticResult);
 procedure ReplaceGraphicsTextureDiagnosticResult(
@@ -217,8 +184,6 @@ procedure ReplaceGraphicsVisibleDrawDiagnosticResult(
   const AResult: TGraphicsVisibleDrawDiagnosticResult);
 function DiagnosticStatusToken(const AStatus: TDiagnosticStatus): string;
 function DiagnosticStageIdToken(const AStage: TDiagnosticStageId): string;
-function TerrainReadinessDiagnosticStageIdToken(
-  const AStage: TTerrainReadinessDiagnosticStageId): string;
 function GraphicsReadinessDiagnosticStageIdToken(
   const AStage: TGraphicsReadinessDiagnosticStageId): string;
 function GraphicsTextureDiagnosticStageIdToken(
@@ -234,7 +199,6 @@ uses
 
 var
   CurrentFileIO: TFileIODiagnosticResult;
-  CurrentTerrainReadiness: TTerrainReadinessDiagnosticResult;
   CurrentGraphicsReadiness: TGraphicsReadinessDiagnosticResult;
   CurrentGraphicsTexture: TGraphicsTextureDiagnosticResult;
   CurrentGraphicsVisibleDraw: TGraphicsVisibleDrawDiagnosticResult;
@@ -298,17 +262,6 @@ begin
   end;
 end;
 
-function TerrainReadinessDiagnosticStageIdToken(
-  const AStage: TTerrainReadinessDiagnosticStageId): string;
-begin
-  case AStage of
-    trsiRxTilesLoad: Result := 'rx_tiles_load';
-    trsiMapStreamLoad: Result := 'map_stream_load';
-    trsiMapHeader: Result := 'map_header';
-    trsiTileRecords: Result := 'tile_records';
-  end;
-end;
-
 function CurrentDiagnosticReport: TDiagnosticReportState;
 begin
   Result.ApplicationInfo.Name := 'kam_mobile';
@@ -323,18 +276,15 @@ begin
   Result.SelectedMap.RelativePath := SelectedMapRelativePath;
   Result.SelectedMap.Url := SelectedMapUrl;
   Result.FileIO := CurrentFileIO;
-  Result.TerrainReadiness := CurrentTerrainReadiness;
   Result.GraphicsReadiness := CurrentGraphicsReadiness;
   Result.GraphicsTexture := CurrentGraphicsTexture;
   Result.GraphicsVisibleDraw := CurrentGraphicsVisibleDraw;
   if (Result.FileIO.Status = dsFail)
-    or (Result.TerrainReadiness.Status = dsFail)
     or (Result.GraphicsReadiness.Status = dsFail)
     or (Result.GraphicsTexture.Status = dsFail)
     or (Result.GraphicsVisibleDraw.Status = dsFail) then
     Result.OverallStatus := dsFail
   else if (Result.FileIO.Status = dsPass)
-    and (Result.TerrainReadiness.Status = dsPass)
     and (Result.GraphicsReadiness.Status = dsPass)
     and (Result.GraphicsTexture.Status = dsPass)
     and (Result.GraphicsVisibleDraw.Status = dsPass) then
@@ -348,12 +298,6 @@ begin
   CurrentFileIO := AResult;
 end;
 
-procedure ReplaceTerrainReadinessDiagnosticResult(
-  const AResult: TTerrainReadinessDiagnosticResult);
-begin
-  CurrentTerrainReadiness := AResult;
-end;
-
 procedure ReplaceGraphicsReadinessDiagnosticResult(
   const AResult: TGraphicsReadinessDiagnosticResult);
 begin
@@ -446,48 +390,6 @@ begin
   AActions.Add(Action);
 end;
 
-procedure AppendTerrainReadinessJson(AActions: TJSONArray; const AResult: TTerrainReadinessDiagnosticResult);
-var
-  Action, Stage, Evidence: TJSONObject;
-  Stages: TJSONArray;
-  TerrainStageId: TTerrainReadinessDiagnosticStageId;
-begin
-  Action := TJSONObject.Create;
-  Action.Add('id', 'terrain_readiness');
-  Action.Add('status', DiagnosticStatusToken(AResult.Status));
-  if AResult.FailureStage.HasValue then
-    Action.Add('failure_stage', TerrainReadinessDiagnosticStageIdToken(
-      AResult.FailureStage.Value))
-  else
-    Action.Add('failure_stage', TJSONNull.Create);
-  Action.Add('error', DiagnosticErrorJson(AResult.Error));
-  Stages := TJSONArray.Create;
-  for TerrainStageId := Low(TTerrainReadinessDiagnosticStageId)
-    to High(TTerrainReadinessDiagnosticStageId) do
-  begin
-    Stage := TJSONObject.Create;
-    Stage.Add('id', TerrainReadinessDiagnosticStageIdToken(TerrainStageId));
-    Stage.Add('status', DiagnosticStatusToken(
-      AResult.Stages[TerrainStageId]));
-    Stages.Add(Stage);
-  end;
-  Action.Add('stages', Stages);
-  Evidence := TJSONObject.Create;
-  Evidence.Add('rx_tiles_loaded', OptionalBooleanJson(
-    AResult.Evidence.RxTilesLoaded));
-  Evidence.Add('generated_transitions_ready', OptionalBooleanJson(
-    AResult.Evidence.GeneratedTransitionsReady));
-  Evidence.Add('map_x', OptionalInt64Json(AResult.Evidence.MapX));
-  Evidence.Add('map_y', OptionalInt64Json(AResult.Evidence.MapY));
-  Evidence.Add('game_rev', OptionalInt64Json(AResult.Evidence.GameRev));
-  Evidence.Add('expected_tile_count', OptionalInt64Json(
-    AResult.Evidence.ExpectedTileCount));
-  Evidence.Add('completed_tile_count', OptionalInt64Json(
-    AResult.Evidence.CompletedTileCount));
-  Action.Add('evidence', Evidence);
-  AActions.Add(Action);
-end;
-
 procedure AppendGraphicsReadinessJson(AActions: TJSONArray; const AResult: TGraphicsReadinessDiagnosticResult);
 var
   Action, Stage, Evidence: TJSONObject;
@@ -661,7 +563,6 @@ begin
     Root.Add('overall_status', DiagnosticStatusToken(State.OverallStatus));
     Actions := TJSONArray.Create;
     AppendFileIOJson(Actions, State.FileIO);
-    AppendTerrainReadinessJson(Actions, State.TerrainReadiness);
     AppendGraphicsReadinessJson(Actions, State.GraphicsReadiness);
 
     AppendGraphicsTextureJson(Actions, State.GraphicsTexture);