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

Toggleable orthographic camera added. #1098

Closed
wants to merge 1,433 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
1433 commits
Select commit Hold shift + click to select a range
d37bb7a
Merge pull request #818 from mwestphal/fix_version
mwestphal May 20, 2023
da82acd
fix cppcheck (#825)
mwestphal May 22, 2023
768743a
Add F3D_PLUGINS_INSTALL_DIR
topazus May 23, 2023
2c2b6de
Fix plugins install dir
mwestphal May 23, 2023
20bca75
Add soname to shared library (#822)
bkmgit May 23, 2023
6a92abb
Fix f3dVersion logic (#820)
mwestphal May 23, 2023
def92d6
Merge pull request #828 from mwestphal/fix-plugins-cmake
mwestphal May 23, 2023
54216f3
Add a drop zone (#827)
mwestphal May 25, 2023
877ccd6
Fix an issue with the drop zone when no mapper is set (#829)
mwestphal May 26, 2023
614264d
Fix an issue with window not reset when loading another unsupported f…
mwestphal May 28, 2023
6b1a434
Camera: Reset using screenspace (#833)
mwestphal May 31, 2023
57dec2d
Add options to use external libraries of nlohmann-json and cxxopts (#…
topazus Jun 1, 2023
901ebb2
Adding --camera-direction and --camera-zoom-factor (#834)
mwestphal Jun 1, 2023
4a0fefc
Keep camera on reload (#788)
mwestphal Jun 2, 2023
b8c4ad9
Fix use external to ensure it works well with VTK (#840)
mwestphal Jun 3, 2023
ac0c956
Remove elses (#839)
mwestphal Jun 3, 2023
d40ec87
Add horizontal zoom support and option to invert zoom (#843)
DeveloperPaul123 Jun 6, 2023
6afde75
Rework animation suport (#836)
mwestphal Jun 7, 2023
cf51f90
Add reader for .exr images (#844)
Meakk Jun 7, 2023
4b93b63
Add a LFS data dedicated job (#850)
mwestphal Jun 7, 2023
0030068
Add MatCap texture option (#851)
Meakk Jun 8, 2023
5cad8da
Update VTK CI and Package (#838)
mwestphal Jun 13, 2023
afd7fa5
`--camera-zoom-factor` metavar (#857)
snoyer Jun 16, 2023
7355a86
Initialize lib in instance instead of global (#853)
mwestphal Jun 18, 2023
7542a72
CI: Download LFS if cache/artifacts system do not work (#859)
mwestphal Jun 19, 2023
788bf48
Add typo suggestion (#852)
Meakk Jun 19, 2023
f617a71
Fix testing documentation (#860)
Meakk Jun 20, 2023
89a7f58
Add support for dropping HDRI (#861)
mwestphal Jun 21, 2023
1092a02
Update F3D Version to 2.1.0-RC1 (#865)
mwestphal Jun 21, 2023
849c1a0
Add missing code block in the documentation (#866)
Meakk Jun 22, 2023
ba6b90b
Fix thumbnailer mimetype generation (#868)
mwestphal Jun 22, 2023
c47f452
Merge pull request #870 from f3d-app/master
Meakk Jun 23, 2023
afff99a
Build TBB in CI (#872)
Meakk Jun 23, 2023
0d5cf3f
Fix drop hdri (#873)
mwestphal Jun 29, 2023
059cfb1
Fix drop hdri (#873)
mwestphal Jun 29, 2023
e3d0dd3
Alternative python `point3_t` and `vector3_t` refactor (#869)
snoyer Jun 29, 2023
7ff3d18
Merge pull request #875 from mwestphal/backports_release
mwestphal Jun 29, 2023
8186662
2.1.0-RC2 (#876)
mwestphal Jun 29, 2023
5445e7f
Improve HDRI caching performance (#881)
Meakk Jun 30, 2023
79bcb14
Change global orientation (#882)
mwestphal Jul 1, 2023
22788e5
change version to v2.1.0-RC3 (#883)
mwestphal Jul 1, 2023
85dfe6c
Merge pull request #884 from f3d-app/release
mwestphal Jul 1, 2023
5596a22
Change version to 2.1.0 (#888)
mwestphal Jul 2, 2023
14d91c6
Merge pull request #889 from f3d-app/release
mwestphal Jul 2, 2023
a9abf1d
FreeBSD compatibility patch (#893)
yurivict Jul 3, 2023
fa92ba4
Update changelog and links for 2.1.0 (#892)
mwestphal Jul 3, 2023
1047726
Improve release template (#891)
mwestphal Jul 3, 2023
07d9cc2
Fix matcap with tcoords (#898)
Meakk Jul 5, 2023
7541102
Add shortcut to rotate camera (#863)
lknknm Jul 7, 2023
9c41354
refactor camera transition code (#862)
snoyer Jul 7, 2023
3f713f3
Fix F3D build when added as a subproject (#899)
Meakk Jul 7, 2023
cd8c7a8
Add a missing link to plugin doc (#903)
mwestphal Jul 8, 2023
0653d85
Adding changelog process (#905)
mwestphal Jul 8, 2023
a1ec54c
Fix an initialized var with f3d version logic (#904)
mwestphal Jul 8, 2023
875c750
Fix a segfault in draco reader by checking decoding output (#907)
mwestphal Jul 9, 2023
41beb6a
Uniformize draco CI options with SB (#909)
mwestphal Jul 9, 2023
ca76333
Adding draco changelog (#910)
mwestphal Jul 9, 2023
e82e5ff
Support for wider channel size in f3d::image (#858)
Meakk Jul 10, 2023
4d2b03c
Add a dedicated CI for exclude deprecated
mwestphal Jul 10, 2023
e3ed8cc
Fix cache logic for supplementery builds
mwestphal Jul 10, 2023
d8e6836
Fix a deprecated usage
mwestphal Jul 10, 2023
a32f7e6
Add deprecated image python API tests back
mwestphal Jul 10, 2023
a576f8d
Adding CHANGELOG for #858
mwestphal Jul 10, 2023
2259fab
Fix an issue in the image deprecated python bindings
mwestphal Jul 10, 2023
33ca2c6
Adding a SDK Deprecated test
mwestphal Jul 10, 2023
0bdeeb2
fix cppcheck
mwestphal Jul 11, 2023
2d26fa8
Merge pull request #911 from mwestphal/improve_exclude_deprecated_ci
mwestphal Jul 11, 2023
edc0dee
clean up CMake files (#914)
Meakk Jul 13, 2023
83b5c98
Add support for no file testing
mwestphal Jul 15, 2023
0f0ba35
Adding NoFile tests
mwestphal Jul 15, 2023
a27a811
Introduce __init__.py in the Python package (#915)
Meakk Jul 16, 2023
05f6ea6
Merge pull request #916 from mwestphal/no_file_testing
mwestphal Jul 16, 2023
2c3a92a
Adding a test for #877
mwestphal Jul 16, 2023
5868e19
Refactor HDRI Logic
mwestphal Jul 15, 2023
d0ec966
Merge pull request #917 from mwestphal/refactor_hdri_logic
mwestphal Jul 16, 2023
a3a6074
Support for scikit-build core (#920)
Meakk Jul 18, 2023
78d5cb0
Avoid installation of useless files (#922)
Meakk Jul 18, 2023
464b577
Fix cheatsheet draw (#912)
lknknm Jul 20, 2023
1ed5a79
Fix hdri lighting (#926)
mwestphal Jul 24, 2023
78dde10
Fix an issue with dropping HDRIs after a model (#929)
mwestphal Jul 27, 2023
5392ee1
Update min cmake version to avoid ci warning (#931)
mwestphal Jul 27, 2023
6b35046
Always use the same renderer (#925)
mwestphal Jul 28, 2023
173da0b
Modularize HDRI logic in multiple methods
mwestphal Jul 25, 2023
381cbd6
Switch to file hash for HDRI
mwestphal Jul 25, 2023
f563b9f
Improve doc and changelog
mwestphal Jul 28, 2023
e996173
Merge pull request #928 from mwestphal/rework_hdri_logic
mwestphal Jul 28, 2023
e41b006
Decorrelate HDRIFile, HDRI Skybox and IBL
mwestphal Aug 2, 2023
d90e205
Add libf3d level hdri-ambient and hdri-skybox
mwestphal Aug 2, 2023
aeed8c7
Add new --hdri-ambient and --hdri-skybox options
mwestphal Aug 2, 2023
4fcfc9f
Add and improve tests
mwestphal Aug 2, 2023
ed5c655
Add documentation for all changes
mwestphal Aug 2, 2023
a413c13
Remove unused testing cmake option
mwestphal Aug 2, 2023
b6fd8c1
Merge pull request #932 from mwestphal/hdri_hide_improved
mwestphal Aug 2, 2023
48908df
Install dependencies (#938)
Meakk Aug 3, 2023
ab8a4d7
Rework HDRI deprecation
mwestphal Aug 3, 2023
2e2bb43
Improve deprecated HDRI option testing
mwestphal Aug 3, 2023
419d6e2
Merge pull request #939 from mwestphal/rework_deprec_hdri
mwestphal Aug 4, 2023
66a3af5
Rename OSPRay test into Raytracing tests
Aug 5, 2023
ce45e38
Adding interaction configure
Aug 5, 2023
2a5a86e
fixup raytracing
Aug 5, 2023
b438e86
Merge pull request #940 from f3d-app/cleanup_testing
mwestphal Aug 5, 2023
7384253
Fix an small issue in the HDRI cheatsheet
mwestphal Aug 18, 2023
48e9a7f
Merge pull request #945 from mwestphal/fix_hdri_cheatsheet
mwestphal Aug 18, 2023
499b63b
Fix progress bar testing
mwestphal Aug 19, 2023
029d423
Merge pull request #948 from mwestphal/fix_progress_bar
mwestphal Aug 20, 2023
737164d
Update VTK commit to the last vtk release commit
mwestphal Aug 22, 2023
76a1cbe
OCC BRep format (#946)
snoyer Aug 23, 2023
57ecb15
Fix android CI
mwestphal Aug 23, 2023
288eb3c
Revert "Fix android CI"
mwestphal Aug 23, 2023
f379c2f
Fix for cache building
mwestphal Aug 23, 2023
4434e71
correct commit
mwestphal Aug 23, 2023
0331629
prefix path
mwestphal Aug 23, 2023
6b25148
find root paht
mwestphal Aug 23, 2023
cc030a4
updating again to last master
mwestphal Aug 23, 2023
69aac8e
Fix slight change in edges
mwestphal Aug 24, 2023
f888cf4
Merge pull request #951 from mwestphal/update_vtk_commit
mwestphal Aug 27, 2023
6f4c467
CI: Fix TBB build for external_build and static_analysis (#960)
mwestphal Aug 28, 2023
d76b6e1
Add Default HDRI and use it in config file (#950)
mwestphal Aug 29, 2023
a9d86d8
Fix OSPRay color space (#963)
Meakk Aug 29, 2023
09467cd
CI: Split CI into actions (#958)
mwestphal Aug 30, 2023
c22b25f
Improve Skybox actor logic (#952)
mwestphal Aug 30, 2023
1cfa445
Use Sequential SMP for sanitizer CI (#965)
mwestphal Aug 30, 2023
51ab0e8
Adding a nightly workflow (#955)
mwestphal Aug 31, 2023
a51e84c
Fix OSPRay overlay actors (#967)
Meakk Sep 1, 2023
621a1e6
Rendering: Update mapper and renderer for new version of VTK IBL with…
mwestphal Aug 27, 2023
0402a8b
Update VTK version in use
mwestphal Sep 2, 2023
c28fa96
Merge pull request #956 from mwestphal/ibl_fixup_vtk
mwestphal Sep 2, 2023
cc60ab7
Fix VTK version recovery in nightly (#970)
mwestphal Sep 3, 2023
a8fdf79
Improve Python integration (#962)
Meakk Sep 5, 2023
ffd1004
Fix wasm CI (#973)
Meakk Sep 5, 2023
fd6ed66
Refactor CI and enable Apple Silicon (#974)
Meakk Sep 7, 2023
9929a9e
HDRI: Fix performance and writing issues (#975)
mwestphal Sep 7, 2023
d7333d1
CI: Check required inputs in actions
mwestphal Sep 8, 2023
a551cf9
CI: Add missing input in nightly VTK CI
mwestphal Sep 8, 2023
b69270b
CI: Small macos related fixes
mwestphal Sep 8, 2023
c1ec03d
CI: Refactor cross platform nightly in multiple jobs
mwestphal Sep 8, 2023
d30e18d
Merge pull request #977 from mwestphal/fix_ci_required_inputs
mwestphal Sep 8, 2023
37eb110
Load from memory API (#978)
Meakk Sep 11, 2023
5c1acde
Python: Remove need to run pytest from src (#979)
mwestphal Sep 12, 2023
7b698c9
Fix load from memory (#980)
Meakk Sep 12, 2023
acfe4b9
Remove unsupported std::reduce (#981)
Meakk Sep 12, 2023
efc5310
Update VTK for wasm update (#985)
mwestphal Sep 13, 2023
f3471b9
Fix exr can read check and segfault
mwestphal Sep 13, 2023
954b704
vtkF3DEXRReader: Add a test for invalid code path
mwestphal Sep 14, 2023
0d93171
useless wasm nightly (#988)
mwestphal Sep 14, 2023
f00c8de
Merge pull request #986 from mwestphal/fix_exr_reader
mwestphal Sep 14, 2023
a82ed9d
Fix no exr build (#990)
mwestphal Sep 14, 2023
961dd8e
Adding a no_optional_deps CI (#991)
mwestphal Sep 14, 2023
ebe0861
CI: Update nightly VTK wasm version (#989)
mwestphal Sep 14, 2023
a4fa6d1
Rework load from memory (#983)
Meakk Sep 14, 2023
62a438d
CMake: Check for LFS data
mwestphal Sep 15, 2023
8956682
CI: Fix CI for LFS data check
mwestphal Sep 15, 2023
51d1b5f
EXR: Fix a potential issue with filename handling
mwestphal Sep 15, 2023
01aac21
EXR: Improve testing coverage for invalid code path
mwestphal Sep 15, 2023
06cf839
Merge pull request #993 from mwestphal/exr_coverage
mwestphal Sep 15, 2023
3c90b2e
Merge pull request #992 from mwestphal/check_lfs
mwestphal Sep 15, 2023
2389dc0
Improve windows trouble shooting doc (#998)
mwestphal Sep 17, 2023
2dba13e
Updating VTK version (#1002)
mwestphal Sep 25, 2023
b377edd
Adding a Getting Started guide (#999)
mwestphal Sep 29, 2023
54b4497
Remove broken bindings (#1005)
Meakk Sep 29, 2023
c60db05
Merge pull request #1006 from f3d-app/master
mwestphal Sep 29, 2023
2aeeecf
Update version number to 2.2.0-RC1
mwestphal Sep 29, 2023
ceb4fa8
Merge pull request #1007 from mwestphal/2.2.0-RC1_branch
mwestphal Sep 30, 2023
63677fa
Update version to 2.2.0-RC2
mwestphal Sep 30, 2023
1869f85
Merge pull request #1012 from mwestphal/2.2.0-RC2_version
mwestphal Sep 30, 2023
eacc9e4
Improve versioning (#1022)
mwestphal Oct 1, 2023
6b67cb1
CI: Reenable testing
mwestphal Oct 1, 2023
b07c95d
Fix python testing
mwestphal Oct 1, 2023
d1e48d8
Reset the loader when loading an invalid file
mwestphal Oct 1, 2023
798165e
Cannot use regexp testing in VTK testing level
mwestphal Oct 1, 2023
997d702
Merge pull request #1025 from mwestphal/fix_testing
mwestphal Oct 1, 2023
a7b6168
upload coverage test results (#1026)
mwestphal Oct 1, 2023
7cde6da
Fix an issue with invalid option log not being shown on windows (#1024)
mwestphal Oct 1, 2023
baf50f6
Merge pull request #1023 from mwestphal/reset_on_load_empty
mwestphal Oct 1, 2023
48f6a01
Update version to 2.2.0-RC3
mwestphal Oct 1, 2023
f38b833
Merge pull request #1027 from mwestphal/2.2.0-RC3_version
mwestphal Oct 1, 2023
877a9fd
Merge pull request #1028 from f3d-app/release
mwestphal Oct 1, 2023
479fe96
2.2.0 version (#1029)
mwestphal Oct 1, 2023
bdf5253
Merge pull request #1030 from f3d-app/release
mwestphal Oct 1, 2023
c0d24cb
Revert "Fix an issue with log window being on top in some cases (#686)"
mwestphal Oct 2, 2023
898bacf
Merge pull request #1031 from mwestphal/revert_bring_window_to_top
mwestphal Oct 2, 2023
59304fe
2.2.1 version
mwestphal Oct 2, 2023
34417a5
Merge pull request #1032 from mwestphal/2.2.1-rc1
mwestphal Oct 2, 2023
60b9357
Fix spellcheck (#1035)
mwestphal Oct 3, 2023
24f1aaa
2.2.1-RC2 version
mwestphal Oct 3, 2023
b879051
Merge pull request #1034 from mwestphal/2.2.1-RC2_version
mwestphal Oct 3, 2023
25281eb
Update version to 2.2.1
mwestphal Oct 4, 2023
2df008c
Merge pull request #1036 from mwestphal/2.2.1_version
mwestphal Oct 4, 2023
d686b75
Merge pull request #1038 from f3d-app/release
mwestphal Oct 4, 2023
7719e88
Update Changelog and install doc
mwestphal Oct 4, 2023
aabe0cb
Adding macOS silicon related doc
mwestphal Oct 4, 2023
3dd09d3
Merge pull request #1039 from mwestphal/update_doc
mwestphal Oct 5, 2023
ed894c1
Fix PyPI package page (#1037)
Meakk Oct 5, 2023
07d6c6e
Improve macos doc (#1043)
mwestphal Oct 6, 2023
f007bff
fix `grid-absolute` for off-center models (#1049)
snoyer Oct 11, 2023
b40c3c4
Update new release (#1040)
mwestphal Oct 13, 2023
8eddb96
Convert Alembic importer to reader (#1048)
Meakk Oct 21, 2023
5075583
doc: Fix case for platform links (#1053)
jspanchu Oct 22, 2023
0a5fb66
libf3d: fix set default window name inside lib
shaikan Oct 26, 2023
6a60ef0
Merge pull request #1057 from shaikan/fix-setting-default-window-name…
mwestphal Oct 26, 2023
773209d
Ci Uplifts (#1054)
mwestphal Oct 27, 2023
e272618
Thumbnail: Add `quiet` to config file (#1062)
mwestphal Nov 7, 2023
83ea30e
feat(opt): add autoplay
technologeli Nov 12, 2023
14f0686
docs(opt): add autoplay
technologeli Nov 12, 2023
f037d90
Updating VTK version (#1064)
mwestphal Nov 12, 2023
971b178
test: autoplay
technologeli Nov 13, 2023
2235a1b
Merge branch 'f3d-app:master' into autoplay
technologeli Nov 13, 2023
4f834cb
docs: changelog and user option
technologeli Nov 14, 2023
01565ff
Merge pull request #1065 from technologeli/autoplay
mwestphal Nov 14, 2023
9780ba7
Update Arch Linux package URL in INSTALLATION.md
felixonmars Nov 21, 2023
394e127
Merge pull request #1073 from felixonmars/patch-1
mwestphal Nov 21, 2023
4c80bcd
Alembic texture and normals handling
nyue Oct 22, 2023
a04c875
Alembic improvements
mwestphal Nov 15, 2023
153413c
Merge pull request #1069 from mwestphal/reader_alembic_uv_normal_support
mwestphal Nov 21, 2023
21f46e4
Add USD support (#819)
Meakk Nov 22, 2023
8641276
Add VTK 9.3 in CI (#1068)
Meakk Nov 23, 2023
9e3c1e0
fix: some typos in doc and comments
zhiyuang Nov 27, 2023
fcab3d9
Merge pull request #1080 from zhiyuang/fix-some-typos
mwestphal Nov 27, 2023
93ec6da
Adding a clear github link (#1079)
mwestphal Nov 28, 2023
5d598cb
CI: Update Android NDK version
mwestphal Nov 30, 2023
e849b10
Updating VTK commit SHA
mwestphal Nov 30, 2023
f249cc7
Merge pull request #1083 from mwestphal/fix_android_ci
mwestphal Nov 30, 2023
169e935
Handle commas in filenames (#1078)
snoyer Dec 1, 2023
f86ab1d
CI: Use inputs instead of env var for android (#1084)
mwestphal Dec 1, 2023
925b8fe
HDRI: Fix a wrong size of specular cache (#1086)
mwestphal Dec 5, 2023
b46094c
Put F3D window on top of output window (#1088)
mwestphal Dec 6, 2023
ecb67bf
CI: Also scan plugin dir for clang format
mwestphal Dec 7, 2023
1a2316c
Style: Fix USD style with clang format
mwestphal Dec 7, 2023
7df1789
Merge pull request #1089 from mwestphal/improve_clf_ci
mwestphal Dec 8, 2023
7027fc0
CI: Updating VTK commit SHA (#1090)
mwestphal Dec 8, 2023
7e55df2
Doc: Adding new packages to the list (#1091)
mwestphal Dec 9, 2023
4c54c72
Improve USD integration (#1082)
Meakk Dec 10, 2023
d68d6a2
Options: Improve F3D logging system and add VTK output to --verbose
mwestphal Dec 4, 2023
649ce50
Tests: Improving verbose testing
mwestphal Dec 7, 2023
2490bb3
Doc: Removing deprecated options
mwestphal Dec 7, 2023
942b07c
Deprecation: Remove deprecated usage of --quiet
mwestphal Dec 8, 2023
5479c0c
Doc: Add changelog
mwestphal Dec 8, 2023
de4e2b2
Tests: Adding USD config tests (#1094)
mwestphal Dec 10, 2023
487e3e0
Merge pull request #1085 from mwestphal/thirdparties_debug
mwestphal Dec 10, 2023
ea7293e
Fix inexistent warning in GCC < 9 (#1097)
Meakk Dec 11, 2023
9efc4b6
Toggleable orthographic camera added.
aemreaydin Dec 12, 2023
705699b
Cleaning up camera toggle options
aemreaydin Dec 13, 2023
1328fcc
Orthographic projection code moved to renderer.
aemreaydin Dec 15, 2023
c640fa4
Fixed a change made to ToneMapping test by mistake.
aemreaydin Dec 15, 2023
90b5cfc
Camera Index fix, alongside with styling errors.
aemreaydin Dec 18, 2023
486041a
Remove CMake deprecation check for 9.0 (#1106)
Meakk Dec 19, 2023
2aca783
rebase from upstream
aemreaydin Dec 19, 2023
fcb0f97
Save image to buffer (#1105)
Meakk Dec 19, 2023
2286b96
Enable depth peeling in default config (#1102)
Meakk Dec 19, 2023
532bdb4
rebased from upstream
aemreaydin Dec 19, 2023
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
Prev Previous commit
Next Next commit
Fix an issue with window not reset when loading another unsupported f…
…ile (#831)

* Fix an issue with window not reset when loading another file
mwestphal authored May 28, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 614264de76967461cca02fed3daccb3548b8c5c7
2 changes: 1 addition & 1 deletion application/testing/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -452,7 +452,7 @@ f3d_test(NAME TestInteractionVolumeInverse DATA HeadMRVolume.mhd ARGS --camera-p
f3d_test(NAME TestInteractionPointCloud DATA pointsCloud.vtp ARGS --point-size=20 INTERACTION) #O
f3d_test(NAME TestInteractionDirectory DATA mb INTERACTION ARGS --scalars DEFAULT_LIGHTS) #Right;Right;Right;Left;Up;
f3d_test(NAME TestInteractionDirectoryLoop DATA mb INTERACTION ARGS --scalars DEFAULT_LIGHTS) #Left;Left;Left;
f3d_test(NAME TestInteractionDirectoryEmptyVerbose DATA mb ARGS --verbose NO_BASELINE INTERACTION REGEXP "Provided geometry file path is empty") #Right;Right;Right;
f3d_test(NAME TestInteractionDirectoryEmptyVerbose DATA mb ARGS --verbose NO_BASELINE INTERACTION REGEXP "is not a file of a supported file format") #Right;Right;Right;HMCSY
f3d_test(NAME TestInteractionGLTFReaderWithAnimation DATA BoxAnimated.gltf INTERACTION ARGS --geometry-only DEFAULT_LIGHTS) #Space;Space;
f3d_test(NAME TestInteractionAnimationNotStopped DATA InterpolationTest.glb NO_BASELINE INTERACTION)#Space;Space;
f3d_test(NAME TestInteractionResetCamera DATA dragon.vtu INTERACTION DEFAULT_LIGHTS)#MouseMovements;Return;
Original file line number Diff line number Diff line change
@@ -2,12 +2,26 @@
#include <vtkTestUtilities.h>
#include <vtkXMLUnstructuredGridReader.h>

#include "vtkF3DConfigure.h"
#include "vtkF3DGenericImporter.h"
#include "vtkF3DRendererWithColoring.h"

int TestF3DRendererWithColoring(int argc, char* argv[])
{
vtkNew<vtkF3DRendererWithColoring> renderer;

// Check error paths
if (renderer->GetColoringArrayName() != F3D_RESERVED_STRING)
{
std::cerr << "Unexpected coloring information without an importer" << std::endl;
return EXIT_FAILURE;
}
if (!renderer->GetColoringDescription().empty())
{
std::cerr << "Unexpected coloring description without an importer" << std::endl;
return EXIT_FAILURE;
}

vtkNew<vtkF3DGenericImporter> importer;
renderer->SetImporter(importer);

58 changes: 45 additions & 13 deletions library/VTKExtensions/Rendering/vtkF3DRendererWithColoring.cxx
Original file line number Diff line number Diff line change
@@ -239,7 +239,10 @@ void vtkF3DRendererWithColoring::SetPointSize(double pointSize)
{
this->Superclass::SetPointSize(pointSize);

assert(this->Importer != nullptr);
if (!this->Importer)
{
return;
}

const vtkBoundingBox& bbox = this->Importer->GetGeometryBoundingBox();
double gaussianPointSize = 1.0;
@@ -291,7 +294,10 @@ void vtkF3DRendererWithColoring::SetUseVolume(bool use)
//----------------------------------------------------------------------------
void vtkF3DRendererWithColoring::SetUseInverseOpacityFunction(bool use)
{
assert(this->Importer != nullptr);
if (!this->Importer)
{
return;
}

if (this->UseInverseOpacityFunction != use)
{
@@ -354,6 +360,11 @@ void vtkF3DRendererWithColoring::SetColormap(const std::vector<double>& colormap
//----------------------------------------------------------------------------
void vtkF3DRendererWithColoring::CycleScalars(CycleType type)
{
if (!this->Importer)
{
return;
}

switch (type)
{
case (CycleType::NONE):
@@ -387,7 +398,7 @@ void vtkF3DRendererWithColoring::CycleScalars(CycleType type)
//----------------------------------------------------------------------------
vtkF3DRendererWithColoring::CycleType vtkF3DRendererWithColoring::CheckColoring()
{
assert(this->Importer != nullptr);
assert(this->Importer);

// Never force change of anything if we are currently not coloring
if (this->ArrayIndexForColoring == -1)
@@ -421,10 +432,13 @@ vtkF3DRendererWithColoring::CycleType vtkF3DRendererWithColoring::CheckColoring(
void vtkF3DRendererWithColoring::SetColoring(
bool useCellData, const std::string& arrayName, int component)
{
if (!this->Importer)
{
return;
}

// XXX This should be reworked to avoid handling multiple information in one parameters
// while still being future-proof and flexible enough.
assert(this->Importer != nullptr);

if (this->GetColoringUseCell() != useCellData || this->GetColoringArrayName() != arrayName ||
this->GetColoringComponent() != component)
{
@@ -478,7 +492,10 @@ bool vtkF3DRendererWithColoring::GetColoringUseCell()
//----------------------------------------------------------------------------
std::string vtkF3DRendererWithColoring::GetColoringArrayName()
{
assert(this->Importer != nullptr);
if (!this->Importer)
{
return F3D_RESERVED_STRING;
}

vtkF3DGenericImporter::ColoringInfo info;
if (this->Importer->GetInfoForColoring(this->UseCellColoring, this->ArrayIndexForColoring, info))
@@ -500,7 +517,12 @@ int vtkF3DRendererWithColoring::GetColoringComponent()
//----------------------------------------------------------------------------
void vtkF3DRendererWithColoring::UpdateActors()
{
assert(this->Importer != nullptr);
if (!this->Importer)
{
// Importer is nullptr, still call superclass to render other actors
this->Superclass::UpdateActors();
return;
}

// Handle importer changes
vtkMTimeType importerMTime = this->Importer->GetMTime();
@@ -678,7 +700,10 @@ void vtkF3DRendererWithColoring::ConfigureColoring()
//----------------------------------------------------------------------------
std::string vtkF3DRendererWithColoring::GetColoringDescription()
{
assert(this->Importer != nullptr);
if (!this->Importer)
{
return "";
}

std::stringstream stream;
vtkF3DGenericImporter::ColoringInfo info;
@@ -868,7 +893,11 @@ void vtkF3DRendererWithColoring::ConfigureRangeAndCTFForColoring(
//----------------------------------------------------------------------------
void vtkF3DRendererWithColoring::FillCheatSheetHotkeys(std::stringstream& cheatSheetText)
{
assert(this->Importer != nullptr);
if (!this->Importer)
{
this->Superclass::FillCheatSheetHotkeys(cheatSheetText);
return;
}

vtkF3DGenericImporter::ColoringInfo info;
bool hasColoring =
@@ -901,7 +930,7 @@ void vtkF3DRendererWithColoring::CycleFieldForColoring()
//----------------------------------------------------------------------------
void vtkF3DRendererWithColoring::CycleArrayIndexForColoring()
{
assert(this->Importer != nullptr);
assert(this->Importer);

int nIndex = this->Importer->GetNumberOfIndexesForColoring(this->UseCellColoring);
if (nIndex <= 0)
@@ -924,7 +953,7 @@ void vtkF3DRendererWithColoring::CycleArrayIndexForColoring()
//----------------------------------------------------------------------------
void vtkF3DRendererWithColoring::CycleComponentForColoring()
{
assert(this->Importer != nullptr);
assert(this->Importer);

vtkF3DGenericImporter::ColoringInfo info;
if (!this->Importer->GetInfoForColoring(this->UseCellColoring, this->ArrayIndexForColoring, info))
@@ -940,7 +969,10 @@ void vtkF3DRendererWithColoring::CycleComponentForColoring()
//----------------------------------------------------------------------------
std::string vtkF3DRendererWithColoring::GenerateMetaDataDescription()
{
assert(this->Importer != nullptr);
if (!this->Importer)
{
return "";
}

// XXX Padding should not be handled by manipulating string
// but on the actor directly, but it is not supported by VTK yet.
@@ -967,7 +999,7 @@ std::string vtkF3DRendererWithColoring::GenerateMetaDataDescription()
//----------------------------------------------------------------------------
std::string vtkF3DRendererWithColoring::ComponentToString(int component)
{
assert(this->Importer != nullptr);
assert(this->Importer);

if (component == -2)
{
18 changes: 9 additions & 9 deletions library/src/loader_impl.cxx
Original file line number Diff line number Diff line change
@@ -133,20 +133,26 @@ void loader_impl::setInteractor(interactor_impl* interactor)
//----------------------------------------------------------------------------
loader& loader_impl::loadGeometry(const std::string& filePath, bool reset)
{
bool windowInit = false;
if (!this->Internals->DefaultScene || reset)
{
// Reset the generic importer
this->Internals->GenericImporter->RemoveInternalReaders();

// Remove the importer from the renderer
this->Internals->Window.SetImporterForColoring(nullptr);

// Window initialization is needed
windowInit = true;
this->Internals->Window.Initialize(true);
}

// Check file validity
if (filePath.empty())
{
log::debug("Provided geometry file path is empty\n");
// Calling with reset is an usual codepath to reset the window
if (!reset)
{
log::debug("Provided geometry file path is empty\n");
}
return *this;
}
if (!vtksys::SystemTools::FileExists(filePath, true))
@@ -166,12 +172,6 @@ loader& loader_impl::loadGeometry(const std::string& filePath, bool reset)
filePath + " is not a file of a supported file format for default scene");
}

if (windowInit)
{
// Initialize the window with coloring
this->Internals->Window.Initialize(true);
}

// Read the file
log::debug("Loading: ", filePath, "\n");

8 changes: 6 additions & 2 deletions library/src/window_impl.cxx
Original file line number Diff line number Diff line change
@@ -371,7 +371,11 @@ void window_impl::PrintColoringDescription(log::VerboseLevel level)
vtkF3DRendererWithColoring::SafeDownCast(this->Internals->Renderer);
if (renWithColor)
{
log::print(level, renWithColor->GetColoringDescription());
std::string descr = renWithColor->GetColoringDescription();
if (!descr.empty())
{
log::print(level, descr);
}
}
}

@@ -426,7 +430,7 @@ void window_impl::SetImporterForColoring(vtkF3DGenericImporter* importer)
{
vtkF3DRendererWithColoring* renWithColor =
vtkF3DRendererWithColoring::SafeDownCast(this->Internals->Renderer);
if (renWithColor && importer)
if (renWithColor)
{
renWithColor->SetImporter(importer);
}
39 changes: 27 additions & 12 deletions testing/recordings/TestInteractionDirectoryEmptyVerbose.log
Original file line number Diff line number Diff line change
@@ -1,12 +1,27 @@
# StreamVersion 1.1
ExposeEvent 0 599 0 0 0 0
RenderEvent 0 599 0 0 0 0
KeyPressEvent 354 650 0 0 1 Right
CharEvent 354 650 0 0 1 Right
KeyReleaseEvent 354 650 0 0 1 Right
KeyPressEvent 354 650 0 0 1 Right
CharEvent 354 650 0 0 1 Right
KeyReleaseEvent 354 650 0 0 1 Right
KeyPressEvent 354 650 0 0 1 Right
CharEvent 354 650 0 0 1 Right
KeyReleaseEvent 354 650 0 0 1 Right
# StreamVersion 1.2
ExposeEvent 0 299 0 0 0 0 0
RenderEvent 0 299 0 0 0 0 0
KeyPressEvent 345 -446 0 0 1 Right 0
CharEvent 345 -446 0 0 1 Right 0
KeyReleaseEvent 345 -446 0 0 1 Right 0
KeyPressEvent 345 -446 0 0 1 Right 0
CharEvent 345 -446 0 0 1 Right 0
KeyReleaseEvent 345 -446 0 0 1 Right 0
KeyPressEvent 345 -446 0 0 1 Right 0
CharEvent 345 -446 0 0 1 Right 0
KeyReleaseEvent 345 -446 0 0 1 Right 0
KeyPressEvent 345 -446 0 104 1 h 0
CharEvent 345 -446 0 104 1 h 0
KeyReleaseEvent 345 -446 0 104 1 h 0
KeyPressEvent 345 -446 0 109 1 m 0
CharEvent 345 -446 0 109 1 m 0
KeyReleaseEvent 345 -446 0 109 1 m 0
KeyPressEvent 345 -446 0 99 1 c 0
CharEvent 345 -446 0 99 1 c 0
KeyReleaseEvent 345 -446 0 99 1 c 0
KeyPressEvent 345 -446 0 115 1 s 0
CharEvent 345 -446 0 115 1 s 0
KeyReleaseEvent 345 -446 0 115 1 s 0
KeyPressEvent 345 -446 0 121 1 y 0
CharEvent 345 -446 0 121 1 y 0
KeyReleaseEvent 345 -446 0 121 1 y 0