[Bf-blender-cvs] [44629501fef] soc-2020-io-performance: Cleanup: renames.
Ankit Meel
noreply at git.blender.org
Mon Nov 16 11:15:50 CET 2020
Commit: 44629501fef7fe6176072d1e99f2b5322c2d2535
Author: Ankit Meel
Date: Fri Nov 13 14:07:54 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rB44629501fef7fe6176072d1e99f2b5322c2d2535
Cleanup: renames.
===================================================================
M source/blender/io/wavefront_obj/exporter/obj_export_file_writer.cc
M source/blender/io/wavefront_obj/exporter/obj_export_nurbs.cc
M source/blender/io/wavefront_obj/exporter/obj_export_nurbs.hh
M source/blender/io/wavefront_obj/exporter/obj_exporter.cc
M source/blender/io/wavefront_obj/exporter/obj_exporter.hh
M source/blender/io/wavefront_obj/tests/obj_exporter_tests.cc
===================================================================
diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.cc b/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.cc
index b944f642837..e096cae90ef 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.cc
+++ b/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.cc
@@ -403,10 +403,10 @@ void OBJWriter::write_edges_indices(const OBJMesh &obj_mesh_data) const
*/
void OBJWriter::write_nurbs_curve(const OBJCurve &obj_nurbs_data) const
{
- const int tot_nurbs = obj_nurbs_data.tot_nurbs();
+ const int tot_nurbs = obj_nurbs_data.total_splines();
for (int i = 0; i < tot_nurbs; i++) {
/* Total control points in a nurbs. */
- const int tot_points = obj_nurbs_data.get_nurbs_points(i);
+ const int tot_points = obj_nurbs_data.total_nurbs_points(i);
for (int point_idx = 0; point_idx < tot_points; point_idx++) {
const float3 point_coord = obj_nurbs_data.get_nurbs_point_coords(
i, point_idx, export_params_.scaling_factor);
diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_nurbs.cc b/source/blender/io/wavefront_obj/exporter/obj_export_nurbs.cc
index 5d7a97ce700..bd040ee13b8 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_export_nurbs.cc
+++ b/source/blender/io/wavefront_obj/exporter/obj_export_nurbs.cc
@@ -63,27 +63,27 @@ const char *OBJCurve::get_curve_name() const
return export_object_eval_->id.name + 2;
}
-int OBJCurve::tot_nurbs() const
+int OBJCurve::total_splines() const
{
return BLI_listbase_count(&export_curve_->nurb);
}
-int OBJCurve::get_nurbs_points(const int nurb_index) const
+int OBJCurve::total_nurbs_points(const int spline_index) const
{
- const Nurb *nurb = static_cast<Nurb *>(BLI_findlink(&export_curve_->nurb, nurb_index));
+ const Nurb *nurb = static_cast<Nurb *>(BLI_findlink(&export_curve_->nurb, spline_index));
return nurb->pntsu * nurb->pntsv;
}
/**
* Get coordinates of the vertex at the given index.
*/
-float3 OBJCurve::get_nurbs_point_coords(const int nurb_index,
- const int vert_index,
+float3 OBJCurve::get_nurbs_point_coords(const int spline_index,
+ const int vertex_index,
const float scaling_factor) const
{
- const Nurb *nurb = static_cast<Nurb *>(BLI_findlink(&export_curve_->nurb, nurb_index));
+ const Nurb *nurb = static_cast<Nurb *>(BLI_findlink(&export_curve_->nurb, spline_index));
float3 r_coord;
- const BPoint &bpoint = nurb->bp[vert_index];
+ const BPoint &bpoint = nurb->bp[vertex_index];
copy_v3_v3(r_coord, bpoint.vec);
mul_m4_v3(world_axes_transform_, r_coord);
mul_v3_fl(r_coord, scaling_factor);
@@ -93,9 +93,9 @@ float3 OBJCurve::get_nurbs_point_coords(const int nurb_index,
/**
* Get total control points of the NURBS Curve at the given index.
*/
-int OBJCurve::get_nurbs_num(const int nurb_index) const
+int OBJCurve::get_nurbs_num(const int spline_index) const
{
- const Nurb *nurb = static_cast<Nurb *>(BLI_findlink(&export_curve_->nurb, nurb_index));
+ const Nurb *nurb = static_cast<Nurb *>(BLI_findlink(&export_curve_->nurb, spline_index));
const int r_nurbs_degree = nurb->orderu - 1;
/* Total control points = Number of points in the curve (+ degree of the
* curve if it is cyclic). */
@@ -109,9 +109,9 @@ int OBJCurve::get_nurbs_num(const int nurb_index) const
/**
* Get the degree of the NURBS Curve at the given index.
*/
-int OBJCurve::get_nurbs_degree(const int nurb_index) const
+int OBJCurve::get_nurbs_degree(const int spline_index) const
{
- const Nurb *nurb = static_cast<Nurb *>(BLI_findlink(&export_curve_->nurb, nurb_index));
+ const Nurb *nurb = static_cast<Nurb *>(BLI_findlink(&export_curve_->nurb, spline_index));
return nurb->orderu - 1;
}
diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_nurbs.hh b/source/blender/io/wavefront_obj/exporter/obj_export_nurbs.hh
index 4417b02bd41..ab5585eb520 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_export_nurbs.hh
+++ b/source/blender/io/wavefront_obj/exporter/obj_export_nurbs.hh
@@ -45,13 +45,13 @@ class OBJCurve : NonCopyable {
OBJCurve(const Depsgraph *depsgraph, const OBJExportParams &export_params, Object *curve_object);
const char *get_curve_name() const;
- int tot_nurbs() const;
- int get_nurbs_points(const int nurb_index) const;
- float3 get_nurbs_point_coords(const int nurb_index,
- const int vert_index,
+ int total_splines() const;
+ int total_nurbs_points(const int spline_index) const;
+ float3 get_nurbs_point_coords(const int spline_index,
+ const int vertex_index,
const float scaling_factor) const;
- int get_nurbs_num(const int nurb_index) const;
- int get_nurbs_degree(const int nurb_index) const;
+ int get_nurbs_num(const int spline_index) const;
+ int get_nurbs_degree(const int spline_index) const;
private:
void set_world_axes_transform(const eTransformAxisForward forward, const eTransformAxisUp up);
diff --git a/source/blender/io/wavefront_obj/exporter/obj_exporter.cc b/source/blender/io/wavefront_obj/exporter/obj_exporter.cc
index fc416be1c98..d233b113ed6 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_exporter.cc
+++ b/source/blender/io/wavefront_obj/exporter/obj_exporter.cc
@@ -84,7 +84,7 @@ void OBJDepsgraph::update_for_newframe()
* \note Curves are also stored with Meshes if export settings specify so.
*/
std::pair<Vector<std::unique_ptr<OBJMesh>>, Vector<std::unique_ptr<OBJCurve>>>
-find_exportable_objects(Depsgraph *depsgraph, const OBJExportParams &export_params)
+filter_supported_objects(Depsgraph *depsgraph, const OBJExportParams &export_params)
{
Vector<std::unique_ptr<OBJMesh>> r_exportable_meshes;
Vector<std::unique_ptr<OBJCurve>> r_exportable_nurbs;
@@ -156,7 +156,7 @@ static void write_mesh_objects(Vector<std::unique_ptr<OBJMesh>> exportable_as_me
/* Smooth groups and UV vertex indices may make huge memory allocations, so they should be freed
* right after they're written, instead of waiting for #blender::Vector to clean them up after
* all the objects are exported. */
- for (Steal<OBJMesh> obj_mesh : exportable_as_mesh) {
+ for (StealUniquePtr<OBJMesh> obj_mesh : exportable_as_mesh) {
obj_writer.write_object_name(*obj_mesh);
obj_writer.write_vertex_coords(*obj_mesh);
@@ -212,8 +212,8 @@ static void export_frame(Depsgraph *depsgraph,
// Vector<std::unique_ptr<OBJMesh>> exportable_as_mesh;
// /* NURBS to be exported in parameter form. */
// Vector<std::unique_ptr<OBJCurve>> exportable_as_nurbs;
- auto [exportable_as_mesh, exportable_as_nurbs] = find_exportable_objects(depsgraph,
- export_params);
+ auto [exportable_as_mesh, exportable_as_nurbs] = filter_supported_objects(depsgraph,
+ export_params);
write_mesh_objects(std::move(exportable_as_mesh), frame_writer, export_params);
write_nurbs_curve_objects(std::move(exportable_as_nurbs), frame_writer);
diff --git a/source/blender/io/wavefront_obj/exporter/obj_exporter.hh b/source/blender/io/wavefront_obj/exporter/obj_exporter.hh
index d748dc16726..48a54f8f5a3 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_exporter.hh
+++ b/source/blender/io/wavefront_obj/exporter/obj_exporter.hh
@@ -34,9 +34,9 @@ namespace blender::io::obj {
/**
* Steal elements' ownership in a range-based for-loop.
*/
-template<typename T> struct Steal {
+template<typename T> struct StealUniquePtr {
std::unique_ptr<T> owning;
- Steal(std::unique_ptr<T> &owning) : owning(std::move(owning))
+ StealUniquePtr(std::unique_ptr<T> &owning) : owning(std::move(owning))
{
}
T *operator->()
@@ -72,7 +72,7 @@ class OBJMesh;
class OBJCurve;
std::pair<Vector<std::unique_ptr<OBJMesh>>, Vector<std::unique_ptr<OBJCurve>>>
-find_exportable_objects(Depsgraph *depsgraph, const OBJExportParams &export_params);
+filter_supported_objects(Depsgraph *depsgraph, const OBJExportParams &export_params);
bool append_frame_to_filename(const char *filepath, const int frame, char *r_filepath_with_frames);
} // namespace blender::io::obj
diff --git a/source/blender/io/wavefront_obj/tests/obj_exporter_tests.cc b/source/blender/io/wavefront_obj/tests/obj_exporter_tests.cc
index 16d79090fd0..973d5edd5f1 100644
--- a/source/blender/io/wavefront_obj/tests/obj_exporter_tests.cc
+++ b/source/blender/io/wavefront_obj/tests/obj_exporter_tests.cc
@@ -73,7 +73,7 @@ TEST_F(Export_OBJ, filter_objects_as_mesh)
return;
}
- auto [objmeshes, objcurves]{find_exportable_objects(depsgraph, _export.params)};
+ auto [objmeshes, objcurves]{filter_supported_objects(depsgraph, _export.params)};
EXPECT_EQ(objmeshes.size(), 22);
EXPECT_EQ(objcurves.size(), 0);
}
@@ -85,7 +85,7 @@ TEST_F(Export_OBJ, filter_objects_as_curves)
return;
}
_export.params.export_curves_as_nurbs = true;
- auto [objmeshes, objcurves]{find_exportable_objects(depsgraph, _export.params)};
+ auto [objmeshes, objcurves]{filter_supported_objects(depsgraph, _export.params)};
EXPECT_EQ(objmeshes.size(), 18);
EXPECT_EQ(objcurves.size(), 4);
}
@@ -98,7 +98,7 @@ TEST_F(Export_OBJ, filter_objects_selected)
}
_export.params.export_selected_objects = true;
_export.params.export_curves_as_nurbs = true;
- auto [objmeshes, objcurves]{find_exportable_objects(depsgraph, _export.params)};
+ auto [objmeshes, objcurves]{filter_supported_objects(depsgraph, _export.params)};
EXPECT_EQ(objmeshes.size(), 8);
EXPECT_EQ(objcurves.size(), 2);
}
More information about the Bf-blender-cvs
mailing list