Tests: Geometry Nodes: add initial Import CSV node tests

Previously, the test files still had absolute instead of relative paths in them.

Pull Request: https://projects.blender.org/blender/blender/pulls/139020
This commit is contained in:
Jacques Lucke
2025-05-18 07:34:57 +02:00
parent d04699397b
commit 1816a2665e
13 changed files with 29 additions and 32 deletions

View File

@@ -484,9 +484,6 @@ option(WITH_IO_STL "Enable STL 3D file format support (*.stl)" ON)
option(WITH_IO_FBX "Enable FBX 3D file format support (*.fbx)" ON)
option(WITH_IO_GREASE_PENCIL "Enable grease-pencil file format IO (*.svg, *.pdf)" ON)
# Csv support
option(WITH_IO_CSV "Enable CSV file format support (*.csv)" ON)
# Sound output
option(WITH_SDL "Enable SDL for sound" OFF)
option(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)

View File

@@ -35,7 +35,6 @@ set(WITH_INPUT_NDOF OFF CACHE BOOL "" FORCE)
set(WITH_INTERNATIONAL OFF CACHE BOOL "" FORCE)
set(WITH_IO_PLY OFF CACHE BOOL "" FORCE)
set(WITH_IO_STL OFF CACHE BOOL "" FORCE)
set(WITH_IO_CSV OFF CACHE BOOL "" FORCE)
set(WITH_IO_WAVEFRONT_OBJ OFF CACHE BOOL "" FORCE)
set(WITH_IO_GREASE_PENCIL OFF CACHE BOOL "" FORCE)
set(WITH_IO_FBX OFF CACHE BOOL "" FORCE)

View File

@@ -2,16 +2,9 @@
#
# SPDX-License-Identifier: GPL-2.0-or-later
if(WITH_IO_WAVEFRONT_OBJ OR
WITH_IO_PLY OR
WITH_IO_STL OR
WITH_IO_GREASE_PENCIL OR
WITH_ALEMBIC OR
WITH_USD OR
WITH_IO_CSV OR
WITH_IO_FBX)
add_subdirectory(common)
endif()
add_subdirectory(common)
add_subdirectory(csv)
if(WITH_IO_WAVEFRONT_OBJ)
add_subdirectory(wavefront_obj)
@@ -44,7 +37,3 @@ endif()
if(WITH_USD)
add_subdirectory(usd)
endif()
if(WITH_IO_CSV)
add_subdirectory(csv)
endif()

View File

@@ -268,6 +268,8 @@ set(LIB
PRIVATE bf::imbuf::movie
PRIVATE bf::intern::guardedalloc
bf_nodes
bf_io_common
bf_io_csv
PRIVATE bf::intern::atomic
PRIVATE bf::extern::fmtlib
PRIVATE bf::extern::xxhash
@@ -275,14 +277,6 @@ set(LIB
PRIVATE bf::windowmanager
)
if(WITH_IO_CSV)
list(APPEND LIB
PRIVATE bf_io_common
PRIVATE bf_io_csv
)
add_definitions(-DWITH_IO_CSV)
endif()
if(WITH_IO_STL)
list(APPEND LIB
PRIVATE bf_io_common

View File

@@ -42,7 +42,6 @@ class LoadCsvCache : public memory_cache::CachedValue {
static void node_geo_exec(GeoNodeExecParams params)
{
#ifdef WITH_IO_CSV
const std::optional<std::string> path = params.ensure_absolute_path(
params.extract_input<std::string>("Path"));
if (!path) {
@@ -91,11 +90,6 @@ static void node_geo_exec(GeoNodeExecParams params)
}
params.set_output("Point Cloud", cached_value->geometry);
#else
params.error_message_add(NodeWarningType::Error,
TIP_("Disabled, Blender was compiled without CSV I/O"));
params.set_default_remaining_outputs();
#endif
}
static void node_register()

Binary file not shown.
1 version https://git-lfs.github.com/spec/v1
2 oid sha256:514c6abc3d8586bdef7735f6ecfa490b802bf7d16ca93811befe8c53f19f64a7
3 size 14

Binary file not shown.
1 version https://git-lfs.github.com/spec/v1
2 oid sha256:a7afad0e82f6597e78a927428b594cd56f261f1d714d0e388832d35efd97f151
3 size 22

Binary file not shown.
1 version https://git-lfs.github.com/spec/v1
2 oid sha256:3198008c17bef3095129fce795cb46c87112f887338290d32890640192126a07
3 size 20102

Binary file not shown.
1 version https://git-lfs.github.com/spec/v1
2 oid sha256:5b48d9d3cdef6faabeb68beaa5ea6cfdba30544b12165a288f85645672c9cbcc
3 size 12

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.