tempblade/creator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve ui

Browse Source 
add track properties editor
This commit is contained in:
Enrico Bühler
2023-05-30 23:58:36 +02:00
parent 28613c9214
commit 8d1f949280
33 changed files with 2777 additions and 3751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src-tauri/Cargo.lock generated
View File

@@ -3077,6 +3077,7 @@ dependencies = [
"tauri",
"tauri-build",
"tint",
"uuid",
]
[[package]]
@@ -3376,11 +3377,24 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
[[package]]
name = "uuid"
version = "1.3.2"
version = "1.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4dad5567ad0cf5b760e5665964bec1b47dfd077ba8a2544b513f3556d3d239a2"
checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2"
dependencies = [
"getrandom 0.2.9",
"rand 0.8.5",
"uuid-macro-internal",
]
[[package]]
name = "uuid-macro-internal"
version = "1.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f67b459f42af2e6e1ee213cb9da4dbd022d3320788c3fb3e1b893093f1e45da"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.16",
]
[[package]]

5
app/src-tauri/Cargo.toml
View File

@@ -12,7 +12,10 @@ edition = "2021"
[build-dependencies]
tauri-build = { version = "1.3", features = [] }
[dependencies]
uuid = { version = "1.3.3", features = ["v4", "fast-rng", "macro-diagnostics"] }
tauri = { version = "1.3", features = ["dialog-open", "dialog-save", "shell-open"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
@@ -22,9 +25,7 @@ logging_timer = "1.1.0"
rayon = "1.7"
font-kit = "0.11.0"
[features]
# this feature is used for production builds or when `devPath` points to the filesystem
# DO NOT REMOVE!!
custom-protocol = ["tauri/custom-protocol"]

1
app/src-tauri/src/animation/primitives/keyframe.rs
View File

@@ -12,6 +12,7 @@ use super::{
pub struct Keyframe {
pub value: f32,
pub offset: f32,
pub id: String,
pub interpolation: Option<InterpolationType>,
}

8
app/src-tauri/src/animation/primitives/tests.rs
View File

@@ -25,16 +25,19 @@ fn interpolates_the_input() {
let keyframes1 = Keyframes {
values: vec![
Keyframe {
id: "1".to_string(),
value: 0.0,
offset: 0.0,
interpolation: None,
},
Keyframe {
id: "2".to_string(),
value: 100.0,
offset: 1.0,
interpolation: None,
},
Keyframe {
id: "3".to_string(),
value: 300.0,
offset: 3.0,
interpolation: None,
@@ -45,11 +48,13 @@ fn interpolates_the_input() {
let keyframes2 = Keyframes {
values: vec![
Keyframe {
id: "4".to_string(),
value: -100.0,
offset: 0.0,
interpolation: None,
},
Keyframe {
id: "5".to_string(),
value: 0.0,
offset: 1.0,
interpolation: None,
@@ -145,16 +150,19 @@ fn gets_value_at_frame() {
let keyframes = Keyframes {
values: vec![
Keyframe {
id: "1".to_string(),
value: 0.0,
offset: 0.0,
interpolation: None,
},
Keyframe {
id: "2".to_string(),
value: 100.0,
offset: 1.0,
interpolation: None,
},
Keyframe {
id: "3".to_string(),
value: 300.0,
offset: 3.0,
interpolation: None,

4
app/src-tauri/src/animation/primitives/values.rs
View File

@@ -3,6 +3,7 @@ use super::{
keyframe::{Keyframe, Keyframes},
};
use serde::{Deserialize, Serialize};
use uuid::Uuid;
pub trait AnimatedValue<T> {
fn sort_keyframes(&mut self);
@@ -28,6 +29,7 @@ impl AnimatedFloat {
AnimatedFloat {
keyframes: Keyframes {
values: vec![Keyframe {
id: Uuid::new_v4().to_string(),
value: val,
offset: 0.0,
interpolation: None,
@@ -93,7 +95,7 @@ impl AnimatedValue<(f32, f32, f32)> for AnimatedFloatVec3 {
let z = self
.keyframes
.1
.2
.get_value_at_frame(curr_frame, animation_data, fps);
return (x, y, z);

12
app/src-tauri/src/animation/timeline.rs
View File

@@ -70,6 +70,7 @@ fn build_bg(offset: f32, paint: Paint, size: (i32, i32)) -> AnimatedRectEntity {
keyframes: Keyframes {
values: vec![
Keyframe {
id: "1".to_string(),
value: (size.0 * -1) as f32,
offset: 0.0,
interpolation: Some(InterpolationType::EasingFunction(
@@ -77,6 +78,7 @@ fn build_bg(offset: f32, paint: Paint, size: (i32, i32)) -> AnimatedRectEntity {
)),
},
Keyframe {
id: "2".to_string(),
value: 0.0,
offset: 5.0,
interpolation: None,
@@ -87,6 +89,7 @@ fn build_bg(offset: f32, paint: Paint, size: (i32, i32)) -> AnimatedRectEntity {
AnimatedFloat {
keyframes: Keyframes {
values: vec![Keyframe {
id: "3".to_string(),
value: 0.0,
offset: 0.0,
interpolation: None,
@@ -100,6 +103,7 @@ fn build_bg(offset: f32, paint: Paint, size: (i32, i32)) -> AnimatedRectEntity {
AnimatedFloat {
keyframes: Keyframes {
values: vec![Keyframe {
id: "4".to_string(),
interpolation: None,
value: size.0 as f32,
offset: 0.0,
@@ -109,6 +113,7 @@ fn build_bg(offset: f32, paint: Paint, size: (i32, i32)) -> AnimatedRectEntity {
AnimatedFloat {
keyframes: Keyframes {
values: vec![Keyframe {
id: "5".to_string(),
value: size.1 as f32,
offset: 0.0,
interpolation: None,
@@ -193,6 +198,7 @@ pub fn test_timeline_entities_at_frame(
keyframes: Keyframes {
values: vec![
Keyframe {
id: "1".to_string(),
value: 0.0,
offset: 0.0,
interpolation: Some(InterpolationType::Spring(
@@ -204,6 +210,7 @@ pub fn test_timeline_entities_at_frame(
)),
},
Keyframe {
id: "2".to_string(),
value: (size.0 / 2) as f32,
offset: 2.0,
interpolation: None,
@@ -214,6 +221,7 @@ pub fn test_timeline_entities_at_frame(
AnimatedFloat {
keyframes: Keyframes {
values: vec![Keyframe {
id: "3".to_string(),
value: (size.1 / 2) as f32,
offset: 0.0,
interpolation: None,
@@ -240,6 +248,7 @@ pub fn test_timeline_entities_at_frame(
keyframes: Keyframes {
values: vec![
Keyframe {
id: "5".to_string(),
value: 0.0,
offset: 0.0,
interpolation: Some(InterpolationType::Spring(
@@ -251,6 +260,8 @@ pub fn test_timeline_entities_at_frame(
)),
},
Keyframe {
id: "6".to_string(),
value: (size.0 / 2) as f32,
offset: 2.0,
interpolation: None,
@@ -261,6 +272,7 @@ pub fn test_timeline_entities_at_frame(
AnimatedFloat {
keyframes: Keyframes {
values: vec![Keyframe {
id: "7".to_string(),
value: ((size.1 / 2) as f32) + 80.0,
offset: 0.0,
interpolation: None,

12
app/src-tauri/src/fonts.rs
View File

@@ -1,4 +1,5 @@
use font_kit::source::SystemSource;
use rayon::prelude::*;
#[tauri::command]
pub fn get_system_fonts() -> Option<Vec<String>> {
@@ -9,7 +10,7 @@ pub fn get_system_fonts() -> Option<Vec<String>> {
match found_fonts {
Ok(found_fonts) => {
let font_names: Vec<String> = found_fonts
.iter()
.par_iter()
.map(|f| f.load())
.filter(|f| f.is_ok())
.map(|f| f.unwrap())
@@ -24,6 +25,15 @@ pub fn get_system_fonts() -> Option<Vec<String>> {
}
}
#[tauri::command]
pub fn get_system_families() -> Option<Vec<String>> {
let source = SystemSource::new();
let found_families = source.all_families();
found_families.ok()
}
#[tauri::command]
pub fn get_system_font(font_name: String) -> Option<Vec<u8>> {
let source = SystemSource::new();

3
app/src-tauri/src/main.rs
View File

@@ -3,7 +3,7 @@
use crate::{
animation::timeline::calculate_timeline_entities_at_frame,
fonts::{get_system_font, get_system_fonts},
fonts::{get_system_families, get_system_font, get_system_fonts},
};
pub mod animation;
@@ -14,6 +14,7 @@ fn main() {
.invoke_handler(tauri::generate_handler![
calculate_timeline_entities_at_frame,
get_system_font,
get_system_families,
get_system_fonts
])
.run(tauri::generate_context!())