浏览代码

Removed "On" from ConsumerEndpoint methods

/solo_support
Steve Borkman 3 年前
当前提交
19c504c9
共有 7 个文件被更改,包括 34 次插入42 次删除
  1. 17
      com.unity.perception/Runtime/GroundTruth/ConsumerEndpoint.cs
  2. 6
      com.unity.perception/Runtime/GroundTruth/Consumers/NoOpConsumer.cs
  3. 12
      com.unity.perception/Runtime/GroundTruth/Consumers/OldPerceptionConsumer.cs
  4. 7
      com.unity.perception/Runtime/GroundTruth/Consumers/SoloConsumer.cs
  5. 10
      com.unity.perception/Runtime/GroundTruth/Consumers/SoloMessageBuilder.cs
  6. 12
      com.unity.perception/Runtime/GroundTruth/SimulationState.cs
  7. 12
      com.unity.perception/Tests/Runtime/GroundTruthTests/CollectEndpoint.cs

17
com.unity.perception/Runtime/GroundTruth/ConsumerEndpoint.cs


{
yield return new WaitUntil(IsComplete);
}
#if false
public virtual bool IsComplete => true;
#else
#endif
public abstract void OnSimulationStarted(SimulationMetadata metadata);
public abstract void SimulationStarted(SimulationMetadata metadata);
public virtual void OnSensorRegistered(SensorDefinition sensor) { }
public virtual void SensorRegistered(SensorDefinition sensor) { }
public virtual void OnAnnotationRegistered(AnnotationDefinition annotationDefinition) { }
public virtual void OnMetricRegistered(MetricDefinition metricDefinition) { }
public virtual void AnnotationRegistered(AnnotationDefinition annotationDefinition) { }
public virtual void MetricRegistered(MetricDefinition metricDefinition) { }
/// <summary>
/// Called at the end of each frame. Contains all of the generated data for the

public abstract void OnFrameGenerated(Frame frame);
public abstract void FrameGenerated(Frame frame);
/// <summary>
/// Called at the end of the simulation. Contains metadata describing the entire

public abstract void OnSimulationCompleted(CompletionMetadata metadata);
public abstract void SimulationCompleted(CompletionMetadata metadata);
}
}

6
com.unity.perception/Runtime/GroundTruth/Consumers/NoOpConsumer.cs


return CreateInstance<NoOpConsumer>();
}
public override void OnSimulationStarted(SimulationMetadata metadata)
public override void SimulationStarted(SimulationMetadata metadata)
public override void OnFrameGenerated(Frame frame)
public override void FrameGenerated(Frame frame)
public override void OnSimulationCompleted(CompletionMetadata metadata)
public override void SimulationCompleted(CompletionMetadata metadata)
{
// Do nothing, drop everything on the floor
}

12
com.unity.perception/Runtime/GroundTruth/Consumers/OldPerceptionConsumer.cs


