[Bf-blender-cvs] [7af1ec516f9] soc-2020-io-performance: Formatting, edit comments, remove extra io::obj

[Ankit Meel]

Commit: 7af1ec516f942116722e7b6a8462a46be793ee39
Author: Ankit Meel
Date:   Mon Jun 8 20:24:46 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rB7af1ec516f942116722e7b6a8462a46be793ee39

Formatting, edit comments, remove extra io::obj

Changes here:

Made variables `vertex` & `polygon` for better readability in writer.
`data_to_export->mvert`
`data_to_export->polygon_list`

Edited comments as per review in D7918.

Removed extraneous `io::obj::` being used in the same namespace.

===================================================================

M	source/blender/editors/io/io_obj.c
M	source/blender/io/wavefront_obj/intern/wavefront_obj.hh
M	source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
M	source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.cc
M	source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.hh

===================================================================

diff --git a/source/blender/editors/io/io_obj.c b/source/blender/editors/io/io_obj.c
index 72c25315921..57569ca7e87 100644
--- a/source/blender/editors/io/io_obj.c
+++ b/source/blender/editors/io/io_obj.c
@@ -128,15 +128,7 @@ void WM_OT_obj_export(struct wmOperatorType *ot)
                                  FILE_SORT_ALPHA);
 
   RNA_def_boolean(ot->srna, "dummy_checkbox", 0, "Dummy Checkbox", "");
-  RNA_def_float(ot->srna,
-                "dummy_slider",
-                4.56,
-                0.0f,
-                10.0f,
-                "Dummy Slider",
-                "",
-                1.0f,
-                9.0f);
+  RNA_def_float(ot->srna, "dummy_slider", 4.56, 0.0f, 10.0f, "Dummy Slider", "", 1.0f, 9.0f);
 }
 
 static int wm_obj_import_invoke(bContext *C, wmOperator *op, const wmEvent *event)
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj.hh b/source/blender/io/wavefront_obj/intern/wavefront_obj.hh
index da1ae3ad884..c9be522c189 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj.hh
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj.hh
@@ -63,7 +63,7 @@ struct OBJ_data_to_export {
   uint tot_vertices;
 
   /** Polygons in a mesh to export. */
-  BLI::Vector<io::obj::Polygon> polygon_list;
+  BLI::Vector<Polygon> polygon_list;
   /** Number of polygons in a mesh to export. */
   uint tot_faces;
 };
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
index d304cd83e89..b985d44bed1 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
@@ -124,8 +124,7 @@ static void get_geometry_per_object(const OBJExportParams *export_params,
 }
 
 /**
- * Central internal function to call data preparation & writer functions.
- * Recieves export_settings from obj.cc.
+ * Central internal function to call geometry data preparation & writer functions.
  */
 void exporter_main(bContext *C, const OBJExportParams *export_params)
 {
@@ -136,7 +135,7 @@ void exporter_main(bContext *C, const OBJExportParams *export_params)
 
   get_geometry_per_object(export_params, &data_to_export);
 
-  io::obj::write_obj_data(filepath, &data_to_export);
+  write_obj_data(filepath, &data_to_export);
   MEM_freeN(data_to_export.mvert);
 }
 }  // namespace obj
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.cc
index 3f12d9eb8e3..df4a8315d67 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.cc
@@ -31,7 +31,7 @@ namespace io {
 namespace obj {
 
 /**
- * File writer to the OBJ file at filepath.
+ * Low level writer to the OBJ file at filepath.
  * data_to_export is filled in obj_exporter.cc.
  */
 void write_obj_data(const char *filepath, OBJ_data_to_export *data_to_export)
@@ -40,25 +40,24 @@ void write_obj_data(const char *filepath, OBJ_data_to_export *data_to_export)
   outfile << "# Blender 2.90 \n";
 
   /** Write v x y z for all vertices. */
+  MVert *vertex = data_to_export->mvert;
   for (int i = 0; i < data_to_export->tot_vertices; i++) {
     outfile << "v ";
-    outfile << data_to_export->mvert[i].co[0] << " " << data_to_export->mvert[i].co[1] << " "
-            << data_to_export->mvert[i].co[2] << "\n";
+    outfile << vertex[i].co[0] << " " << vertex[i].co[1] << " " << vertex[i].co[2] << "\n";
   }
 
-  /** Write vn n1 n2 n3 for all face normals. */
+  /** Write vn nx ny nz for all face normals. */
   for (int i = 0; i < data_to_export->tot_faces; i++) {
     outfile << "vn ";
-    outfile << data_to_export->mvert[i].no[0] << " " << data_to_export->mvert[i].no[1] << " "
-            << data_to_export->mvert[i].no[2] << "\n";
+    outfile << vertex[i].no[0] << " " << vertex[i].no[1] << " " << vertex[i].no[2] << "\n";
   }
 
   /** Write f v1/vt1/vn1 .. total_vertices_per_poly , for all polygons. */
+  BLI::Vector<Polygon> &polygon = data_to_export->polygon_list;
   for (int i = 0; i < data_to_export->tot_faces; i++) {
     outfile << "f ";
-    for (int j = 0; j < data_to_export->polygon_list[i].total_vertices_per_poly; j++) {
-      outfile << data_to_export->polygon_list[i].vertex_index[j] << "//"
-              << data_to_export->polygon_list[i].face_normal_index[j] << " ";
+    for (int j = 0; j < polygon[i].total_vertices_per_poly; j++) {
+      outfile << polygon[i].vertex_index[j] << "//" << polygon[i].face_normal_index[j] << " ";
     }
     outfile << "\n";
   }
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.hh b/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.hh
index 011e81c165f..17d1c839a29 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.hh
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.hh
@@ -31,7 +31,7 @@ namespace obj {
  * Low level writer to the OBJ file at filepath.
  * data_to_export is filled in obj_exporter.cc.
  */
-void write_obj_data(const char *filepath, io::obj::OBJ_data_to_export *data_to_export);
+void write_obj_data(const char *filepath, OBJ_data_to_export *data_to_export);
 
 }  // namespace obj
 }  // namespace io