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
70 lines
2.1 KiB
C++
70 lines
2.1 KiB
C++
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
|
|
#pragma once
|
|
|
|
#include "BLI_string_ref.hh"
|
|
|
|
/*
|
|
* Various text parsing utilities commonly used by text-based input formats.
|
|
*/
|
|
|
|
namespace blender::io {
|
|
|
|
/**
|
|
* Fetches next line from an input string buffer.
|
|
*
|
|
* The returned line will not have '\n' characters at the end;
|
|
* the `buffer` is modified to contain remaining text without
|
|
* the input line.
|
|
*
|
|
* Note that backslash (\) character is treated as a line
|
|
* continuation, similar to OBJ file format or a C preprocessor.
|
|
*/
|
|
StringRef read_next_line(StringRef &buffer);
|
|
|
|
/**
|
|
* Drop leading white-space from a StringRef.
|
|
* Note that backslash character is considered white-space.
|
|
*/
|
|
StringRef drop_whitespace(StringRef str);
|
|
|
|
/**
|
|
* Drop leading non-white-space from a StringRef.
|
|
* Note that backslash character is considered white-space.
|
|
*/
|
|
StringRef drop_non_whitespace(StringRef str);
|
|
|
|
/**
|
|
* Parse an integer from an input string.
|
|
* The parsed result is stored in `dst`. The function skips
|
|
* leading white-space unless `skip_space=false`. If the
|
|
* number can't be parsed (invalid syntax, out of range),
|
|
* `fallback` value is stored instead.
|
|
*
|
|
* Returns the remainder of the input string after parsing.
|
|
*/
|
|
StringRef parse_int(StringRef str, int fallback, int &dst, bool skip_space = true);
|
|
|
|
/**
|
|
* Parse a float from an input string.
|
|
* The parsed result is stored in `dst`. The function skips
|
|
* leading white-space unless `skip_space=false`. If the
|
|
* number can't be parsed (invalid syntax, out of range),
|
|
* `fallback` value is stored instead.
|
|
*
|
|
* Returns the remainder of the input string after parsing.
|
|
*/
|
|
StringRef parse_float(StringRef str, float fallback, float &dst, bool skip_space = true);
|
|
|
|
/**
|
|
* Parse a number of white-space separated floats from an input string.
|
|
* The parsed `count` numbers are stored in `dst`. If a
|
|
* number can't be parsed (invalid syntax, out of range),
|
|
* `fallback` value is stored instead.
|
|
*
|
|
* Returns the remainder of the input string after parsing.
|
|
*/
|
|
StringRef parse_floats(StringRef str, float fallback, float *dst, int count);
|
|
|
|
} // namespace blender::io
|