return found;
}
public override void OnAnnotationRegistered(AnnotationDefinition annotationDefinition)
public override void AnnotationRegistered(AnnotationDefinition annotationDefinition)
{
if (m_RegisteredAnnotations.ContainsKey(annotationDefinition.id))
{

m_RegisteredAnnotations[annotationDefinition.id] = annotationDefinition;
}
public override void OnMetricRegistered(MetricDefinition metricDefinition)
public override void MetricRegistered(MetricDefinition metricDefinition)
{
if (m_RegisteredMetrics.ContainsKey(metricDefinition.id))
{

m_RegisteredMetrics[metricDefinition.id] = metricDefinition;
}
public override void OnSensorRegistered(SensorDefinition sensor)
public override void SensorRegistered(SensorDefinition sensor)
{
if (m_SensorMap.ContainsKey(sensor.id))
{

return path.Replace(m_CurrentPath + "\\", string.Empty);
}
public override void OnSimulationStarted(SimulationMetadata metadata)
public override void SimulationStarted(SimulationMetadata metadata)
{
// Create a directory guid...
var path = Guid.NewGuid().ToString();

m_RgbPath = VerifyDirectoryWithGuidExists("RGB");
}
public override void OnFrameGenerated(Frame frame)
public override void FrameGenerated(Frame frame)
{
var seqId = frame.sequence.ToString();

}
}
public override void OnSimulationCompleted(CompletionMetadata metadata)
public override void SimulationCompleted(CompletionMetadata metadata)
{
WriteSensorsFile();
WriteAnnotationsDefinitionsFile();

7
com.unity.perception/Runtime/GroundTruth/Consumers/SoloConsumer.cs


return newOne;
}
public override void OnSimulationStarted(SimulationMetadata metadata)
public override void SimulationStarted(SimulationMetadata metadata)
Debug.Log("SC - On Simulation Started");
m_CurrentMetadata = metadata;
var i = 0;

File.WriteAllText(filePath, contents);
}
public override void OnFrameGenerated(Frame frame)
public override void FrameGenerated(Frame frame)
{
var path = GetSequenceDirectoryPath(frame);
path = Path.Combine(path, $"step{frame.step}.frame_data.json");

public override void OnSimulationCompleted(CompletionMetadata metadata)
public override void SimulationCompleted(CompletionMetadata metadata)
{
var path = Path.Combine(currentDirectory, "metadata.json");
WriteJTokenToFile(path, ToMetadata(metadata));

10
com.unity.perception/Runtime/GroundTruth/Consumers/SoloMessageBuilder.cs


SimulationMetadata m_CurrentMetadata;
public override void OnSimulationStarted(SimulationMetadata metadata)
public override void SimulationStarted(SimulationMetadata metadata)
Debug.Log("SC - On Simulation Started");
m_CurrentMetadata = metadata;
if (!Directory.Exists((_baseDirectory)))

JToken m_FrameToken = null;
Stack<JToken> m_Tokens = new Stack<JToken>();
public override void OnFrameGenerated(Frame frame)
public override void FrameGenerated(Frame frame)
{
if (m_FrameToken == null)
{

File.WriteAllText(filePath, contents);
}
public override void OnSimulationCompleted(CompletionMetadata metadata)
{
Debug.Log("SC - On Simulation Completed");
}
public override void SimulationCompleted(CompletionMetadata metadata) { }
class FrameMessageBuilder : IMessageBuilder
{

12
com.unity.perception/Runtime/GroundTruth/SimulationState.cs


m_ActiveSensors.Add(sensorHandle);
m_Sensors.Add(sensorHandle, sensorData);
consumerEndpoint.OnSensorRegistered(sensor);
consumerEndpoint.SensorRegistered(sensor);
if (ExecutionState == ExecutionStateType.NotStarted)
{

perceptionVersion = DatasetCapture.PerceptionVersion,
};
consumerEndpoint.OnSimulationStarted(m_SimulationMetadata);
consumerEndpoint.SimulationStarted(m_SimulationMetadata);
//simulation starts now
m_FrameCountLastUpdatedSequenceTime = Time.frameCount;

totalFrames = m_TotalFrames
};
consumerEndpoint.OnSimulationCompleted(metadata);
consumerEndpoint.SimulationCompleted(metadata);
ExecutionState = ExecutionStateType.NotStarted;

public void RegisterAnnotationDefinition(AnnotationDefinition definition)
{
definition.id = RegisterId(definition.id);
consumerEndpoint.OnAnnotationRegistered(definition);
consumerEndpoint.AnnotationRegistered(definition);
consumerEndpoint.OnMetricRegistered(definition);
consumerEndpoint.MetricRegistered(definition);
}
void RegisterAdditionalInfoType<TSpec>(string name, TSpec[] specValues, string description, string format, Guid id, AdditionalInfoKind additionalInfoKind)

Debug.LogError("Consumer endpoint is null");
}
consumerEndpoint.OnFrameGenerated(converted);
consumerEndpoint.FrameGenerated(converted);
}
#else
foreach (var pendingFrame in frames)

12
com.unity.perception/Tests/Runtime/GroundTruthTests/CollectEndpoint.cs


public List<SimulationRun> collectedRuns = new List<SimulationRun>();
public SimulationRun currentRun;
public override void OnSensorRegistered(SensorDefinition sensor)
public override void SensorRegistered(SensorDefinition sensor)
public override void OnAnnotationRegistered(AnnotationDefinition annotationDefinition)
public override void AnnotationRegistered(AnnotationDefinition annotationDefinition)
public override void OnMetricRegistered(MetricDefinition metricDefinition)
public override void MetricRegistered(MetricDefinition metricDefinition)
{
metricDefinitions.Add(metricDefinition);
}

return ScriptableObject.CreateInstance<CollectEndpoint>();
}
public override void OnSimulationStarted(SimulationMetadata metadata)
public override void SimulationStarted(SimulationMetadata metadata)
{
currentRun = new SimulationRun
{

}
public override void OnFrameGenerated(Frame frame)
public override void FrameGenerated(Frame frame)
{
if (currentRun.frames == null)
{

Debug.Log("Collect Enpoint OnFrameGenerted");
}
public override void OnSimulationCompleted(CompletionMetadata metadata)
public override void SimulationCompleted(CompletionMetadata metadata)
{
currentRun.metadata = metadata;
collectedRuns.Add(currentRun);

正在加载...
取消
保存