-
-
Notifications
You must be signed in to change notification settings - Fork 205
Animation timeline #861
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
Draft
andybak
wants to merge
206
commits into
main
Choose a base branch
from
feature/animation
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Animation timeline #861
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Added StartTimeline on Cleared or Load sketches. Otherwise, the strokes that are out of frame will persist in the new or loaded sketch.
Updated DuplicateKeyFrame and SplitKeyFrame to account for grouped strokes. Previously it did not recognize grouped strokes, so when it was replicated to the new canvas, there was no key to the strokes, preventing users from selecting the stroke. When un-registered grouped strokes was selected, it will select the original grouped strokes in the previous canvas. Refactored blocks of code in DuplicateKeyFrame and SplitKeyFrame onto ReplicateStrokes.
Added new lines of code and parameter for ReplicateStrokes. Also renamed it to ReplicateStrokesToNewCanvas. DuplicateStrokes from SketchMemoryScript is also copying strokes that were marked NotCreated. This occurs when joining strokes are "uncreated" to complete the join.
Wholly changed ResetTimeline to prevent Destroy() and Instantiate() during Update(). Prefabs are made to accommodate this change, which contains 8 nodes (frames and notches) at start. As the frames increase, we instantiate the needed nodes for them. No instantiate will trigger if we have enough nodes. ResetTimeline() only contains other functions. A new function called UpdateNodes() handles the prefabs and instantiating of new nodes. UpdateTimelineSlider() is also updated to handle the scrolling of the new prefabs. "public List<GameObject> trackNodesWidget;" and "public GameObject frameNotchesWidget;" are declared in AnimationUI_Manager. In-editor, these are assigned their respective prefabs. trackNodesWidget will have a length of 7. These are childed under TimelineField, with frameNotchesWidget at index 0.
Fixed line of code in SketchWriter where it did not have an if-statement on the local dictionary. This resolves the issue with "deleted" canvases in the animation grid. Also fixed bug where deleted tracks are showing up when playing the timeline. "Deleted" canvases will not be saved as the SketchWriter will only recognize non-deleted canvases. Fixed SplitKeyFrames so it will return early if the head of the frame is selected.
Fixed ReplicateStrokes to account for Batches that do not have Geometry. This occurs when "erasing" joined strokes. The batch will be memorized, but there is no geometry. If no geometry, then we'll uncreate the batch. Fixed RemoveKeyFrame to break up a keyframe that has been extended. An empty extended keyframe will return an out-of-index error. updateFrameInfo is changed to disambiguate the UI. A colon implies there are seconds and nano-seconds when it's not the case.
…d sneaked back in
# Conflicts: # Assets/Scripts/ModelCatalog.cs # Assets/Scripts/Save/SketchMetadata.cs # Assets/Scripts/Widgets/ModelWidget.cs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.