213cd39b6d
Continued improvements to the new C++ based OBJ importer. Performance: about 2x faster. - Rungholt.obj (several meshes, 263MB file): Windows 12.7s -> 5.9s, Mac 7.7s -> 3.1s. - Blender 3.0 splash (24k meshes, 2.4GB file): Windows 97.3s -> 53.6s, Mac 137.3s -> 80.0s. - "Windows" is VS2022, AMD Ryzen 5950X (32 threads), "Mac" is Xcode/clang 13, M1Max (10 threads). - Slightly reduced memory usage during import as well. The performance gains are a combination of several things: - Replacing `std::stof` / `std::stoi` with C++17 `from_chars`. - Stop reading input file char-by-char using `std::getline`, and instead read in 64kb chunks, and parse from there (taking care of possibly handling lines split mid-way due to chunk boundaries). - Removing abstractions for splitting a line by some char, - Avoid tiny memory allocations: instead of storing a vector of polygon corners in each face, store all the corners in one big array, and per-face only store indices "where do corners start, and how many". Likewise, don't store full string names of material/group names for each face; only store indices into overall material/group names arrays. - Stop always doing mesh validation, which is slow. Do it just like the Alembic importer does: only do validation if found some invalid faces during import, or if requested by the user via an import setting checkbox (which defaults to off). - Stop doing "collection sync" for each object being added; instead do the collection sync right after creating all the objects. Cleanup / Robustness: This reworking of parser (see "removing abstractions" point above) means that all the functions that were in `parser_string_utils` file are gone, and replaced with different set of functions. However they are not OBJ specific, so as pointed out during review of the previous differential, they are now in `source/blender/io/common` library. Added gtest coverage for said functions as well; something that was only indirectly covered by obj tests previously. Rework of some bits of parsing made the parser actually better able to deal with invalid syntax. E.g. previously, if a face corner were a `/123` string, it would have incorrectly treated that as a vertex index (since it would get "hey that's one number" after splitting a string by a slash), instead of properly marking it as invalid syntax. Added gtest coverage for .mtl parsing; something that was not covered by any tests at all previously. Reviewed By: Howard Trickey Differential Revision: https://developer.blender.org/D14586
95 lines
1.9 KiB
CMake
95 lines
1.9 KiB
CMake
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
set(INC
|
|
.
|
|
./exporter
|
|
./importer
|
|
../common
|
|
../../blenkernel
|
|
../../blenlib
|
|
../../bmesh
|
|
../../bmesh/intern
|
|
../../depsgraph
|
|
../../editors/include
|
|
../../makesdna
|
|
../../makesrna
|
|
../../nodes
|
|
../../windowmanager
|
|
../../../../extern/fmtlib/include
|
|
../../../../intern/guardedalloc
|
|
)
|
|
|
|
set(INC_SYS
|
|
|
|
)
|
|
|
|
set(SRC
|
|
IO_wavefront_obj.cc
|
|
exporter/obj_export_file_writer.cc
|
|
exporter/obj_export_mesh.cc
|
|
exporter/obj_export_mtl.cc
|
|
exporter/obj_export_nurbs.cc
|
|
exporter/obj_exporter.cc
|
|
importer/importer_mesh_utils.cc
|
|
importer/obj_import_file_reader.cc
|
|
importer/obj_import_mesh.cc
|
|
importer/obj_import_mtl.cc
|
|
importer/obj_import_nurbs.cc
|
|
importer/obj_importer.cc
|
|
|
|
IO_wavefront_obj.h
|
|
exporter/obj_export_file_writer.hh
|
|
exporter/obj_export_io.hh
|
|
exporter/obj_export_mesh.hh
|
|
exporter/obj_export_mtl.hh
|
|
exporter/obj_export_nurbs.hh
|
|
exporter/obj_exporter.hh
|
|
importer/importer_mesh_utils.hh
|
|
importer/obj_import_file_reader.hh
|
|
importer/obj_import_mesh.hh
|
|
importer/obj_import_mtl.hh
|
|
importer/obj_import_nurbs.hh
|
|
importer/obj_import_objects.hh
|
|
importer/obj_importer.hh
|
|
)
|
|
|
|
set(LIB
|
|
bf_blenkernel
|
|
bf_io_common
|
|
)
|
|
|
|
if(WITH_TBB)
|
|
add_definitions(-DWITH_TBB)
|
|
list(APPEND INC_SYS ${TBB_INCLUDE_DIRS})
|
|
list(APPEND LIB ${TBB_LIBRARIES})
|
|
endif()
|
|
|
|
blender_add_lib(bf_wavefront_obj "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|
|
|
|
if(WITH_GTESTS)
|
|
set(TEST_SRC
|
|
tests/obj_exporter_tests.cc
|
|
tests/obj_importer_tests.cc
|
|
tests/obj_mtl_parser_tests.cc
|
|
tests/obj_exporter_tests.hh
|
|
)
|
|
|
|
set(TEST_INC
|
|
${INC}
|
|
|
|
../../blenloader
|
|
../../../../tests/gtests
|
|
)
|
|
|
|
set(TEST_LIB
|
|
${LIB}
|
|
|
|
bf_blenloader_tests
|
|
bf_wavefront_obj
|
|
)
|
|
|
|
include(GTestTesting)
|
|
blender_add_test_lib(bf_wavefront_obj_tests "${TEST_SRC}" "${TEST_INC}" "${INC_SYS}" "${TEST_LIB}")
|
|
add_dependencies(bf_wavefront_obj_tests bf_wavefront_obj)
|
|
endif()
|