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

Feature animation controller #45

Merged
merged 26 commits into from
May 10, 2022
Merged

Conversation

kmilo9999
Copy link
Contributor

This PR Includes:

  • Camera animation
  • Slice Animation
  • Save user session with animation states
  • Fix record video
  • Labels reworked

Copy link
Member

@mirestrepo mirestrepo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is great a lot of work! My comments are mostly formatting. It would be nice if you can start heading towards smaller PRs, that would make it a bit easier to follow the logic changes as well.

include/UI/UIView.h Outdated Show resolved Hide resolved
include/UI/UIView.h Outdated Show resolved Hide resolved
include/UI/UIView.h Outdated Show resolved Hide resolved
include/UI/UIView.h Outdated Show resolved Hide resolved
include/interaction/ArcBallCamera.h Outdated Show resolved Hide resolved
libs/Texture/Texture.cpp Show resolved Hide resolved
libs/Texture/Texture.cpp Outdated Show resolved Hide resolved
src/loader/VRDataLoader.cpp Outdated Show resolved Hide resolved
src/render/VolumeRaycastShader.cpp Outdated Show resolved Hide resolved
src/vrapp/VolumeVisualizationApp.cpp Outdated Show resolved Hide resolved
Resources/Models/plane.obj Show resolved Hide resolved
include/UI/UIView.h Outdated Show resolved Hide resolved
include/UI/UIView.h Outdated Show resolved Hide resolved
include/UI/UIView.h Outdated Show resolved Hide resolved
include/UI/UIView.h Outdated Show resolved Hide resolved
src/render/VolumeRaycastShader.cpp Outdated Show resolved Hide resolved
src/vrapp/VolumeVisualizationApp.cpp Outdated Show resolved Hide resolved
src/vrapp/VolumeVisualizationApp.cpp Outdated Show resolved Hide resolved
src/vrapp/VolumeVisualizationApp.cpp Outdated Show resolved Hide resolved
src/vrapp/VolumeVisualizationApp.cpp Outdated Show resolved Hide resolved
Copy link
Member

@RobertGemmaJr RobertGemmaJr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good! Lots of good work going on here. I think the main things I've seen are

  • Delete commented out code
  • Fix tab indenting
  • Remove unnecessary extra lines
  • snake_case vs TitleCase vs camelCase consistency
  • Lots of if statements that can be consolidated to one line (or 2 without the { } if you prefer
  • I think a couple comments in places where the code gets super busy would go a long way - Mary pointed out some other ones as well

include/UI/UIView.h Outdated Show resolved Hide resolved
include/UI/UIView.h Outdated Show resolved Hide resolved
include/UI/UIView.h Outdated Show resolved Hide resolved
include/UI/UIView.h Outdated Show resolved Hide resolved
include/UI/UIView.h Outdated Show resolved Hide resolved
src/vrapp/VRVolumeApp.cpp Outdated Show resolved Hide resolved
src/vrapp/VolumeVisualizationApp.cpp Outdated Show resolved Hide resolved
src/vrapp/VolumeVisualizationApp.cpp Outdated Show resolved Hide resolved
src/vrapp/VolumeVisualizationApp.cpp Outdated Show resolved Hide resolved
src/vrapp/VolumeVisualizationApp.cpp Outdated Show resolved Hide resolved
@RobertGemmaJr RobertGemmaJr self-requested a review April 25, 2022 14:08
Resources/README.md Outdated Show resolved Hide resolved
include/interaction/ArcBallCamera.h Outdated Show resolved Hide resolved
include/interaction/ArcBallCamera.h Outdated Show resolved Hide resolved
include/render/VolumeRenderer.h Outdated Show resolved Hide resolved
include/vrapp/VolumeVisualizationApp.h Show resolved Hide resolved
src/vrapp/VolumeVisualizationApp.cpp Outdated Show resolved Hide resolved
src/vrapp/VolumeVisualizationApp.cpp Outdated Show resolved Hide resolved
src/vrapp/VolumeVisualizationApp.cpp Outdated Show resolved Hide resolved
src/vrapp/VolumeVisualizationApp.cpp Outdated Show resolved Hide resolved
src/vrapp/VolumeVisualizationApp.cpp Outdated Show resolved Hide resolved
@kmilo9999 kmilo9999 requested a review from RobertGemmaJr April 26, 2022 17:38
include/UI/UIView.h Outdated Show resolved Hide resolved
include/UI/UIView.h Outdated Show resolved Hide resolved
include/interaction/Labels.h Outdated Show resolved Hide resolved
include/interaction/PointOfInterests.h Outdated Show resolved Hide resolved
include/interaction/Simulation.h Show resolved Hide resolved
src/vrapp/VolumeVisualizationApp.cpp Outdated Show resolved Hide resolved
src/vrapp/VolumeVisualizationApp.cpp Outdated Show resolved Hide resolved
src/vrapp/VolumeVisualizationApp.cpp Outdated Show resolved Hide resolved
src/vrapp/VolumeVisualizationApp.cpp Outdated Show resolved Hide resolved
src/vrapp/VolumeVisualizationApp.cpp Outdated Show resolved Hide resolved
@kmilo9999 kmilo9999 requested a review from mcmcgrath13 April 28, 2022 18:40
Copy link

@mcmcgrath13 mcmcgrath13 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

great progress!! I still see quite a few older unresolved comments from both myself and @RobertGemmaJr

shaders/shader.frag Show resolved Hide resolved
src/UI/UIView.cpp Show resolved Hide resolved
src/vrapp/VRVolumeApp.cpp Outdated Show resolved Hide resolved
include/UI/UIView.h Show resolved Hide resolved
include/UI/UIView.h Outdated Show resolved Hide resolved
include/interaction/Simulation.h Show resolved Hide resolved
include/render/VolumeRenderer.h Outdated Show resolved Hide resolved
libs/Model/Model.cpp Show resolved Hide resolved
libs/UIHelpers/transfer_function_widget.cpp Show resolved Hide resolved
src/UI/UIView.cpp Outdated Show resolved Hide resolved
Copy link

@mcmcgrath13 mcmcgrath13 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few minor nits and @RobertGemmaJr still has some unresolved comments to look at, but let's get this merged!

src/vrapp/VRVolumeApp.cpp Outdated Show resolved Hide resolved
src/vrapp/VRVolumeApp.cpp Outdated Show resolved Hide resolved
src/vrapp/VRVolumeApp.cpp Outdated Show resolved Hide resolved
src/vrapp/VolumeVisualizationApp.cpp Outdated Show resolved Hide resolved
superbuild/CMakeLists.txt Outdated Show resolved Hide resolved
Copy link
Member

@RobertGemmaJr RobertGemmaJr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good! I'd just do a clean sweep of any unresolved convos

@kmilo9999 kmilo9999 requested a review from mcmcgrath13 May 10, 2022 16:17
Copy link
Member

@mirestrepo mirestrepo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I love the consistency in formatting!

@kmilo9999 kmilo9999 merged commit 3861253 into master May 10, 2022
@kmilo9999 kmilo9999 deleted the feature-animation-controller branch May 10, 2022 21:29
@kmilo9999 kmilo9999 mentioned this pull request May 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants