Skip to content

Commit

Permalink
new zoom segment->keyframe algorithm (#250)
Browse files Browse the repository at this point in the history
* new zoom segment->keyframe algorithm

* feat: Draggable zoom segments

* handle display scaling for zoom gaps

* wayyyyyy more sound zoom implementation

* better zoom segment dragging

---------

Co-authored-by: Richie McIlroy <[email protected]>
  • Loading branch information
Brendonovich and richiemcilroy authored Jan 23, 2025
1 parent 2ed381f commit 674ee72
Show file tree
Hide file tree
Showing 12 changed files with 1,592 additions and 1,749 deletions.
383 changes: 241 additions & 142 deletions apps/desktop/src/routes/editor/Timeline.tsx

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/desktop/src/routes/editor/context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ export const [TrackContextProvider, useTrackContext] = createContextProvider(
isFreeForm: Accessor<boolean>;
}) => {
const [trackState, setTrackState] = createStore({
draggingHandle: false,
draggingSegment: false,
});
const bounds = createElementBounds(() => props.ref());

Expand Down
2 changes: 1 addition & 1 deletion crates/editor/src/editor.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::{sync::Arc, time::Instant};

use cap_media::{feeds::RawCameraFrame, frame_ws::WSFrame};
use cap_project::{BackgroundSource, ProjectConfiguration, RecordingMeta, XY};
use cap_project::{BackgroundSource, RecordingMeta, XY};
use cap_rendering::{
decoder::DecodedFrame, produce_frame, ProjectRecordings, ProjectUniforms, RenderVideoConstants,
};
Expand Down
2 changes: 1 addition & 1 deletion crates/project/src/configuration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ impl Default for BackgroundSource {
}
}

#[derive(Type, Serialize, Deserialize, Clone, Copy, Debug, Default)]
#[derive(Type, Serialize, Deserialize, Clone, Copy, Debug, Default, PartialEq)]
#[serde(rename_all = "camelCase")]
pub struct XY<T> {
pub x: T,
Expand Down
Loading

1 comment on commit 674ee72

@vercel
Copy link

@vercel vercel bot commented on 674ee72 Jan 23, 2025

Choose a reason for hiding this comment

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

Please sign in to comment.