blender
/
blender
136
405
Fork 587
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Merge branch 'blender-v3.3-release'

This commit is contained in:
Aras Pranckevicius 2022-08-16 13:50:19 +03:00
parent 7bfd78d450 efdcef7855
commit 1221a4049c
3 changed files with 63 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/io/wavefront_obj/importer/obj_import_mesh.cc
View File

@ -157,17 +157,21 @@ void MeshFromGeometry::fixup_invalid_faces()
void MeshFromGeometry::create_vertices(Mesh *mesh)
{
int mi = 0;
for (int vi : mesh_geometry_.vertices_) {
if (vi < global_vertices_.vertices.size()) {
copy_v3_v3(mesh->mvert[mi].co, global_vertices_.vertices[vi]);
/* Go through all the global vertex indices from min to max,
* checking which ones are actually and building a global->local
* index mapping. Write out the used vertex positions into the Mesh
* data. */
mesh_geometry_.global_to_local_vertices_.clear();
mesh_geometry_.global_to_local_vertices_.reserve(mesh_geometry_.vertices_.size());
for (int vi = mesh_geometry_.vertex_index_min_; vi <= mesh_geometry_.vertex_index_max_; ++vi) {
BLI_assert(vi >= 0 && vi < global_vertices_.vertices.size());
if (!mesh_geometry_.vertices_.contains(vi)) {
continue;
}
else {
std::cerr << "Vertex index:" << vi
<< " larger than total vertices:" << global_vertices_.vertices.size() << " ."
<< std::endl;
}
++mi;
int local_vi = (int)mesh_geometry_.global_to_local_vertices_.size();
BLI_assert(local_vi >= 0 && local_vi < mesh->totvert);
copy_v3_v3(mesh->mvert[local_vi].co, global_vertices_.vertices[vi]);
mesh_geometry_.global_to_local_vertices_.add_new(vi, local_vi);
}
}

14
source/blender/io/wavefront_obj/importer/obj_import_objects.hh
View File

@ -11,8 +11,8 @@
#include "BLI_map.hh"
#include "BLI_math_base.hh"
#include "BLI_math_vec_types.hh"
#include "BLI_set.hh"
#include "BLI_vector.hh"
#include "BLI_vector_set.hh"
#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"
@ -93,9 +93,11 @@ struct Geometry {
int vertex_index_min_ = INT_MAX;
int vertex_index_max_ = -1;
VectorSet<int> vertices_;
/* Global vertex indices used by this geometry. */
Set<int> vertices_;
/* Mapping from global vertex index to geometry-local vertex index. */
Map<int, int> global_to_local_vertices_;
/** Edges written in the file in addition to (or even without polygon) elements. */
/* Loose edges in the file. */
Vector<MEdge> edges_;
Vector<PolyCorner> face_corners_;
@ -112,19 +114,15 @@ struct Geometry {
}
void track_vertex_index(int index)
{
if (vertices_.add(index)) {
global_to_local_vertices_.add_new(index, (int)vertices_.size() - 1);
}
vertices_.add(index);
math::min_inplace(vertex_index_min_, index);
math::max_inplace(vertex_index_max_, index);
}
void track_all_vertices(int count)
{
vertices_.reserve(count);
global_to_local_vertices_.reserve(count);
for (int i = 0; i < count; ++i) {
vertices_.add(i);
global_to_local_vertices_.add(i, i);
}
vertex_index_min_ = 0;
vertex_index_max_ = count - 1;

86
source/blender/io/wavefront_obj/tests/obj_importer_tests.cc
View File

@ -154,7 +154,7 @@ TEST_F(obj_importer_test, import_cube)
12,
6,
24,
float3(1, -1, 1),
float3(-1, -1, 1),
float3(1, -1, -1),
float3(-0.57735f, 0.57735f, -0.57735f)},
};
@ -172,7 +172,7 @@ TEST_F(obj_importer_test, import_cube_o_after_verts)
12,
6,
24,
float3(1, -1, 1),
float3(-1, -1, 1),
float3(1, -1, -1),
float3(0, 0, 1),
},
@ -183,8 +183,8 @@ TEST_F(obj_importer_test, import_cube_o_after_verts)
3,
1,
3,
float3(1, -1, 1),
float3(-2, -2, 2),
float3(-1, -1, -1),
float3(-0.2357f, 0.9428f, 0.2357f),
},
};
@ -201,8 +201,8 @@ TEST_F(obj_importer_test, import_suzanne_all_data)
1005,
500,
1968,
float3(-0.5f, 0.09375f, 0.6875f),
float3(0.546875f, 0.054688f, 0.578125f),
float3(-0.4375f, 0.164062f, 0.765625f),
float3(0.4375f, 0.164062f, 0.765625f),
float3(-0.6040f, -0.5102f, 0.6122f),
float2(0.692094f, 0.40191f)},
};
@ -307,7 +307,7 @@ TEST_F(obj_importer_test, import_materials)
{
Expectation expect[] = {
{"OBCube", OB_MESH, 8, 12, 6, 24, float3(1, 1, -1), float3(-1, 1, 1)},
{"OBmaterials", OB_MESH, 8, 12, 6, 24, float3(1, -1, 1), float3(1, -1, -1)},
{"OBmaterials", OB_MESH, 8, 12, 6, 24, float3(-1, -1, 1), float3(1, -1, -1)},
};
import_and_check("materials.obj", expect, std::size(expect), 4, 8);
}
@ -323,7 +323,7 @@ TEST_F(obj_importer_test, import_cubes_with_textures_rel)
6,
24,
float3(1, 1, -1),
float3(1, -1, -1),
float3(-1, -1, 1),
float3(0, 1, 0),
float2(0.9935f, 0.0020f)},
{"OBCubeTexMul",
@ -333,7 +333,7 @@ TEST_F(obj_importer_test, import_cubes_with_textures_rel)
6,
24,
float3(4, -2, -1),
float3(4, -4, -1),
float3(2, -4, 1),
float3(0, 1, 0),
float2(0.9935f, 0.0020f)},
{"OBCubeTiledTex",
@ -343,7 +343,7 @@ TEST_F(obj_importer_test, import_cubes_with_textures_rel)
6,
24,
float3(4, 1, -1),
float3(4, -1, -1),
float3(2, -1, 1),
float3(0, 1, 0),
float2(0.9935f, 0.0020f)},
{"OBCubeTiledTexFromAnotherFolder",
@ -353,7 +353,7 @@ TEST_F(obj_importer_test, import_cubes_with_textures_rel)
6,
24,
float3(7, 1, -1),
float3(7, -1, -1),
float3(5, -1, 1),
float3(0, 1, 0),
float2(0.9935f, 0.0020f)},
};
@ -444,15 +444,15 @@ TEST_F(obj_importer_test, import_all_objects)
{"OBCube", OB_MESH, 8, 12, 6, 24, float3(1, 1, -1), float3(-1, 1, 1)},
/* .obj file has empty EmptyText and EmptyMesh objects; these are ignored and skipped */
{"OBBezierCurve", OB_MESH, 13, 12, 0, 0, float3(-1, -2, 0), float3(1, -2, 0)},
{"OBBlankCube", OB_MESH, 8, 13, 7, 26, float3(1, 1, 1), float3(-1, 1, -1), float3(0, 0, 1)},
{"OBBlankCube", OB_MESH, 8, 13, 7, 26, float3(1, 1, -1), float3(-1, 1, 1), float3(0, 0, 1)},
{"OBMaterialCube",
OB_MESH,
8,
13,
7,
26,
float3(26, -1, -1),
float3(28, -1, -1),
float3(28, 1, -1),
float3(26, 1, 1),
float3(-1, 0, 0)},
{"OBNurbsCircle",
OB_MESH,
@ -462,15 +462,15 @@ TEST_F(obj_importer_test, import_all_objects)
0,
float3(3.292893f, -2.707107f, 0),
float3(3.369084f, -2.77607f, 0)},
{"OBNurbsCircle.001", OB_MESH, 4, 4, 0, 0, float3(3, -2, 0), float3(2, -1, 0)},
{"OBNurbsCircle.001", OB_MESH, 4, 4, 0, 0, float3(2, -3, 0), float3(3, -2, 0)},
{"OBParticleCube",
OB_MESH,
8,
13,
7,
26,
float3(22, 1, 1),
float3(20, 1, -1),
float3(22, 1, -1),
float3(20, 1, 1),
float3(0, 0, 1)},
{"OBShapeKeyCube",
OB_MESH,
@ -478,8 +478,8 @@ TEST_F(obj_importer_test, import_all_objects)
13,
7,
26,
float3(19, 1, 2),
float3(17, 1, -1),
float3(19, 1, -1),
float3(17, 1, 1),
float3(-0.4082f, -0.4082f, 0.8165f)},
{"OBSmoothCube",
OB_MESH,
@ -487,8 +487,8 @@ TEST_F(obj_importer_test, import_all_objects)
13,
7,
26,
float3(4, 1, 1),
float3(2, 1, -1),
float3(4, 1, -1),
float3(2, 1, 1),
float3(0.5774f, 0.5773f, 0.5774f)},
{"OBSurface",
OB_MESH,
@ -496,7 +496,7 @@ TEST_F(obj_importer_test, import_all_objects)
480,
224,
896,
float3(7.292893f, -2.707107f, -0.714285f),
float3(7.292893f, -2.707107f, -1),
float3(7.525872f, -2.883338f, 1),
float3(-0.7071f, -0.7071f, 0),
float2(0, 0.142857f)},
@ -506,7 +506,7 @@ TEST_F(obj_importer_test, import_all_objects)
480,
225,
900,
float3(12.56667f, -2.5f, 0.72037f),
float3(12.5f, -2.5f, 0.694444f),
float3(13.5f, -1.5f, 0.694444f),
float3(-0.3246f, -0.3531f, 0.8775f),
float2(0, 0.066667f)},
@ -527,7 +527,7 @@ TEST_F(obj_importer_test, import_all_objects)
1024,
4096,
float3(5.34467f, -2.65533f, -0.176777f),
float3(5.158205f, -2.234695f, -0.220835f),
float3(5.232792f, -2.411795f, -0.220835f),
float3(-0.5042f, -0.5042f, -0.7011f),
float2(0, 1)},
{"OBTaperCube",
@ -536,8 +536,8 @@ TEST_F(obj_importer_test, import_all_objects)
208,
104,
416,
float3(24.316156f, 0.345556f, 0.796778f),
float3(23.551804f, 0.389113f, -0.639607f),
float3(24.444445f, 0.502543f, -0.753814f),
float3(23.790743f, 0.460522f, -0.766546f),
float3(-0.0546f, 0.1716f, 0.9837f)},
{"OBText",
OB_MESH,
@ -545,8 +545,8 @@ TEST_F(obj_importer_test, import_all_objects)
345,
171,
513,
float3(1.583f, -9.621f, 0),
float3(0.351f, -10.0f, 0),
float3(1.75f, -9.458f, 0),
float3(0.587f, -9.406f, 0),
float3(0, 0, 1),
float2(0.017544f, 0)},
{"OBUVCube",
@ -555,8 +555,8 @@ TEST_F(obj_importer_test, import_all_objects)
13,
7,
26,
float3(7, 1, 1),
float3(5, 1, -1),
float3(7, 1, -1),
float3(5, 1, 1),
float3(0, 0, 1),
float2(0.654526f, 0.579873f)},
{"OBUVImageCube",
@ -565,8 +565,8 @@ TEST_F(obj_importer_test, import_all_objects)
13,
7,
26,
float3(10, 1, 1),
float3(8, 1, -1),
float3(10, 1, -1),
float3(8, 1, 1),
float3(0, 0, 1),
float2(0.654526f, 0.579873f)},
{"OBVColCube",
@ -575,8 +575,8 @@ TEST_F(obj_importer_test, import_all_objects)
13,
7,
26,
float3(13, 1, 1),
float3(11, 1, -1),
float3(13, 1, -1),
float3(11, 1, 1),
float3(0, 0, 1),
float2(0, 0),
float4(0.0f, 0.002125f, 1.0f, 1.0f)},
@ -586,8 +586,8 @@ TEST_F(obj_importer_test, import_all_objects)
13,
7,
26,
float3(16, 1, 1),
float3(14, 1, -1),
float3(16, 1, -1),
float3(14, 1, 1),
float3(0, 0, 1)},
};
import_and_check("all_objects.obj", expect, std::size(expect), 7);
@ -604,7 +604,7 @@ TEST_F(obj_importer_test, import_cubes_vertex_colors)
6,
24,
float3(1.0f, 1.0f, -3.812445f),
float3(1.0f, -1.0f, -3.812445f),
float3(-1.0f, -1.0f, -1.812445f),
float3(0, 0, 0),
float2(0, 0),
float4(0.89627f, 0.036889f, 0.47932f, 1.0f)},
@ -615,7 +615,7 @@ TEST_F(obj_importer_test, import_cubes_vertex_colors)
6,
24,
float3(3.481967f, 1.0f, -3.812445f),
float3(3.481967f, -1.0f, -3.812445f),
float3(1.481967f, -1.0f, -1.812445f),
float3(0, 0, 0),
float2(0, 0),
float4(1.564582f, 0.039217f, 0.664309f, 1.0f)},
@ -626,7 +626,7 @@ TEST_F(obj_importer_test, import_cubes_vertex_colors)
6,
24,
float3(-4.725068f, -1.0f, 1.0f),
float3(-2.725068f, -1.0f, 1.0f),
float3(-2.725068f, 1.0f, -1.0f),
float3(0, 0, 0),
float2(0, 0),
float4(0.270498f, 0.47932f, 0.262251f, 1.0f)},
@ -637,7 +637,7 @@ TEST_F(obj_importer_test, import_cubes_vertex_colors)
6,
24,
float3(-4.550208f, -1.0f, -1.918042f),
float3(-2.550208f, -1.0f, -1.918042f)},
float3(-2.550208f, 1.0f, -3.918042f)},
{"OBCubeVertexByte",
OB_MESH,
8,
@ -645,7 +645,7 @@ TEST_F(obj_importer_test, import_cubes_vertex_colors)
6,
24,
float3(1.0f, 1.0f, -1.0f),
float3(1.0f, -1.0f, -1.0f),
float3(-1.0f, -1.0f, 1.0f),
float3(0, 0, 0),
float2(0, 0),
float4(0.846873f, 0.027321f, 0.982123f, 1.0f)},
@ -656,7 +656,7 @@ TEST_F(obj_importer_test, import_cubes_vertex_colors)
6,
24,
float3(3.392028f, 1.0f, -1.0f),
float3(3.392028f, -1.0f, -1.0f),
float3(1.392028f, -1.0f, 1.0f),
float3(0, 0, 0),
float2(0, 0),
float4(49.99467f, 0.027321f, 0.982123f, 1.0f)},
@ -675,7 +675,7 @@ TEST_F(obj_importer_test, import_cubes_vertex_colors_mrgb)
6,
24,
float3(4, 1, -1),
float3(4, -1, -1),
float3(2, -1, 1),
float3(0, 0, 0),
float2(0, 0),
float4(0.8714f, 0.6308f, 0.5271f, 1.0f)},
@ -686,7 +686,7 @@ TEST_F(obj_importer_test, import_cubes_vertex_colors_mrgb)
6,
24,
float3(1, 1, -1),
float3(1, -1, -1),
float3(-1, -1, 1),
float3(0, 0, 0),
float2(0, 0),
float4(0.6038f, 0.3185f, 0.1329f, 1.0f)},