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
103 lines
2.2 KiB
C
103 lines
2.2 KiB
C
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
|
|
/** \file
|
|
* \ingroup obj
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "BKE_context.h"
|
|
#include "BLI_path_util.h"
|
|
#include "DEG_depsgraph.h"
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
typedef enum {
|
|
OBJ_AXIS_X_UP = 0,
|
|
OBJ_AXIS_Y_UP = 1,
|
|
OBJ_AXIS_Z_UP = 2,
|
|
OBJ_AXIS_NEGATIVE_X_UP = 3,
|
|
OBJ_AXIS_NEGATIVE_Y_UP = 4,
|
|
OBJ_AXIS_NEGATIVE_Z_UP = 5,
|
|
} eTransformAxisUp;
|
|
|
|
typedef enum {
|
|
OBJ_AXIS_X_FORWARD = 0,
|
|
OBJ_AXIS_Y_FORWARD = 1,
|
|
OBJ_AXIS_Z_FORWARD = 2,
|
|
OBJ_AXIS_NEGATIVE_X_FORWARD = 3,
|
|
OBJ_AXIS_NEGATIVE_Y_FORWARD = 4,
|
|
OBJ_AXIS_NEGATIVE_Z_FORWARD = 5,
|
|
} eTransformAxisForward;
|
|
|
|
static const int TOTAL_AXES = 3;
|
|
|
|
struct OBJExportParams {
|
|
/** Full path to the destination .OBJ file. */
|
|
char filepath[FILE_MAX];
|
|
|
|
/** Full path to current blender file (used for comments in output). */
|
|
const char *blen_filepath;
|
|
|
|
/** Whether multiple frames should be exported. */
|
|
bool export_animation;
|
|
/** The first frame to be exported. */
|
|
int start_frame;
|
|
/** The last frame to be exported. */
|
|
int end_frame;
|
|
|
|
/* Geometry Transform options. */
|
|
eTransformAxisForward forward_axis;
|
|
eTransformAxisUp up_axis;
|
|
float scaling_factor;
|
|
|
|
/* File Write Options. */
|
|
bool export_selected_objects;
|
|
bool apply_modifiers;
|
|
eEvaluationMode export_eval_mode;
|
|
bool export_uv;
|
|
bool export_normals;
|
|
bool export_materials;
|
|
bool export_triangulated_mesh;
|
|
bool export_curves_as_nurbs;
|
|
|
|
/* Grouping options. */
|
|
bool export_object_groups;
|
|
bool export_material_groups;
|
|
bool export_vertex_groups;
|
|
/**
|
|
* Calculate smooth groups from sharp edges.
|
|
*/
|
|
bool export_smooth_groups;
|
|
/**
|
|
* Create bitflags instead of the default "0"/"1" group IDs.
|
|
*/
|
|
bool smooth_groups_bitflags;
|
|
};
|
|
|
|
struct OBJImportParams {
|
|
/** Full path to the source OBJ file to import. */
|
|
char filepath[FILE_MAX];
|
|
/** Value 0 disables clamping. */
|
|
float clamp_size;
|
|
eTransformAxisForward forward_axis;
|
|
eTransformAxisUp up_axis;
|
|
bool validate_meshes;
|
|
};
|
|
|
|
/**
|
|
* Time the full import process.
|
|
*/
|
|
void OBJ_import(bContext *C, const struct OBJImportParams *import_params);
|
|
|
|
/**
|
|
* C-interface for the exporter.
|
|
*/
|
|
void OBJ_export(bContext *C, const struct OBJExportParams *export_params);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|