1f7013fb90
This is a patch from Aras Pranckevicius, D13927. See that patch for full details. On Windows, the many small fprintfs were taking up a large amount of time and significant speedup comes from using snprintf into chained buffers, and writing them all out later. On both Windows and Linux, parallelizing the processing by Object can also lead to a significant increase in speed. The 3.0 splash screen scene exports 8 times faster than the current C++ exporter on a Windows machine with 32 threads, and 5.8 times faster on a Linux machine with 48 threads. There is admittedly more memory usage for this, but it is still using 25 times less memory than the old python exporter on the 3.0 splash screen scene, so this seems an acceptable tradeoff. If use cases come up for exporting obj files that exceed the memory size of users, a flag could be added to not parallelize and write the buffers out every so often.
91 lines
2.1 KiB
CMake
91 lines
2.1 KiB
CMake
# ***** BEGIN GPL LICENSE BLOCK *****
|
|
#
|
|
# This program is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU General Public License
|
|
# as published by the Free Software Foundation; either version 2
|
|
# of the License, or (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software Foundation,
|
|
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
# ***** END GPL LICENSE BLOCK *****
|
|
|
|
set(INC
|
|
.
|
|
./exporter
|
|
../../blenkernel
|
|
../../blenlib
|
|
../../bmesh
|
|
../../bmesh/intern
|
|
../../depsgraph
|
|
../../editors/include
|
|
../../makesdna
|
|
../../makesrna
|
|
../../nodes
|
|
../../windowmanager
|
|
../../../../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
|
|
|
|
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
|
|
)
|
|
|
|
set(LIB
|
|
bf_blenkernel
|
|
)
|
|
|
|
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_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()
|