Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix F3D build when added as a subproject #899

Merged
merged 4 commits into from
Jul 7, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix F3D build when added as a subproject
  • Loading branch information
Meakk committed Jul 6, 2023
commit 27d8b7ba6859ecd182c406f23a20255e21439aad
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.19)
cmake_minimum_required(VERSION 3.21)
include(CMakeDependentOption)

# Generic CMake variables, should be done before project()
Expand Down
14 changes: 7 additions & 7 deletions application/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
include("f3dEmbed")

f3d_embed_file(
INPUT "${CMAKE_SOURCE_DIR}/resources/logo32.png"
INPUT "${F3D_SOURCE_DIR}/resources/logo32.png"
NAME F3DIcon
BINARY)

Expand All @@ -19,7 +19,7 @@ set(F3D_SOURCE_FILES
)

if(WIN32)
list(APPEND F3D_SOURCE_FILES "${CMAKE_SOURCE_DIR}/resources/f3d.rc")
list(APPEND F3D_SOURCE_FILES "${F3D_SOURCE_DIR}/resources/f3d.rc")
endif()

if(APPLE)
Expand Down Expand Up @@ -52,21 +52,21 @@ if (APPLE)
elseif (UNIX)
set_target_properties(f3d PROPERTIES INSTALL_RPATH $ORIGIN/../${CMAKE_INSTALL_LIBDIR})
elseif (MSVC)
set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT f3d) # Set f3d as startup project in visual studio
set_property(DIRECTORY ${F3D_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT f3d) # Set f3d as startup project in visual studio
set_target_properties(f3d PROPERTIES VS_DEBUGGER_ENVIRONMENT "PATH=$<TARGET_FILE_DIR:VTK::CommonCore>") # Add VTK in MSVC PATH environment variable
endif ()

target_include_directories(f3d PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
if (F3D_USE_EXTERNAL_CXXOPTS)
target_link_libraries(f3d PRIVATE cxxopts::cxxopts)
else ()
target_include_directories(f3d PUBLIC $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/external/cxxopts>)
target_include_directories(f3d PUBLIC $<BUILD_INTERFACE:${F3D_SOURCE_DIR}/external/cxxopts>)
endif ()

if (F3D_USE_EXTERNAL_NLOHMANN_JSON)
target_link_libraries(f3d PRIVATE nlohmann_json::nlohmann_json)
else ()
target_include_directories(f3d PUBLIC $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/external/nlohmann_json>)
target_include_directories(f3d PUBLIC $<BUILD_INTERFACE:${F3D_SOURCE_DIR}/external/nlohmann_json>)
endif ()

set(f3d_compile_options_private "")
Expand Down Expand Up @@ -102,7 +102,7 @@ if(F3D_MACOS_BUNDLE)

# Add logo icon
set(MACOSX_BUNDLE_ICON_FILE logo.icns)
set(f3d_ICON ${CMAKE_SOURCE_DIR}/resources/logo.icns)
set(f3d_ICON ${F3D_SOURCE_DIR}/resources/logo.icns)
set_source_files_properties(${f3d_ICON} PROPERTIES
MACOSX_PACKAGE_LOCATION "Resources")
target_sources(f3d PRIVATE ${f3d_ICON})
Expand All @@ -118,7 +118,7 @@ if(F3D_MACOS_BUNDLE)
set(MACOSX_BUNDLE_COPYRIGHT "Michael Migliore, Mathieu Westphal")

# Generate MacOS bundle
configure_file("${CMAKE_SOURCE_DIR}/resources/BundleInfo.plist.in"
configure_file("${F3D_SOURCE_DIR}/resources/BundleInfo.plist.in"
"${CMAKE_CURRENT_BINARY_DIR}/BundleInfo.plist")
set_target_properties(f3d PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_BINARY_DIR}/BundleInfo.plist")
endif()
Expand Down
128 changes: 64 additions & 64 deletions application/testing/CMakeLists.txt

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion cmake/f3dPlugin.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ macro(f3d_plugin_build)
set(_f3d_plugins_install_dir ${f3d_PLUGINS_INSTALL_DIR})
else()
# In-source plugin path
set(_f3d_include_path "${CMAKE_SOURCE_DIR}/library/plugin")
set(_f3d_include_path "${F3D_SOURCE_DIR}/library/plugin")
set(_f3d_config_dir ${f3d_config_dir})
set(_f3d_plugins_install_dir ${F3D_PLUGINS_INSTALL_DIR})
endif()
Expand Down
2 changes: 1 addition & 1 deletion java/testing/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ foreach(test_file ${javaf3dTests_list})
-Djava.library.path=$<SHELL_PATH:$<TARGET_FILE_DIR:javaf3d>> # path to the JNI library
${java_test_args}
-cp $<SHELL_PATH:$<TARGET_PROPERTY:f3d-jar,JAR_FILE>> # path to the JAR file
$<SHELL_PATH:${test_file}> ${CMAKE_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/
$<SHELL_PATH:${test_file}> ${F3D_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/
)

set_tests_properties(javaf3d::${TName} PROPERTIES DISABLED ${java_test_disabled})
Expand Down
16 changes: 8 additions & 8 deletions library/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ if (F3D_USE_EXTERNAL_NLOHMANN_JSON)
target_link_libraries(libf3d PRIVATE nlohmann_json::nlohmann_json)
else ()
target_include_directories(libf3d PRIVATE
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/external/nlohmann_json>)
$<BUILD_INTERFACE:${F3D_SOURCE_DIR}/external/nlohmann_json>)
endif ()

set_target_properties(libf3d PROPERTIES
Expand Down Expand Up @@ -196,7 +196,7 @@ if(BUILD_SHARED_LIBS)

include(CMakePackageConfigHelpers)
configure_package_config_file(
"${CMAKE_SOURCE_DIR}/cmake/f3dConfig.cmake.in" "${CMAKE_BINARY_DIR}/cmake/f3dConfig.cmake"
"${F3D_SOURCE_DIR}/cmake/f3dConfig.cmake.in" "${CMAKE_BINARY_DIR}/cmake/f3dConfig.cmake"
INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/f3d")

write_basic_package_version_file(
Expand All @@ -208,12 +208,12 @@ if(BUILD_SHARED_LIBS)
FILES
"${CMAKE_BINARY_DIR}/cmake/f3dConfig.cmake"
"${CMAKE_BINARY_DIR}/cmake/f3dConfigVersion.cmake"
"${CMAKE_SOURCE_DIR}/cmake/f3dEmbed.cmake"
"${CMAKE_SOURCE_DIR}/cmake/f3dPlugin.cmake"
"${CMAKE_SOURCE_DIR}/cmake/plugin.cxx.in"
"${CMAKE_SOURCE_DIR}/cmake/plugin.desktop.in"
"${CMAKE_SOURCE_DIR}/cmake/plugin.thumbnailer.in"
"${CMAKE_SOURCE_DIR}/cmake/readerBoilerPlate.h.in"
"${F3D_SOURCE_DIR}/cmake/f3dEmbed.cmake"
"${F3D_SOURCE_DIR}/cmake/f3dPlugin.cmake"
"${F3D_SOURCE_DIR}/cmake/plugin.cxx.in"
"${F3D_SOURCE_DIR}/cmake/plugin.desktop.in"
"${F3D_SOURCE_DIR}/cmake/plugin.thumbnailer.in"
"${F3D_SOURCE_DIR}/cmake/readerBoilerPlate.h.in"
DESTINATION
"${CMAKE_INSTALL_LIBDIR}/cmake/f3d"
COMPONENT sdk
Expand Down
2 changes: 1 addition & 1 deletion library/VTKExtensions/Applicative/Testing/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ endif()
vtk_add_test_cxx(VTKExtensionsApplicativeTests tests
NO_DATA NO_VALID NO_OUTPUT
${test_sources}
${CMAKE_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
${F3D_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
vtk_test_cxx_executable(VTKExtensionsApplicativeTests tests)
2 changes: 1 addition & 1 deletion library/VTKExtensions/Core/Testing/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ endif()
vtk_add_test_cxx(VTKExtensionsCoreTests tests
NO_DATA NO_VALID NO_OUTPUT
TestF3DLog.cxx
${CMAKE_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
${F3D_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
vtk_test_cxx_executable(VTKExtensionsCoreTests tests)

if(UNIX)
Expand Down
2 changes: 1 addition & 1 deletion library/VTKExtensions/Readers/Testing/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ endif()
vtk_add_test_cxx(VTKExtensionsReaderTests tests
NO_DATA NO_VALID NO_OUTPUT
${VTKExtensionsReaderTests_list}
${CMAKE_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
${F3D_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
vtk_test_cxx_executable(VTKExtensionsReaderTests tests)

2 changes: 1 addition & 1 deletion library/VTKExtensions/Rendering/Testing/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ vtk_add_test_cxx(VTKExtensionsRenderingTests tests
TestF3DRenderer.cxx
TestF3DRendererWithColoring.cxx
TestF3DCachedTexturesPrint.cxx
${CMAKE_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
${F3D_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
vtk_test_cxx_executable(VTKExtensionsRenderingTests tests)
6 changes: 3 additions & 3 deletions library/testing/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ if(VTK_VERSION VERSION_GREATER_EQUAL 9.1.20220519)
endif()

# Configure the log file for dropfile test
configure_file("${CMAKE_SOURCE_DIR}/testing/recordings/TestSDKInteractorCallBack.log.in"
configure_file("${F3D_SOURCE_DIR}/testing/recordings/TestSDKInteractorCallBack.log.in"
"${CMAKE_BINARY_DIR}/TestSDKInteractorCallBack.log") # Dragon.vtu; S
configure_file("${CMAKE_SOURCE_DIR}/testing/recordings/TestSDKInteractorDropFullScene.log.in"
configure_file("${F3D_SOURCE_DIR}/testing/recordings/TestSDKInteractorDropFullScene.log.in"
"${CMAKE_BINARY_DIR}/TestSDKInteractorDropFullScene.log") # world.obj; S

# External window tests
Expand Down Expand Up @@ -92,7 +92,7 @@ list(APPEND libf3dSDKTestsNoRender_list
# Add all the ADD_TEST for each test
foreach (test ${libf3dSDKTests_list})
get_filename_component (TName ${test} NAME_WE)
add_test (NAME libf3d::${TName} COMMAND libf3dSDKTests ${TName} "${CMAKE_SOURCE_DIR}/testing/" "${CMAKE_BINARY_DIR}/Testing/Temporary/" "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
add_test (NAME libf3d::${TName} COMMAND libf3dSDKTests ${TName} "${F3D_SOURCE_DIR}/testing/" "${CMAKE_BINARY_DIR}/Testing/Temporary/" "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
set_tests_properties(libf3d::${TName} PROPERTIES TIMEOUT 30)
if (NOT F3D_TESTING_ENABLE_RENDERING_TESTS AND NOT ${TName} IN_LIST libf3dSDKTestsNoRender_list)
set_tests_properties(libf3d::${TName} PROPERTIES DISABLED ON)
Expand Down
4 changes: 2 additions & 2 deletions plugins/alembic/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.19)
cmake_minimum_required(VERSION 3.21)

project(f3d-plugin-alembic)

include(GNUInstallDirs)

# Check if the plugin is built externally
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
if(PROJECT_IS_TOP_LEVEL)
find_package(f3d REQUIRED)
else()
include(f3dPlugin)
Expand Down
2 changes: 1 addition & 1 deletion plugins/alembic/module/Testing/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ endif()
vtk_add_test_cxx(VTKExtensionsPluginAlembic tests
NO_DATA NO_VALID NO_OUTPUT
${VTKExtensionsPluginAlembic_list}
${CMAKE_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
${F3D_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
vtk_test_cxx_executable(VTKExtensionsPluginAlembic tests)
4 changes: 2 additions & 2 deletions plugins/assimp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.19)
cmake_minimum_required(VERSION 3.21)

project(f3d-plugin-assimp)

include(GNUInstallDirs)

# Check if the plugin is built externally
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
if(PROJECT_IS_TOP_LEVEL)
find_package(f3d REQUIRED)
else()
include(f3dPlugin)
Expand Down
2 changes: 1 addition & 1 deletion plugins/assimp/module/Testing/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ endif()
vtk_add_test_cxx(VTKExtensionsPluginAssimp tests
NO_DATA NO_VALID NO_OUTPUT
${VTKExtensionsPluginAssimp_list}
${CMAKE_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
${F3D_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
vtk_test_cxx_executable(VTKExtensionsPluginAssimp tests)
4 changes: 2 additions & 2 deletions plugins/draco/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.19)
cmake_minimum_required(VERSION 3.21)

project(f3d-plugin-draco)

include(GNUInstallDirs)

# Check if the plugin is built externally
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
if(PROJECT_IS_TOP_LEVEL)
find_package(f3d REQUIRED)
else()
include(f3dPlugin)
Expand Down
2 changes: 1 addition & 1 deletion plugins/draco/module/Testing/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ endif()
vtk_add_test_cxx(VTKExtensionsPluginDraco tests
NO_DATA NO_VALID NO_OUTPUT
${VTKExtensionsPluginDraco_list}
${CMAKE_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
${F3D_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
vtk_test_cxx_executable(VTKExtensionsPluginDraco tests)
4 changes: 2 additions & 2 deletions plugins/exodus/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.19)
cmake_minimum_required(VERSION 3.21)

project(f3d-plugin-exodus)

include(GNUInstallDirs)

# Check if the plugin is built externally
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
if(PROJECT_IS_TOP_LEVEL)
find_package(f3d REQUIRED)
else()
include(f3dPlugin)
Expand Down
8 changes: 7 additions & 1 deletion plugins/native/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
cmake_minimum_required(VERSION 3.21)

project(f3d-plugin-native)

include(GNUInstallDirs)

# Only internal build is supported for static plugins
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
if(PROJECT_IS_TOP_LEVEL)
message(FATAL_ERROR "native plugin cannot be built externally")
endif()

Expand Down
4 changes: 2 additions & 2 deletions plugins/occt/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.19)
cmake_minimum_required(VERSION 3.21)

project(f3d-plugin-occt)

include(GNUInstallDirs)

# Check if the plugin is built externally
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
if(PROJECT_IS_TOP_LEVEL)
find_package(f3d REQUIRED)
else()
include(f3dPlugin)
Expand Down
2 changes: 1 addition & 1 deletion plugins/occt/module/Testing/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ endif()
vtk_add_test_cxx(VTKExtensionsPluginOCCT tests
NO_DATA NO_VALID NO_OUTPUT
${VTKExtensionsPluginOCCT_list}
${CMAKE_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
${F3D_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
vtk_test_cxx_executable(VTKExtensionsPluginOCCT tests)
2 changes: 1 addition & 1 deletion python/testing/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ list(APPEND pyf3dTestsNoRender_list
# Add all the ADD_TEST for each test
foreach(test ${pyf3dTests_list})
get_filename_component (TName ${test} NAME_WE)
add_test(NAME pyf3d::${TName} COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/${test} $<TARGET_FILE_DIR:VTK::CommonCore> ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
add_test(NAME pyf3d::${TName} COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/${test} $<TARGET_FILE_DIR:VTK::CommonCore> ${F3D_SOURCE_DIR} ${CMAKE_BINARY_DIR})
set_tests_properties(pyf3d::${TName} PROPERTIES
ENVIRONMENT "PYTHONPATH=$<TARGET_FILE_DIR:pyf3d>"
FAIL_REGULAR_EXPRESSION "AssertionError")
Expand Down
2 changes: 1 addition & 1 deletion testing/configs/hdri.json.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"global":
{
"hdri": "${CMAKE_SOURCE_DIR}/testing/data/palermo_park_1k.hdr"
"hdri": "${F3D_SOURCE_DIR}/testing/data/palermo_park_1k.hdr"
}
}
4 changes: 2 additions & 2 deletions testing/recordings/TestInteractionDropFiles.log.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ KeyPressEvent 677 699 0 0 1 Super_L 0
CharEvent 677 699 0 0 1 Super_L 0
UpdateDropLocationEvent 677 699 0 0 1 Super_L 0
EnterEvent 781 494 0 0 0 Super_L 0
DropFilesEvent 781 494 0 0 0 Super_L 1 1 ${CMAKE_SOURCE_DIR}/testing/data/cow.vtp
DropFilesEvent 781 494 0 0 0 Super_L 1 1 ${F3D_SOURCE_DIR}/testing/data/cow.vtp
RenderEvent 781 494 0 0 0 Super_L 0
MouseMoveEvent 781 498 0 0 0 Super_L 0
LeaveEvent 751 614 0 0 0 Super_L 0
EnterEvent 700 570 0 0 0 Super_L 0
MouseMoveEvent 700 570 0 0 0 Super_L 0
UpdateDropLocationEvent 677 699 0 0 1 Super_L 0
EnterEvent 781 494 0 0 0 Super_L 0
DropFilesEvent 781 494 0 0 0 Super_L 1 2 ${CMAKE_SOURCE_DIR}/testing/data/dragon.vtu ${CMAKE_SOURCE_DIR}/testing/data/suzanne.stl
DropFilesEvent 781 494 0 0 0 Super_L 1 2 ${F3D_SOURCE_DIR}/testing/data/dragon.vtu ${F3D_SOURCE_DIR}/testing/data/suzanne.stl
RenderEvent 781 494 0 0 0 Super_L 0
MouseMoveEvent 781 498 0 0 0 Super_L 0
LeaveEvent 751 614 0 0 0 Super_L 0
Expand Down
2 changes: 1 addition & 1 deletion testing/recordings/TestInteractionDropHDRI.log.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ KeyPressEvent 677 699 0 0 1 Super_L 0
CharEvent 677 699 0 0 1 Super_L 0
UpdateDropLocationEvent 677 699 0 0 1 Super_L 0
EnterEvent 781 494 0 0 0 Super_L 0
DropFilesEvent 781 494 0 0 0 Super_L 1 2 ${CMAKE_SOURCE_DIR}/testing/data/dragon.vtu ${CMAKE_SOURCE_DIR}/testing/data/palermo_park_1k.hdr
DropFilesEvent 781 494 0 0 0 Super_L 1 2 ${F3D_SOURCE_DIR}/testing/data/dragon.vtu ${F3D_SOURCE_DIR}/testing/data/palermo_park_1k.hdr
RenderEvent 781 494 0 0 0 Super_L 0
4 changes: 2 additions & 2 deletions testing/recordings/TestInteractionDropHDRIExr.log.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ KeyPressEvent 677 699 0 0 1 Super_L 0
CharEvent 677 699 0 0 1 Super_L 0
UpdateDropLocationEvent 677 699 0 0 1 Super_L 0
EnterEvent 781 494 0 0 0 Super_L 0
DropFilesEvent 781 494 0 0 0 Super_L 1 1 ${CMAKE_SOURCE_DIR}/testing/data/kloofendal_43d_clear_1k.exr
DropFilesEvent 781 494 0 0 0 Super_L 1 1 ${F3D_SOURCE_DIR}/testing/data/kloofendal_43d_clear_1k.exr
RenderEvent 781 494 0 0 0 Super_L 0
MouseMoveEvent 781 498 0 0 0 Super_L 0
LeaveEvent 751 614 0 0 0 Super_L 0
EnterEvent 700 570 0 0 0 Super_L 0
MouseMoveEvent 700 570 0 0 0 Super_L 0
UpdateDropLocationEvent 677 699 0 0 1 Super_L 0
EnterEvent 781 494 0 0 0 Super_L 0
DropFilesEvent 781 494 0 0 0 Super_L 1 1 ${CMAKE_SOURCE_DIR}/testing/data/dragon.vtu
DropFilesEvent 781 494 0 0 0 Super_L 1 1 ${F3D_SOURCE_DIR}/testing/data/dragon.vtu
RenderEvent 781 494 0 0 0 Super_L 0
MouseMoveEvent 781 498 0 0 0 Super_L 0
LeaveEvent 751 614 0 0 0 Super_L 0
Expand Down
6 changes: 3 additions & 3 deletions testing/recordings/TestInteractionDropSameFiles.log.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@ KeyPressEvent 677 699 0 0 1 Super_L 0
CharEvent 677 699 0 0 1 Super_L 0
UpdateDropLocationEvent 677 699 0 0 1 Super_L 0
EnterEvent 781 494 0 0 0 Super_L 0
DropFilesEvent 781 494 0 0 0 Super_L 1 1 ${CMAKE_SOURCE_DIR}/testing/data/cow.vtp
DropFilesEvent 781 494 0 0 0 Super_L 1 1 ${F3D_SOURCE_DIR}/testing/data/cow.vtp
RenderEvent 781 494 0 0 0 Super_L 0
MouseMoveEvent 781 498 0 0 0 Super_L 0
LeaveEvent 751 614 0 0 0 Super_L 0
EnterEvent 700 570 0 0 0 Super_L 0
MouseMoveEvent 700 570 0 0 0 Super_L 0
UpdateDropLocationEvent 677 699 0 0 1 Super_L 0
EnterEvent 781 494 0 0 0 Super_L 0
DropFilesEvent 781 494 0 0 0 Super_L 1 1 ${CMAKE_SOURCE_DIR}/testing/data/dragon.vtu
DropFilesEvent 781 494 0 0 0 Super_L 1 1 ${F3D_SOURCE_DIR}/testing/data/dragon.vtu
RenderEvent 781 494 0 0 0 Super_L 0
MouseMoveEvent 781 498 0 0 0 Super_L 0
LeaveEvent 751 614 0 0 0 Super_L 0
EnterEvent 700 570 0 0 0 Super_L 0
MouseMoveEvent 700 570 0 0 0 Super_L 0
UpdateDropLocationEvent 677 699 0 0 1 Super_L 0
EnterEvent 781 494 0 0 0 Super_L 0
DropFilesEvent 781 494 0 0 0 Super_L 1 1 ${CMAKE_SOURCE_DIR}/testing/data/cow.vtp
DropFilesEvent 781 494 0 0 0 Super_L 1 1 ${F3D_SOURCE_DIR}/testing/data/cow.vtp
RenderEvent 781 494 0 0 0 Super_L 0
MouseMoveEvent 781 498 0 0 0 Super_L 0
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ KeyPressEvent 677 699 0 0 1 Super_L 0
CharEvent 677 699 0 0 1 Super_L 0
UpdateDropLocationEvent 677 699 0 0 1 Super_L 0
EnterEvent 781 494 0 0 0 Super_L 0
DropFilesEvent 781 494 0 0 0 Super_L 1 1 ${CMAKE_SOURCE_DIR}/testing/data/mb/mb_2_0.vtp
DropFilesEvent 781 494 0 0 0 Super_L 1 1 ${F3D_SOURCE_DIR}/testing/data/mb/mb_2_0.vtp
RenderEvent 781 494 0 0 0 Super_L 0
MouseMoveEvent 781 498 0 0 0 Super_L 0
2 changes: 1 addition & 1 deletion testing/recordings/TestSDKInteractorCallBack.log.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ KeyPressEvent 677 699 0 0 1 Super_L 0
CharEvent 677 699 0 0 1 Super_L 0
UpdateDropLocationEvent 677 699 0 0 1 Super_L 0
EnterEvent 781 494 0 0 0 Super_L 0
DropFilesEvent 781 494 0 0 0 Super_L 1 1 ${CMAKE_SOURCE_DIR}/testing/data/dragon.vtu
DropFilesEvent 781 494 0 0 0 Super_L 1 1 ${F3D_SOURCE_DIR}/testing/data/dragon.vtu
RenderEvent 781 494 0 0 0 Super_L 0
MouseMoveEvent 781 498 0 0 0 Super_L 0
LeaveEvent 751 614 0 0 0 Super_L 0
Expand Down
2 changes: 1 addition & 1 deletion testing/recordings/TestSDKInteractorDropFullScene.log.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ KeyPressEvent 677 699 0 0 1 Super_L 0
CharEvent 677 699 0 0 1 Super_L 0
UpdateDropLocationEvent 677 699 0 0 1 Super_L 0
EnterEvent 781 494 0 0 0 Super_L 0
DropFilesEvent 781 494 0 0 0 Super_L 1 1 ${CMAKE_SOURCE_DIR}/testing/data/world.obj
DropFilesEvent 781 494 0 0 0 Super_L 1 1 ${F3D_SOURCE_DIR}/testing/data/world.obj
RenderEvent 781 494 0 0 0 Super_L 0
MouseMoveEvent 781 498 0 0 0 Super_L 0
LeaveEvent 751 614 0 0 0 Super_L 0
Expand Down
Loading