More review

BaikalDataGenerator/Source/app_config.h

@@ -4,7 +4,7 @@
 
 #include <vector>
 
-const int default_start_output_index = -1;
+const int kDefaultStartOutputIndex = -1;
 
 struct AppConfig
 {
@@ -17,7 +17,7 @@ struct AppConfig
  unsigned height = 0;
  unsigned split_num = 1;
  unsigned split_idx = 0;
- int start_output_idx = default_start_output_index;
+ int start_output_idx = kDefaultStartOutputIndex;
  unsigned num_bounces = 5;
  unsigned device_idx = 0;
  bool gamma_correction = false;

BaikalDataGenerator/Source/data_generator.cpp

@@ -133,9 +133,6 @@ try
  output_dir,
  params->gamma_correction != 0);
 
- // camera_end_idx is index of the last rendered camera
- unsigned camera_end_idx = params->cameras_num - 1;
-
  // Save settings and other info into a metadata file
  data_generator.SaveMetadata();
 
@@ -151,9 +148,9 @@ try
  // Report the progress
  if (params->progress_callback)
  {
- params->progress_callback(0,
- i + 1,
- params->cameras_num);
+ params->progress_callback(params->cameras_start_output_idx,
+ camera_idx,
+ params->cameras_start_output_idx + params->cameras_num - 1);
  }
  }
 

BaikalDataGenerator/Source/data_generator_impl.h

@@ -72,18 +72,6 @@ class DataGeneratorImpl
  const std::filesystem::path& output_dir,
  bool gamma_correction_enable);
 
- /// This function generates dataset for network training
- ///
- /// @param output_dir Output directory to save dataset
- /// @param scene_name Scene name
- /// @param cameras_start_idx The save index of the 1st camera
- /// @param cameras_end_idx The save index of the last camera
- /// @param cam_states Camera states range
- /// @param lights - lights range
- /// 'spp' - spp vector
- /// 'gamma_correction_enabled' - flag to enable/disable gamma correction
- /// 'start_cam_id' - the number starting from will be named generated samples
-
  void SaveMetadata() const;
 
  void GenerateCameraData(CameraObject* camera, unsigned camera_idx);

BaikalDataGenerator/Source/main.cpp

@@ -54,7 +54,7 @@ void SaveAppMetadata(const AppConfig& config, Range cameras_range)
  root->InsertEndChild(split);
 
  auto* cameras = doc.NewElement("cameras");
- cameras->SetAttribute("idx_offset", config.start_output_idx <= default_start_output_index ?
+ cameras->SetAttribute("idx_offset", config.start_output_idx <= kDefaultStartOutputIndex ?
  0 : config.start_output_idx - static_cast<int>(cameras_range.begin));
  cameras->SetAttribute("start_idx", static_cast<int>(cameras_range.begin));
  cameras->SetAttribute("end_idx", static_cast<int>(cameras_range.end - 1));
@@ -128,15 +128,11 @@ try
 
  SaveAppMetadata(config, object_loader.GetCamerasRange());
 
- auto progress_callback = [](unsigned start_idx, unsigned camera_idx, unsigned end_idx)
+ auto progress_callback = [](unsigned, unsigned camera_idx, unsigned)
  {
- int progress = static_cast<int>((end_idx > start_idx) ?
- 100 * (float)camera_idx / (float)(end_idx - start_idx) : 100);
-
  DG_LOG(KeyValue("event", "generated")
  << KeyValue("status", "generating")
- << KeyValue("camera_idx", camera_idx)
- << KeyValue("progress", progress));
+ << KeyValue("camera_idx", camera_idx));
  };
 
  params.progress_callback = progress_callback;

BaikalDataGenerator/Source/object_loader.cpp

@@ -155,7 +155,7 @@ DataGeneratorParams ObjectLoader::GetDataGeneratorParams()
  params.scene_name = m_scene_name.c_str();
  params.cameras = m_rpr_cameras.data();
  params.cameras_num = static_cast<unsigned>(m_rpr_cameras.size());
- params.cameras_start_output_idx = (m_app_config.start_output_idx <= default_start_output_index) ?
+ params.cameras_start_output_idx = (m_app_config.start_output_idx <= kDefaultStartOutputIndex) ?
  m_cameras_idx_range.begin : m_app_config.start_output_idx;
  params.lights = m_rpr_lights.data();
  params.lights_num = static_cast<unsigned>(m_rpr_lights.size());