[Bf-blender-cvs] [0ba0c3653b9] soc-2020-io-performance: Use std::array, std::min, remove debug function.
Ankit Meel
noreply at git.blender.org
Tue Sep 1 15:21:16 CEST 2020
Commit: 0ba0c3653b9460ae0ffaeed9313ca3ed86cbb1d1
Author: Ankit Meel
Date: Tue Sep 1 15:13:46 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rB0ba0c3653b9460ae0ffaeed9313ca3ed86cbb1d1
Use std::array, std::min, remove debug function.
Review update for D8753.
===================================================================
M source/blender/io/wavefront_obj/intern/obj_import_file_reader.cc
M source/blender/io/wavefront_obj/intern/obj_import_file_reader.hh
M source/blender/io/wavefront_obj/intern/obj_import_mesh.cc
M source/blender/io/wavefront_obj/intern/obj_import_mtl.cc
M source/blender/io/wavefront_obj/intern/obj_import_mtl.hh
M source/blender/io/wavefront_obj/intern/obj_import_objects.hh
M source/blender/io/wavefront_obj/intern/obj_importer.cc
M source/blender/io/wavefront_obj/intern/utils.cc
===================================================================
diff --git a/source/blender/io/wavefront_obj/intern/obj_import_file_reader.cc b/source/blender/io/wavefront_obj/intern/obj_import_file_reader.cc
index 69dbb3c1e37..67bf6ebf892 100644
--- a/source/blender/io/wavefront_obj/intern/obj_import_file_reader.cc
+++ b/source/blender/io/wavefront_obj/intern/obj_import_file_reader.cc
@@ -124,7 +124,7 @@ static void split_by_char(StringRef in_string, const char delimiter, Vector<Stri
in_string = in_string.drop_prefix(word_len);
/* Skip all delimiters. */
in_string = in_string.drop_prefix(
- MIN2(in_string.find_first_not_of(delimiter), in_string.size()));
+ std::min(in_string.find_first_not_of(delimiter), in_string.size()));
}
}
diff --git a/source/blender/io/wavefront_obj/intern/obj_import_file_reader.hh b/source/blender/io/wavefront_obj/intern/obj_import_file_reader.hh
index ce17dfe6dc6..4b9afe09f60 100644
--- a/source/blender/io/wavefront_obj/intern/obj_import_file_reader.hh
+++ b/source/blender/io/wavefront_obj/intern/obj_import_file_reader.hh
@@ -43,8 +43,6 @@ class OBJParser {
void parse_and_store(Vector<std::unique_ptr<Geometry>> &r_all_geometries,
GlobalVertices &r_global_vertices);
Span<std::string> mtl_libraries() const;
- void print_obj_data(Span<std::unique_ptr<Geometry>> all_geometries,
- const GlobalVertices &global_vertices);
};
/**
diff --git a/source/blender/io/wavefront_obj/intern/obj_import_mesh.cc b/source/blender/io/wavefront_obj/intern/obj_import_mesh.cc
index bdf080ab275..4f0f362630f 100644
--- a/source/blender/io/wavefront_obj/intern/obj_import_mesh.cc
+++ b/source/blender/io/wavefront_obj/intern/obj_import_mesh.cc
@@ -21,6 +21,8 @@
* \ingroup obj
*/
+#include <array>
+
#include "DNA_scene_types.h" /* For eVGroupSelect. */
#include "BKE_customdata.h"
@@ -184,7 +186,7 @@ void MeshFromGeometry::dissolve_edges(const Set<std::pair<int, int>> &fgon_edges
BMesh *bmesh = BKE_mesh_to_bmesh_ex(blender_mesh_.get(), &bm_create_params, &bm_convert_params);
- Vector<Array<BMVert *, 2>> edges;
+ Vector<std::array<BMVert *, 2>> edges;
edges.reserve(fgon_edges.size());
BM_mesh_elem_table_ensure(bmesh, BM_VERT);
for (const std::pair<int, int> &edge : fgon_edges) {
diff --git a/source/blender/io/wavefront_obj/intern/obj_import_mtl.cc b/source/blender/io/wavefront_obj/intern/obj_import_mtl.cc
index cf31772c6d1..152f2747674 100644
--- a/source/blender/io/wavefront_obj/intern/obj_import_mtl.cc
+++ b/source/blender/io/wavefront_obj/intern/obj_import_mtl.cc
@@ -183,7 +183,7 @@ std::tuple<float, float> ShaderNodetreeWrap::set_node_locations(const int pos_x)
int pos_y = 0;
bool found = false;
while (true) {
- for (const Array<int, 2> &location : node_locations) {
+ for (Span<int> location : node_locations) {
if (location[0] == pos_x && location[1] == pos_y) {
pos_y += 1;
found = true;
diff --git a/source/blender/io/wavefront_obj/intern/obj_import_mtl.hh b/source/blender/io/wavefront_obj/intern/obj_import_mtl.hh
index b47bfb8e469..2e7edae0193 100644
--- a/source/blender/io/wavefront_obj/intern/obj_import_mtl.hh
+++ b/source/blender/io/wavefront_obj/intern/obj_import_mtl.hh
@@ -27,7 +27,7 @@
#include "DNA_node_types.h"
-#include "BLI_array.hh"
+#include <array>
#include "BLI_float3.hh"
#include "BLI_map.hh"
#include "BLI_string_ref.hh"
@@ -115,7 +115,7 @@ class ShaderNodetreeWrap {
const MTLMaterial *mtl_mat_;
/* List of all locations occupied by nodes. */
- Vector<Array<int, 2>> node_locations;
+ Vector<std::array<int, 2>> node_locations;
const float node_size{300.f};
public:
diff --git a/source/blender/io/wavefront_obj/intern/obj_import_objects.hh b/source/blender/io/wavefront_obj/intern/obj_import_objects.hh
index 5834d7cb3cf..6bcc7a70faf 100644
--- a/source/blender/io/wavefront_obj/intern/obj_import_objects.hh
+++ b/source/blender/io/wavefront_obj/intern/obj_import_objects.hh
@@ -25,7 +25,6 @@
#include "BKE_lib_id.h"
-#include "BLI_array.hh"
#include "BLI_float2.hh"
#include "BLI_float3.hh"
#include "BLI_vector.hh"
diff --git a/source/blender/io/wavefront_obj/intern/obj_importer.cc b/source/blender/io/wavefront_obj/intern/obj_importer.cc
index 918a26771c4..06e1b538cc2 100644
--- a/source/blender/io/wavefront_obj/intern/obj_importer.cc
+++ b/source/blender/io/wavefront_obj/intern/obj_importer.cc
@@ -37,52 +37,6 @@
namespace blender::io::obj {
-/**
- * Only for debug purposes. Must not be in master.
- */
-void OBJParser::print_obj_data(Span<std::unique_ptr<Geometry>> all_geometries,
- const GlobalVertices &global_vertices)
-{
- for (const float3 &curr_vert : global_vertices.vertices) {
- print_v3("vert", curr_vert);
- }
- printf("\n");
- for (const float2 &curr_uv_vert : global_vertices.uv_vertices) {
- print_v2("vert", curr_uv_vert);
- }
- printf("\n");
-
- for (const std::unique_ptr<Geometry> &curr_ob : all_geometries) {
- for (const int curr_vert_idx : curr_ob->vertex_indices_) {
- printf(" %d", curr_vert_idx);
- }
- printf("\nglobal_vert_index^\n");
- for (const MEdge &edge : curr_ob->edges()) {
- printf(" %d %d", edge.v1, edge.v2);
- }
- printf("\nedge vertex indices^\n");
- for (const FaceElement &curr_face : curr_ob->face_elements_) {
- for (FaceCorner a : curr_face.face_corners) {
- printf(" %d/%d", a.vert_index, a.uv_vert_index);
- }
- printf("\n");
- }
- printf("\nvert_index/uv_vert_index^\n");
- for (StringRef b : curr_ob->material_names_) {
- printf("%s ", b.data());
- }
- printf("\nmat names^\n");
- for (const int t : curr_ob->nurbs_element_.curv_indices) {
- printf(" %d", t);
- }
- printf("\nnurbs curv indces^\n");
- for (const float t : curr_ob->nurbs_element_.parm) {
- printf(" %f", t);
- }
- printf("\nnurbs parm values^\n");
- }
-}
-
/**
* Make Blender Mesh, Curve etc from Geometry and add them to the import collection.
*/
@@ -127,7 +81,6 @@ void importer_main(bContext *C, const OBJImportParams &import_params)
MTLParser mtl_parser{mtl_library, import_params.filepath};
mtl_parser.parse_and_store(materials);
}
- // obj_parser.print_obj_data(all_geometries, global_vertices);
geometry_to_blender_objects(
bmain, scene, import_params, all_geometries, global_vertices, materials);
diff --git a/source/blender/io/wavefront_obj/intern/utils.cc b/source/blender/io/wavefront_obj/intern/utils.cc
index 977c16c97ab..9412bb67ef2 100644
--- a/source/blender/io/wavefront_obj/intern/utils.cc
+++ b/source/blender/io/wavefront_obj/intern/utils.cc
@@ -21,12 +21,13 @@
* \ingroup obj
*/
+#include <array>
+
#include "utils.hh"
#include "BKE_displist.h"
#include "BKE_mesh.h"
-#include "BLI_array.hh"
#include "BLI_set.hh"
#include "DNA_object_types.h"
@@ -159,7 +160,7 @@ Vector<Vector<int>> ngon_tessellate(Span<float3> vertex_coords, Span<int> face_v
verts.append({vertex_coords[face_vertex_indices[i]], i});
}
- Vector<Array<int, 2>> edges;
+ Vector<std::array<int, 2>> edges;
for (int i = 0; i < face_vertex_indices.size(); i++) {
edges.append({i, i - 1});
}
More information about the Bf-blender-cvs
mailing list