Compare commits
45 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b596dc3410 | |||
| 6c360c4222 | |||
| 29d257eef0 | |||
| afbbebe4e6 | |||
| 96e4081bff | |||
| 772cb40c65 | |||
| c1f920a632 | |||
| de0a8dc342 | |||
| 9a790af3d5 | |||
| bc64f1b81d | |||
| 2db3bfbc6d | |||
| 4880c81d80 | |||
| b4210ce972 | |||
| b6f0a5025a | |||
| 4c02ea41da | |||
| a1ba9e8dde | |||
| 58624eb2ff | |||
| ad47e91d0a | |||
| aa5283a000 | |||
| 607f65c913 | |||
| 82ca2ced24 | |||
| bb64de1955 | |||
| 54949a9db0 | |||
| d841c9fdb4 | |||
| ad6d09b8a5 | |||
| e7b1000205 | |||
| 625828f7ed | |||
| 5cd8bf90c7 | |||
| fc54c4b9ee | |||
| 46861440fd | |||
| fdfea98c50 | |||
| a512eff61d | |||
| bbeff369e8 | |||
| 3788c3e631 | |||
| 2e61e5b629 | |||
| ea708dfe85 | |||
| 9f59e68b2c | |||
| 607cf17888 | |||
| 984cec5741 | |||
| 8eb84f6780 | |||
| 719f0c1332 | |||
| 064190d1a7 | |||
| a426c7bb98 | |||
| 440032ffdb | |||
| 7047679ace |
3
.cargo/config.toml
Normal file
3
.cargo/config.toml
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
[target.x86_64-pc-windows-gnu]
|
||||||
|
rustflags = ["-C", "link-args=-mwindows"]
|
||||||
|
|
||||||
38
.gitlab-ci.yml
Normal file
38
.gitlab-ci.yml
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
stages:
|
||||||
|
- build
|
||||||
|
|
||||||
|
build_linux:
|
||||||
|
stage: build
|
||||||
|
script:
|
||||||
|
- cargo build --release
|
||||||
|
- cp target/release/polymusic .
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- polymusic
|
||||||
|
- fonts/
|
||||||
|
- assets/
|
||||||
|
expire_in: 1 month
|
||||||
|
tags:
|
||||||
|
- linux
|
||||||
|
rules:
|
||||||
|
- if: $CI_COMMIT_TAG
|
||||||
|
when: on_success
|
||||||
|
- when: never
|
||||||
|
|
||||||
|
build_windows:
|
||||||
|
stage: build
|
||||||
|
script:
|
||||||
|
- cargo build --release --target x86_64-pc-windows-gnu
|
||||||
|
- cp target/x86_64-pc-windows-gnu/release/polymusic.exe .
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- polymusic.exe
|
||||||
|
- fonts/
|
||||||
|
- assets/
|
||||||
|
expire_in: 1 month
|
||||||
|
tags:
|
||||||
|
- windows
|
||||||
|
rules:
|
||||||
|
- if: $CI_COMMIT_TAG
|
||||||
|
when: on_success
|
||||||
|
- when: never
|
||||||
193
Cargo.lock
generated
193
Cargo.lock
generated
@@ -121,6 +121,12 @@ version = "0.2.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04"
|
checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "android-tzdata"
|
||||||
|
version = "0.1.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "android_system_properties"
|
name = "android_system_properties"
|
||||||
version = "0.1.5"
|
version = "0.1.5"
|
||||||
@@ -352,7 +358,7 @@ dependencies = [
|
|||||||
"bitflags 2.9.1",
|
"bitflags 2.9.1",
|
||||||
"cexpr",
|
"cexpr",
|
||||||
"clang-sys",
|
"clang-sys",
|
||||||
"itertools",
|
"itertools 0.13.0",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"regex",
|
"regex",
|
||||||
@@ -425,6 +431,15 @@ dependencies = [
|
|||||||
"piper",
|
"piper",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "borsh"
|
||||||
|
version = "1.5.7"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce"
|
||||||
|
dependencies = [
|
||||||
|
"cfg_aliases 0.2.1",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bumpalo"
|
name = "bumpalo"
|
||||||
version = "3.17.0"
|
version = "3.17.0"
|
||||||
@@ -533,6 +548,20 @@ version = "0.2.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
|
checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "chrono"
|
||||||
|
version = "0.4.41"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
|
||||||
|
dependencies = [
|
||||||
|
"android-tzdata",
|
||||||
|
"iana-time-zone",
|
||||||
|
"js-sys",
|
||||||
|
"num-traits",
|
||||||
|
"wasm-bindgen",
|
||||||
|
"windows-link",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "clang-sys"
|
name = "clang-sys"
|
||||||
version = "1.8.1"
|
version = "1.8.1"
|
||||||
@@ -1548,6 +1577,30 @@ version = "0.2.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
|
checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "iana-time-zone"
|
||||||
|
version = "0.1.63"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
|
||||||
|
dependencies = [
|
||||||
|
"android_system_properties",
|
||||||
|
"core-foundation-sys",
|
||||||
|
"iana-time-zone-haiku",
|
||||||
|
"js-sys",
|
||||||
|
"log",
|
||||||
|
"wasm-bindgen",
|
||||||
|
"windows-core 0.61.2",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "iana-time-zone-haiku"
|
||||||
|
version = "0.1.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
|
||||||
|
dependencies = [
|
||||||
|
"cc",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "iced"
|
name = "iced"
|
||||||
version = "0.13.1"
|
version = "0.13.1"
|
||||||
@@ -1562,6 +1615,23 @@ dependencies = [
|
|||||||
"thiserror",
|
"thiserror",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "iced_aw"
|
||||||
|
version = "0.12.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "582c517a94ce3205da98e9c10b26bb71aa36b7d7d084441d826dc912711d1bac"
|
||||||
|
dependencies = [
|
||||||
|
"cfg-if",
|
||||||
|
"chrono",
|
||||||
|
"getrandom 0.3.3",
|
||||||
|
"iced",
|
||||||
|
"iced_fonts 0.1.1",
|
||||||
|
"itertools 0.14.0",
|
||||||
|
"num-format",
|
||||||
|
"num-traits",
|
||||||
|
"web-time",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "iced_core"
|
name = "iced_core"
|
||||||
version = "0.13.2"
|
version = "0.13.2"
|
||||||
@@ -1577,11 +1647,30 @@ dependencies = [
|
|||||||
"once_cell",
|
"once_cell",
|
||||||
"palette",
|
"palette",
|
||||||
"rustc-hash 2.1.1",
|
"rustc-hash 2.1.1",
|
||||||
"smol_str",
|
"smol_str 0.2.2",
|
||||||
"thiserror",
|
"thiserror",
|
||||||
"web-time",
|
"web-time",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "iced_fonts"
|
||||||
|
version = "0.1.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "df7deb0800a850ee25c8a42559f72c0f249e577feb3aad37b9b65dc1e517e52a"
|
||||||
|
dependencies = [
|
||||||
|
"iced_core",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "iced_fonts"
|
||||||
|
version = "0.2.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "7db9d45e87bc3ac22ff82e2d9dea9139f1c055137f1e0f39df3d68110fcee7a9"
|
||||||
|
dependencies = [
|
||||||
|
"iced_core",
|
||||||
|
"iced_widget",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "iced_futures"
|
name = "iced_futures"
|
||||||
version = "0.13.2"
|
version = "0.13.2"
|
||||||
@@ -1757,6 +1846,15 @@ dependencies = [
|
|||||||
"either",
|
"either",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "itertools"
|
||||||
|
version = "0.14.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
|
||||||
|
dependencies = [
|
||||||
|
"either",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "itoa"
|
name = "itoa"
|
||||||
version = "1.0.15"
|
version = "1.0.15"
|
||||||
@@ -2176,6 +2274,16 @@ dependencies = [
|
|||||||
"syn 2.0.101",
|
"syn 2.0.101",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "num-format"
|
||||||
|
version = "0.4.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3"
|
||||||
|
dependencies = [
|
||||||
|
"arrayvec",
|
||||||
|
"itoa",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "num-traits"
|
name = "num-traits"
|
||||||
version = "0.2.19"
|
version = "0.2.19"
|
||||||
@@ -2725,15 +2833,19 @@ dependencies = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "polygomusic"
|
name = "polymusic"
|
||||||
version = "0.1.0"
|
version = "1.2.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"iced",
|
"iced",
|
||||||
|
"iced_aw",
|
||||||
|
"iced_fonts 0.2.1",
|
||||||
"kira",
|
"kira",
|
||||||
"regex",
|
"regex",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
|
"smol_str 0.3.2",
|
||||||
"tokio",
|
"tokio",
|
||||||
|
"winapi",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -3251,6 +3363,16 @@ dependencies = [
|
|||||||
"serde",
|
"serde",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "smol_str"
|
||||||
|
version = "0.3.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "9676b89cd56310a87b93dec47b11af744f34d5fc9f367b829474eec0a891350d"
|
||||||
|
dependencies = [
|
||||||
|
"borsh",
|
||||||
|
"serde",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "softbuffer"
|
name = "softbuffer"
|
||||||
version = "0.4.6"
|
version = "0.4.6"
|
||||||
@@ -4170,10 +4292,51 @@ version = "0.54.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
|
checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-result",
|
"windows-result 0.1.2",
|
||||||
"windows-targets 0.52.6",
|
"windows-targets 0.52.6",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows-core"
|
||||||
|
version = "0.61.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
|
||||||
|
dependencies = [
|
||||||
|
"windows-implement",
|
||||||
|
"windows-interface",
|
||||||
|
"windows-link",
|
||||||
|
"windows-result 0.3.4",
|
||||||
|
"windows-strings",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows-implement"
|
||||||
|
version = "0.60.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"syn 2.0.101",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows-interface"
|
||||||
|
version = "0.59.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"syn 2.0.101",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows-link"
|
||||||
|
version = "0.1.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows-result"
|
name = "windows-result"
|
||||||
version = "0.1.2"
|
version = "0.1.2"
|
||||||
@@ -4183,6 +4346,24 @@ dependencies = [
|
|||||||
"windows-targets 0.52.6",
|
"windows-targets 0.52.6",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows-result"
|
||||||
|
version = "0.3.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
|
||||||
|
dependencies = [
|
||||||
|
"windows-link",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows-strings"
|
||||||
|
version = "0.4.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
|
||||||
|
dependencies = [
|
||||||
|
"windows-link",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows-sys"
|
name = "windows-sys"
|
||||||
version = "0.45.0"
|
version = "0.45.0"
|
||||||
@@ -4487,7 +4668,7 @@ dependencies = [
|
|||||||
"rustix 0.38.44",
|
"rustix 0.38.44",
|
||||||
"sctk-adwaita",
|
"sctk-adwaita",
|
||||||
"smithay-client-toolkit",
|
"smithay-client-toolkit",
|
||||||
"smol_str",
|
"smol_str 0.2.2",
|
||||||
"tracing",
|
"tracing",
|
||||||
"unicode-segmentation",
|
"unicode-segmentation",
|
||||||
"wasm-bindgen",
|
"wasm-bindgen",
|
||||||
|
|||||||
18
Cargo.toml
18
Cargo.toml
@@ -1,7 +1,8 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "polygomusic"
|
name = "polymusic"
|
||||||
version = "0.1.0"
|
version = "1.2.0"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
build = "build.rs"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
iced = { version = "0.13.1", features = ["canvas", "tokio"] }
|
iced = { version = "0.13.1", features = ["canvas", "tokio"] }
|
||||||
@@ -10,3 +11,16 @@ tokio = {version = "1.45.1", features = ["time"]}
|
|||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { version = "1.0", features = ["derive"] }
|
||||||
serde_json = "1.0.140"
|
serde_json = "1.0.140"
|
||||||
regex = "1.11.1"
|
regex = "1.11.1"
|
||||||
|
iced_aw = {version = "0.12.2", default-features = true}
|
||||||
|
iced_fonts = "0.2.1"
|
||||||
|
smol_str = "0.3.2"
|
||||||
|
winapi = {version = "0.3", features = ["wincon", "winuser"]}
|
||||||
|
|
||||||
|
[profile.release]
|
||||||
|
opt-level = 3
|
||||||
|
lto = true
|
||||||
|
codegen-units = 1
|
||||||
|
panic = 'abort'
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
674
LICENSE
Normal file
674
LICENSE
Normal file
@@ -0,0 +1,674 @@
|
|||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
the GNU General Public License is intended to guarantee your freedom to
|
||||||
|
share and change all versions of a program--to make sure it remains free
|
||||||
|
software for all its users. We, the Free Software Foundation, use the
|
||||||
|
GNU General Public License for most of our software; it applies also to
|
||||||
|
any other work released this way by its authors. You can apply it to
|
||||||
|
your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to prevent others from denying you
|
||||||
|
these rights or asking you to surrender the rights. Therefore, you have
|
||||||
|
certain responsibilities if you distribute copies of the software, or if
|
||||||
|
you modify it: responsibilities to respect the freedom of others.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
|
or can get the source code. And you must show them these terms so they
|
||||||
|
know their rights.
|
||||||
|
|
||||||
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
|
that there is no warranty for this free software. For both users' and
|
||||||
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
|
changed, so that their problems will not be attributed erroneously to
|
||||||
|
authors of previous versions.
|
||||||
|
|
||||||
|
Some devices are designed to deny users access to install or run
|
||||||
|
modified versions of the software inside them, although the manufacturer
|
||||||
|
can do so. This is fundamentally incompatible with the aim of
|
||||||
|
protecting users' freedom to change the software. The systematic
|
||||||
|
pattern of such abuse occurs in the area of products for individuals to
|
||||||
|
use, which is precisely where it is most unacceptable. Therefore, we
|
||||||
|
have designed this version of the GPL to prohibit the practice for those
|
||||||
|
products. If such problems arise substantially in other domains, we
|
||||||
|
stand ready to extend this provision to those domains in future versions
|
||||||
|
of the GPL, as needed to protect the freedom of users.
|
||||||
|
|
||||||
|
Finally, every program is threatened constantly by software patents.
|
||||||
|
States should not allow patents to restrict development and use of
|
||||||
|
software on general-purpose computers, but in those that do, we wish to
|
||||||
|
avoid the special danger that patents applied to a free program could
|
||||||
|
make it effectively proprietary. To prevent this, the GPL assures that
|
||||||
|
patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU Affero General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the special requirements of the GNU Affero General Public License,
|
||||||
|
section 13, concerning interaction through a network will apply to the
|
||||||
|
combination as such.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU General Public License from time to time. Such new versions will
|
||||||
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) 2025 dukantic
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If the program does terminal interaction, make it output a short
|
||||||
|
notice like this when it starts in an interactive mode:
|
||||||
|
|
||||||
|
<program> Copyright (C) 2025 dukantic
|
||||||
|
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
|
parts of the General Public License. Of course, your program's commands
|
||||||
|
might be different; for a GUI interface, you would use an "about box".
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
|
For more information on this, and how to apply and follow the GNU GPL, see
|
||||||
|
<https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
The GNU General Public License does not permit incorporating your program
|
||||||
|
into proprietary programs. If your program is a subroutine library, you
|
||||||
|
may consider it more useful to permit linking proprietary applications with
|
||||||
|
the library. If this is what you want to do, use the GNU Lesser General
|
||||||
|
Public License instead of this License. But first, please read
|
||||||
|
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||||
@@ -6,6 +6,7 @@ Polymusic is an innovative music application inspired
|
|||||||
and rich audio textures, creating a unique auditory experience.
|
and rich audio textures, creating a unique auditory experience.
|
||||||
|
|
||||||
## Instalation
|
## Instalation
|
||||||
|
### With source code
|
||||||
|
|
||||||
>Install Rust and Cargo
|
>Install Rust and Cargo
|
||||||
>https://www.rust-lang.org/tools/install
|
>https://www.rust-lang.org/tools/install
|
||||||
@@ -13,6 +14,9 @@ Polymusic is an innovative music application inspired
|
|||||||
```
|
```
|
||||||
cargo run
|
cargo run
|
||||||
```
|
```
|
||||||
|
### Release
|
||||||
|
Release is available on gitlab. Download windows ou linux version.
|
||||||
|
Execute `Polymusic` or `Polymusic.exe`
|
||||||
|
|
||||||
## Files
|
## Files
|
||||||
|
|
||||||
|
|||||||
45
build.rs
Normal file
45
build.rs
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
use std::env;
|
||||||
|
use std::fs;
|
||||||
|
use std::path::Path;
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
println!("cargo:rerun-if-changed=assets");
|
||||||
|
println!("cargo:rerun-if-changed=fonts");
|
||||||
|
|
||||||
|
// Chemin vers target/debug ou target/release
|
||||||
|
let out_dir = env::var("OUT_DIR").unwrap();
|
||||||
|
let target_dir = Path::new(&out_dir)
|
||||||
|
.ancestors()
|
||||||
|
.nth(3) // On remonte pour arriver dans target/debug ou target/release
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
// Copie assets/
|
||||||
|
let _ = fs::remove_dir_all(target_dir.join("assets"));
|
||||||
|
fs::create_dir_all(target_dir.join("assets")).unwrap();
|
||||||
|
copy_dir("assets", target_dir.join("assets"));
|
||||||
|
|
||||||
|
// Copie fonts/
|
||||||
|
let _ = fs::remove_dir_all(target_dir.join("fonts"));
|
||||||
|
fs::create_dir_all(target_dir.join("fonts")).unwrap();
|
||||||
|
copy_dir("fonts", target_dir.join("fonts"));
|
||||||
|
#[cfg(windows)]
|
||||||
|
{
|
||||||
|
let mut res = winres::WindowsResource::new();
|
||||||
|
res.set("SubSystem", "Windows");
|
||||||
|
res.compile().unwrap();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn copy_dir(src: impl AsRef<Path>, dst: impl AsRef<Path>) {
|
||||||
|
for entry in fs::read_dir(src).unwrap() {
|
||||||
|
let entry = entry.unwrap();
|
||||||
|
let ty = entry.file_type().unwrap();
|
||||||
|
let dst_path = dst.as_ref().join(entry.file_name());
|
||||||
|
if ty.is_dir() {
|
||||||
|
fs::create_dir_all(&dst_path).unwrap();
|
||||||
|
copy_dir(entry.path(), &dst_path);
|
||||||
|
} else {
|
||||||
|
fs::copy(entry.path(), &dst_path).unwrap();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
fonts/EnvyCodeRNerdFontMono-Regular.ttf
Normal file
BIN
fonts/EnvyCodeRNerdFontMono-Regular.ttf
Normal file
Binary file not shown.
257
src/gui.rs
Normal file
257
src/gui.rs
Normal file
@@ -0,0 +1,257 @@
|
|||||||
|
use crate::message::Message;
|
||||||
|
|
||||||
|
use iced::alignment::{Horizontal, Vertical};
|
||||||
|
|
||||||
|
use iced::widget::{TextInput, column, text};
|
||||||
|
use iced::{Element, Theme};
|
||||||
|
use iced::{
|
||||||
|
Length, Padding,
|
||||||
|
widget::{Column, Container, button, canvas, container, pick_list, row, scrollable, slider},
|
||||||
|
};
|
||||||
|
use iced_aw::menu::{self, Item};
|
||||||
|
use iced_aw::menu_bar;
|
||||||
|
use iced_aw::widget::color_picker;
|
||||||
|
use iced_aw::widget::menu::Menu;
|
||||||
|
|
||||||
|
use std::f32::consts::PI;
|
||||||
|
|
||||||
|
use crate::Polymusic;
|
||||||
|
|
||||||
|
pub fn music_view(app: &Polymusic) -> iced::Element<Message> {
|
||||||
|
let mut i = 0;
|
||||||
|
let entries = app.all_sounds.clone();
|
||||||
|
//Create all polygon options
|
||||||
|
let polygon_rows: Vec<Element<Message>> = app
|
||||||
|
.music
|
||||||
|
.current_frame(app.current_delta)
|
||||||
|
.polygons
|
||||||
|
.iter()
|
||||||
|
.map(|polygon| {
|
||||||
|
let current_index = i;
|
||||||
|
let but = button(text("").size(20).center()).on_press(Message::SubmitColor(i));
|
||||||
|
let c = column![
|
||||||
|
row![
|
||||||
|
text(&polygon.name).size(24),
|
||||||
|
button(text("").size(20)).on_press(Message::Remove(i)),
|
||||||
|
color_picker(
|
||||||
|
polygon.show_color_picker,
|
||||||
|
polygon.color,
|
||||||
|
but,
|
||||||
|
Message::CancelColor(i),
|
||||||
|
move |color| Message::ChooseColor(i, color)
|
||||||
|
),
|
||||||
|
pick_list(entries.clone(), Some(&polygon.sound_name), move |s| {
|
||||||
|
Message::ChangeSound(current_index, s)
|
||||||
|
})
|
||||||
|
.text_size(20),
|
||||||
|
]
|
||||||
|
.spacing(20),
|
||||||
|
row![
|
||||||
|
TextInput::new("90", &polygon.global_teta.to_degrees().floor().to_string())
|
||||||
|
.on_input(move |new_value| Message::ChangeDegree(current_index, new_value))
|
||||||
|
.width(Length::FillPortion(1)),
|
||||||
|
row![
|
||||||
|
slider(0.0..=2.0 * PI, polygon.global_teta, move |f| {
|
||||||
|
Message::ChangeTeta(current_index, f)
|
||||||
|
})
|
||||||
|
.step(2. * PI / 10_000.)
|
||||||
|
.width(Length::FillPortion(9))
|
||||||
|
]
|
||||||
|
.padding(Padding::from(16)),
|
||||||
|
]
|
||||||
|
.spacing(5),
|
||||||
|
]
|
||||||
|
.spacing(10)
|
||||||
|
.into();
|
||||||
|
i += 1;
|
||||||
|
c
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
let ngon_options: Vec<String> = (5..=42).map(|sides| format!("Ngon{sides}")).collect();
|
||||||
|
let all_options: Vec<String> = [
|
||||||
|
"Segment",
|
||||||
|
"Triangle",
|
||||||
|
"Square",
|
||||||
|
"Nr6In30",
|
||||||
|
"Nr7In30",
|
||||||
|
"Nr8In30",
|
||||||
|
"Nr9In30",
|
||||||
|
"Nr8In42",
|
||||||
|
"Nr9In42",
|
||||||
|
"Nr10aIn42",
|
||||||
|
"Nr10bIn42",
|
||||||
|
]
|
||||||
|
.iter()
|
||||||
|
.map(|s| s.to_string())
|
||||||
|
.chain(ngon_options)
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
let polygon_column = scrollable(Column::with_children(polygon_rows).spacing(24));
|
||||||
|
|
||||||
|
let menu_tpl_1 = |items| Menu::new(items).max_width(200.0).offset(15.0).spacing(5.0);
|
||||||
|
let save_menu = menu_tpl_1(vec![
|
||||||
|
Item::new(button("Save File").on_press(Message::Save)),
|
||||||
|
Item::new(button("Load Menu").on_press(Message::GoToLoadView).style(
|
||||||
|
|theme: &Theme, status| {
|
||||||
|
let palette = theme.extended_palette();
|
||||||
|
|
||||||
|
match status {
|
||||||
|
button::Status::Active => {
|
||||||
|
if !app.already_save {
|
||||||
|
button::Style::default().with_background(palette.danger.strong.color)
|
||||||
|
} else {
|
||||||
|
button::primary(theme, status)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ => button::primary(theme, status),
|
||||||
|
}
|
||||||
|
},
|
||||||
|
)),
|
||||||
|
Item::new("CTRL+F for quit without save."),
|
||||||
|
]);
|
||||||
|
column![
|
||||||
|
menu_bar!((text("File").size(20), save_menu)(
|
||||||
|
text("Shortcuts").size(20),
|
||||||
|
menu_tpl_1(vec![
|
||||||
|
Item::new(" SPACE"),
|
||||||
|
Item::new(" CTRL+S"),
|
||||||
|
Item::new(" ARROW UP"),
|
||||||
|
Item::new(" CTRL+Z"),
|
||||||
|
Item::new(" CTRL+Y"),
|
||||||
|
])
|
||||||
|
))
|
||||||
|
.draw_path(menu::DrawPath::Backdrop)
|
||||||
|
.spacing(20),
|
||||||
|
text(&app.music.file_name)
|
||||||
|
.width(Length::FillPortion(1))
|
||||||
|
.size(32),
|
||||||
|
row![
|
||||||
|
container(
|
||||||
|
canvas(app.music.current_frame(app.current_delta))
|
||||||
|
.height(Length::FillPortion(1))
|
||||||
|
.width(Length::FillPortion(1))
|
||||||
|
),
|
||||||
|
column![
|
||||||
|
text("Polygon options").size(26),
|
||||||
|
pick_list(all_options, Some("Choose polygon".to_string()), |s| {
|
||||||
|
Message::AddPolygon(s)
|
||||||
|
})
|
||||||
|
.text_size(18),
|
||||||
|
polygon_column,
|
||||||
|
]
|
||||||
|
.spacing(10)
|
||||||
|
.height(Length::FillPortion(1))
|
||||||
|
.width(Length::FillPortion(2)),
|
||||||
|
]
|
||||||
|
.height(Length::FillPortion(2))
|
||||||
|
.spacing(20),
|
||||||
|
column![
|
||||||
|
row![
|
||||||
|
button(text(if app.paused { "" } else { "" }).size(28).center())
|
||||||
|
.on_press(if app.can_unpaused {
|
||||||
|
Message::TogglePaused
|
||||||
|
} else {
|
||||||
|
Message::None
|
||||||
|
})
|
||||||
|
.width(Length::FillPortion(1)),
|
||||||
|
row![
|
||||||
|
TextInput::new("MM:SS:CS", &app.str_time)
|
||||||
|
.on_input(|new_value| Message::ChangeDeltaString(new_value))
|
||||||
|
.size(28),
|
||||||
|
text("/").size(30),
|
||||||
|
TextInput::new("MM:SS:CS", &app.str_music_length)
|
||||||
|
.on_input(|new_value| Message::LengthChange(new_value))
|
||||||
|
.size(28),
|
||||||
|
]
|
||||||
|
.width(Length::FillPortion(10)),
|
||||||
|
TextInput::new("1.0", &format!("{:.1} sec/rev", &app.music.nb_sec_for_rev))
|
||||||
|
.on_input(|new_value| Message::ChangeNbPerSec(new_value))
|
||||||
|
.size(28)
|
||||||
|
.width(Length::FillPortion(2)),
|
||||||
|
button(text("").size(28).center())
|
||||||
|
.on_press(Message::SlidePointLeft)
|
||||||
|
.width(Length::FillPortion(1)),
|
||||||
|
button(text("").size(28).center())
|
||||||
|
.on_press(Message::AddPoint)
|
||||||
|
.width(Length::FillPortion(1)),
|
||||||
|
button(text("").size(28).center())
|
||||||
|
.on_press(Message::SlidePointRight)
|
||||||
|
.width(Length::FillPortion(1)),
|
||||||
|
button(text("").size(28).center())
|
||||||
|
.on_press(Message::RemovePoint)
|
||||||
|
.width(Length::FillPortion(1)),
|
||||||
|
]
|
||||||
|
.spacing(20),
|
||||||
|
column![
|
||||||
|
/*
|
||||||
|
slider(0.0..=app.music.length, self.current_delta, move |f| {
|
||||||
|
Message::ChangeDelta(f)
|
||||||
|
})
|
||||||
|
.step(&app.music.length / 10_000.),*/
|
||||||
|
canvas(&app.music)
|
||||||
|
.height(Length::FillPortion(1))
|
||||||
|
.width(Length::FillPortion(1))
|
||||||
|
]
|
||||||
|
.spacing(0),
|
||||||
|
]
|
||||||
|
.spacing(20)
|
||||||
|
.height(Length::FillPortion(1))
|
||||||
|
.width(Length::FillPortion(1)),
|
||||||
|
]
|
||||||
|
.spacing(25)
|
||||||
|
.padding(25)
|
||||||
|
.into()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn load_file_view(app: &Polymusic) -> iced::Element<Message> {
|
||||||
|
Container::new(
|
||||||
|
column![
|
||||||
|
text("Polymusic").size(42),
|
||||||
|
row![
|
||||||
|
column![
|
||||||
|
TextInput::new("Name File", &app.file_name_to_creat)
|
||||||
|
.on_input(|new_value| Message::SetFileNameCreat(new_value)),
|
||||||
|
button("Create File").on_press(Message::CreatFile),
|
||||||
|
text(if app.show_warning_message_creat {
|
||||||
|
"Warning: File already exists. Delete it or change the file name!"
|
||||||
|
} else {
|
||||||
|
""
|
||||||
|
})
|
||||||
|
.style(|theme: &Theme| {
|
||||||
|
let palette = theme.extended_palette();
|
||||||
|
|
||||||
|
text::Style {
|
||||||
|
color: Some(palette.danger.strong.color),
|
||||||
|
}
|
||||||
|
},)
|
||||||
|
]
|
||||||
|
.spacing(10)
|
||||||
|
.width(200)
|
||||||
|
.height(200)
|
||||||
|
.align_x(Horizontal::Center),
|
||||||
|
column![
|
||||||
|
pick_list(
|
||||||
|
app.all_saves.clone(),
|
||||||
|
Some(&app.music.file_name),
|
||||||
|
move |s| Message::FileNameChanged(s),
|
||||||
|
),
|
||||||
|
button("Load File").on_press(Message::Load),
|
||||||
|
text("")
|
||||||
|
]
|
||||||
|
.spacing(10)
|
||||||
|
.width(200)
|
||||||
|
.height(200)
|
||||||
|
.align_x(Horizontal::Center)
|
||||||
|
]
|
||||||
|
.spacing(32)
|
||||||
|
.align_y(Vertical::Center),
|
||||||
|
]
|
||||||
|
.spacing(64)
|
||||||
|
.align_x(Horizontal::Center),
|
||||||
|
)
|
||||||
|
.width(Length::Fill)
|
||||||
|
.height(Length::Fill)
|
||||||
|
.center_x(Length::Fill)
|
||||||
|
.center_y(Length::Fill)
|
||||||
|
.into()
|
||||||
|
}
|
||||||
53
src/history.rs
Normal file
53
src/history.rs
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
use crate::message::Message;
|
||||||
|
|
||||||
|
#[derive(Clone, Debug)]
|
||||||
|
struct HistoricItem {
|
||||||
|
old: Message,
|
||||||
|
new: Message,
|
||||||
|
delta: f32,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub struct Historic {
|
||||||
|
past: Vec<HistoricItem>,
|
||||||
|
future: Vec<HistoricItem>,
|
||||||
|
pub ignore_add: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Historic {
|
||||||
|
pub fn new() -> Self {
|
||||||
|
Historic {
|
||||||
|
past: vec![],
|
||||||
|
future: vec![],
|
||||||
|
ignore_add: false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn add(&mut self, old: Message, new: Message, delta: f32) {
|
||||||
|
if !self.ignore_add {
|
||||||
|
self.future = vec![];
|
||||||
|
self.past.push(HistoricItem {
|
||||||
|
old: old,
|
||||||
|
new: new,
|
||||||
|
delta: delta,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pub fn undo(&mut self) -> Option<(Message, f32)> {
|
||||||
|
if let Some(item) = self.past.pop() {
|
||||||
|
self.future.push(item.clone());
|
||||||
|
Some((item.old.clone(), item.delta))
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn redo(&mut self) -> Option<(Message, f32)> {
|
||||||
|
if let Some(item) = self.future.pop() {
|
||||||
|
self.past.push(item.clone());
|
||||||
|
Some((item.new.clone(), item.delta))
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
539
src/main.rs
539
src/main.rs
@@ -1,60 +1,89 @@
|
|||||||
mod polygon_draw;
|
mod polygon_draw;
|
||||||
use iced::widget::canvas::Program;
|
use iced::keyboard::Modifiers;
|
||||||
use polygon_draw::Polygon;
|
use polygon_draw::Polygon;
|
||||||
|
|
||||||
mod music;
|
mod music;
|
||||||
use music::Music;
|
use music::Music;
|
||||||
|
|
||||||
|
mod history;
|
||||||
|
use history::Historic;
|
||||||
|
|
||||||
mod message;
|
mod message;
|
||||||
use message::Message;
|
use message::Message;
|
||||||
|
|
||||||
mod utils;
|
mod utils;
|
||||||
use utils::str_to_sec;
|
use utils::{delta_to_string, is_delta_format_valid, str_to_sec};
|
||||||
|
|
||||||
use std::fs;
|
use std::fs;
|
||||||
|
|
||||||
use iced::Element;
|
mod gui;
|
||||||
|
use gui::{load_file_view, music_view};
|
||||||
|
|
||||||
|
use iced::Font;
|
||||||
|
use iced::Theme;
|
||||||
use iced::{
|
use iced::{
|
||||||
Font,
|
event::{self, Status},
|
||||||
widget::{
|
keyboard::{key::Named, Key},
|
||||||
TextInput, column, text,
|
Color, Event, Task,
|
||||||
text_input::{Icon, Side},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
use iced::{
|
|
||||||
Length, Task, Theme,
|
|
||||||
widget::{Column, button, canvas, container, pick_list, row, scrollable, slider},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
use regex::Regex;
|
|
||||||
use std::f32::consts::PI;
|
|
||||||
use std::time::Instant;
|
use std::time::Instant;
|
||||||
|
|
||||||
use kira::{
|
use kira::{
|
||||||
AudioManager, AudioManagerSettings, DefaultBackend, sound::static_sound::StaticSoundData,
|
sound::static_sound::StaticSoundData, AudioManager, AudioManagerSettings, DefaultBackend,
|
||||||
};
|
};
|
||||||
|
const FONT_BYTES: &[u8] = include_bytes!("../fonts/EnvyCodeRNerdFontMono-Regular.ttf");
|
||||||
|
const FONT: Font = Font::with_name("EnvyCodeR Nerd Font Mono");
|
||||||
|
|
||||||
use crate::utils::delta_to_string;
|
|
||||||
fn main() -> iced::Result {
|
fn main() -> iced::Result {
|
||||||
iced::application("My App", MyApp::update, MyApp::view)
|
let polytheme: Theme = {
|
||||||
.theme(|_| Theme::Dark)
|
let back = Color::from_rgb8(39, 63, 79);
|
||||||
.subscription(MyApp::subscription)
|
let text = Color::from_rgb8(0xD3, 0xD4, 0xD9);
|
||||||
.run_with(MyApp::new)
|
let prim = Color::from_rgb8(230, 82, 31);
|
||||||
|
let succ = Color::from_rgb8(0xFF, 0xF9, 0xFB);
|
||||||
|
let dan = Color::from_rgb8(0xBB, 0x0A, 0x21);
|
||||||
|
|
||||||
|
Theme::custom(
|
||||||
|
String::from("PolyTheme"),
|
||||||
|
iced::theme::Palette {
|
||||||
|
background: back,
|
||||||
|
text: text,
|
||||||
|
primary: prim,
|
||||||
|
success: succ,
|
||||||
|
danger: dan,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
};
|
||||||
|
|
||||||
|
iced::application("Polymusic", Polymusic::update, Polymusic::view)
|
||||||
|
.theme(move |_| polytheme.clone())
|
||||||
|
.font(iced_fonts::REQUIRED_FONT_BYTES)
|
||||||
|
.font(FONT_BYTES)
|
||||||
|
.default_font(FONT)
|
||||||
|
.antialiasing(true)
|
||||||
|
.subscription(Polymusic::subscription)
|
||||||
|
.run_with(Polymusic::new)
|
||||||
}
|
}
|
||||||
|
|
||||||
struct MyApp {
|
struct Polymusic {
|
||||||
music: Music,
|
music: Music,
|
||||||
time_last_frame: Instant,
|
time_last_frame: Instant,
|
||||||
show_save_panel: bool,
|
|
||||||
paused: bool,
|
paused: bool,
|
||||||
audio_manager: AudioManager,
|
audio_manager: AudioManager,
|
||||||
all_sounds: Vec<String>,
|
all_sounds: Vec<String>,
|
||||||
all_saves: Vec<String>,
|
all_saves: Vec<String>,
|
||||||
current_delta: f32,
|
current_delta: f32,
|
||||||
str_music_length: String,
|
str_music_length: String,
|
||||||
|
str_time: String,
|
||||||
|
can_unpaused: bool,
|
||||||
|
already_save: bool,
|
||||||
|
mode_file_load: bool,
|
||||||
|
file_name_to_creat: String,
|
||||||
|
show_warning_message_creat: bool,
|
||||||
|
historic: Historic,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl MyApp {
|
impl Polymusic {
|
||||||
fn new() -> (Self, Task<Message>) {
|
fn new() -> (Self, Task<Message>) {
|
||||||
let manager = AudioManager::<DefaultBackend>::new(AudioManagerSettings::default())
|
let manager = AudioManager::<DefaultBackend>::new(AudioManagerSettings::default())
|
||||||
.expect("Error to load AudioManager");
|
.expect("Error to load AudioManager");
|
||||||
@@ -62,27 +91,36 @@ impl MyApp {
|
|||||||
Self {
|
Self {
|
||||||
time_last_frame: Instant::now(),
|
time_last_frame: Instant::now(),
|
||||||
audio_manager: manager,
|
audio_manager: manager,
|
||||||
show_save_panel: false,
|
|
||||||
paused: true,
|
paused: true,
|
||||||
all_sounds: load_path_sounds(),
|
all_sounds: load_path_sounds(),
|
||||||
all_saves: load_path_saves(),
|
all_saves: load_path_saves(),
|
||||||
music: Music::default(),
|
music: Music::default(),
|
||||||
current_delta: 0.0,
|
current_delta: 0.0,
|
||||||
str_music_length: "01:00:00".to_string(),
|
str_music_length: "01:00:00".to_string(),
|
||||||
|
str_time: "00:00:00".to_string(),
|
||||||
|
can_unpaused: true,
|
||||||
|
already_save: true,
|
||||||
|
mode_file_load: true,
|
||||||
|
file_name_to_creat: "Default File Name".to_string(),
|
||||||
|
show_warning_message_creat: false,
|
||||||
|
historic: Historic::new(),
|
||||||
},
|
},
|
||||||
Task::none(),
|
Task::none(),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
fn update(&mut self, message: Message) {
|
fn update(&mut self, message: Message) {
|
||||||
match message {
|
match message {
|
||||||
Message::ButtonPressedIncrement => self.music.nb_sec_for_rev += 0.5,
|
|
||||||
Message::ButtonPressedDecrement => {
|
|
||||||
if self.music.nb_sec_for_rev > 0.5 {
|
|
||||||
self.music.nb_sec_for_rev -= 0.5;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Message::AddPolygon(s) => {
|
Message::AddPolygon(s) => {
|
||||||
self.music.add_polygon(self.current_delta, s);
|
self.music.add_polygon(self.current_delta, s.clone());
|
||||||
|
self.already_save = false;
|
||||||
|
self.historic.add(
|
||||||
|
Message::Remove(usize::MAX),
|
||||||
|
Message::AddPolygon(s),
|
||||||
|
self.current_delta,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
Message::ReAddPolygon(poly) => {
|
||||||
|
self.music.add_polygon_from(self.current_delta, poly);
|
||||||
}
|
}
|
||||||
Message::Tick => {
|
Message::Tick => {
|
||||||
if self.current_delta >= self.music.length {
|
if self.current_delta >= self.music.length {
|
||||||
@@ -95,26 +133,46 @@ impl MyApp {
|
|||||||
self.music
|
self.music
|
||||||
.apply_tick(self.current_delta, time_btw, &mut self.audio_manager);
|
.apply_tick(self.current_delta, time_btw, &mut self.audio_manager);
|
||||||
self.time_last_frame = Instant::now();
|
self.time_last_frame = Instant::now();
|
||||||
|
self.str_time = delta_to_string(self.current_delta);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Message::Remove(i) => {
|
Message::Remove(i) => {
|
||||||
self.music.remove_polygon(self.current_delta, i - 1);
|
let poly = self.music.remove_polygon(self.current_delta, i);
|
||||||
|
self.already_save = false;
|
||||||
|
self.historic.add(
|
||||||
|
Message::ReAddPolygon(poly),
|
||||||
|
Message::Remove(i),
|
||||||
|
self.current_delta,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
Message::ChangeTeta(i, teta) => {
|
Message::ChangeTeta(i, teta) => {
|
||||||
self.music.set_teta(self.current_delta, i, teta);
|
let old_teta = self.music.set_teta(self.current_delta, i, teta);
|
||||||
}
|
self.already_save = false;
|
||||||
Message::ChangeColor(i, s) => {
|
self.historic.add(
|
||||||
self.music.set_color(self.current_delta, i, s);
|
Message::ChangeTeta(i, old_teta),
|
||||||
|
Message::ChangeTeta(i, teta),
|
||||||
|
self.current_delta,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
Message::ChangeSound(i, s) => {
|
Message::ChangeSound(i, s) => {
|
||||||
let sound = StaticSoundData::from_file(format!("./assets/{s}"))
|
let sound = StaticSoundData::from_file(format!("./assets/{s}"))
|
||||||
.expect("Fail to load audio");
|
.expect("Fail to load audio");
|
||||||
self.music.set_sound(self.current_delta, i, sound, s);
|
let old_sound = self
|
||||||
|
.music
|
||||||
|
.set_sound(self.current_delta, i, sound, s.clone());
|
||||||
|
self.already_save = false;
|
||||||
|
self.historic.add(
|
||||||
|
Message::ChangeSound(i, old_sound),
|
||||||
|
Message::ChangeSound(i, s),
|
||||||
|
self.current_delta,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
Message::Save => {
|
Message::Save => {
|
||||||
let json = serde_json::to_string_pretty(&self.music).unwrap();
|
let json = serde_json::to_string_pretty(&self.music).unwrap();
|
||||||
fs::write(format!("./saves/{0}.pmx", &self.music.file_name), json).unwrap();
|
fs::write(format!("./saves/{0}.pmx", &self.music.file_name), json).unwrap();
|
||||||
self.all_saves = load_path_saves();
|
self.all_saves = load_path_saves();
|
||||||
|
self.already_save = true;
|
||||||
}
|
}
|
||||||
Message::Load => {
|
Message::Load => {
|
||||||
let json = fs::read_to_string(format!("./saves/{0}.pmx", &self.music.file_name));
|
let json = fs::read_to_string(format!("./saves/{0}.pmx", &self.music.file_name));
|
||||||
@@ -123,222 +181,273 @@ impl MyApp {
|
|||||||
let decoded: Music = serde_json::from_str(&j).unwrap();
|
let decoded: Music = serde_json::from_str(&j).unwrap();
|
||||||
self.music = decoded;
|
self.music = decoded;
|
||||||
self.music.update_frame();
|
self.music.update_frame();
|
||||||
|
self.mode_file_load = false;
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
eprintln!("Error, no saves with this name to load, {e} ");
|
eprintln!("Error, no saves with this name to load, {e} ");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Message::ToggleSavePanel => self.show_save_panel = !self.show_save_panel,
|
Message::SetFileNameCreat(s) => self.file_name_to_creat = s,
|
||||||
|
Message::CreatFile => {
|
||||||
|
if self.all_saves.contains(&self.file_name_to_creat) {
|
||||||
|
self.show_warning_message_creat = true;
|
||||||
|
} else {
|
||||||
|
self.mode_file_load = false;
|
||||||
|
self.music = Music::default();
|
||||||
|
self.music.file_name = self.file_name_to_creat.clone();
|
||||||
|
self.update(Message::Save);
|
||||||
|
}
|
||||||
|
}
|
||||||
Message::FileNameChanged(s) => self.music.file_name = s,
|
Message::FileNameChanged(s) => self.music.file_name = s,
|
||||||
Message::LengthChange(s) => self.str_music_length = s,
|
Message::LengthChange(s) => {
|
||||||
|
if is_delta_format_valid(&s) {
|
||||||
|
let sec = str_to_sec(&s);
|
||||||
|
if sec > 0. {
|
||||||
|
self.historic.add(
|
||||||
|
Message::LengthChange(delta_to_string(self.music.length)),
|
||||||
|
Message::LengthChange(s.clone()),
|
||||||
|
self.current_delta,
|
||||||
|
);
|
||||||
|
self.music.length = sec;
|
||||||
|
self.already_save = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
self.str_music_length = s;
|
||||||
|
}
|
||||||
Message::TogglePaused => {
|
Message::TogglePaused => {
|
||||||
self.paused = !self.paused;
|
self.paused = !self.paused;
|
||||||
if !self.paused {
|
if !self.paused {
|
||||||
self.time_last_frame = Instant::now();
|
self.time_last_frame = Instant::now();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Message::SetMusicLength => {
|
|
||||||
if self.is_length_valid() {
|
|
||||||
self.music.length = str_to_sec(&self.str_music_length)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Message::ChangeDelta(f) => {
|
Message::ChangeDelta(f) => {
|
||||||
self.current_delta = f;
|
self.current_delta = f;
|
||||||
self.music.fix_teta(self.current_delta);
|
self.music.fix_teta(self.current_delta);
|
||||||
// update the red dot on canvas
|
// update the red dot on canvas
|
||||||
if self.paused {
|
self.update_canvas_if_paused();
|
||||||
self.update(Message::TogglePaused);
|
|
||||||
self.update(Message::Tick);
|
|
||||||
self.update(Message::TogglePaused);
|
|
||||||
}
|
}
|
||||||
|
Message::ChangeDeltaString(s) => {
|
||||||
|
if is_delta_format_valid(&s) {
|
||||||
|
self.already_save = false;
|
||||||
|
self.update(Message::ChangeDelta(str_to_sec(&s)));
|
||||||
|
}
|
||||||
|
self.str_time = s;
|
||||||
|
}
|
||||||
|
Message::ReAddPoint => {
|
||||||
|
self.already_save = false;
|
||||||
|
self.music.add_point_old();
|
||||||
}
|
}
|
||||||
Message::AddPoint => {
|
Message::AddPoint => {
|
||||||
|
self.already_save = false;
|
||||||
self.music.add_point(self.current_delta);
|
self.music.add_point(self.current_delta);
|
||||||
|
self.historic
|
||||||
|
.add(Message::RemovePoint, Message::AddPoint, self.current_delta);
|
||||||
}
|
}
|
||||||
Message::RemovePoint => {
|
Message::RemovePoint => {
|
||||||
|
self.already_save = false;
|
||||||
self.music.remove_point(self.current_delta);
|
self.music.remove_point(self.current_delta);
|
||||||
|
self.historic.add(
|
||||||
|
Message::ReAddPoint,
|
||||||
|
Message::RemovePoint,
|
||||||
|
self.current_delta,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
Message::ClickedOnTimeLine(f) => {
|
Message::ClickedOnTimeLine(f) => {
|
||||||
self.update(Message::ChangeDelta(f));
|
self.update(Message::ChangeDelta(f));
|
||||||
}
|
}
|
||||||
|
Message::SlidePointLeft => {
|
||||||
|
self.already_save = false;
|
||||||
|
self.music.slide_to_left(self.current_delta);
|
||||||
|
self.music.fix_teta(self.current_delta);
|
||||||
|
self.update_canvas_if_paused();
|
||||||
|
self.historic.add(
|
||||||
|
Message::SlidePointLeft,
|
||||||
|
Message::SlidePointLeft,
|
||||||
|
self.current_delta,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
Message::SlidePointRight => {
|
||||||
|
self.already_save = false;
|
||||||
|
self.music.slide_to_right(self.current_delta);
|
||||||
|
self.music.fix_teta(self.current_delta);
|
||||||
|
self.update_canvas_if_paused();
|
||||||
|
self.historic.add(
|
||||||
|
Message::SlidePointRight,
|
||||||
|
Message::SlidePointRight,
|
||||||
|
self.current_delta,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
Message::ChangeDegree(i, s) => {
|
||||||
|
let mut mut_s = s;
|
||||||
|
if mut_s.len() == 0 {
|
||||||
|
mut_s = "0".to_string();
|
||||||
|
}
|
||||||
|
match mut_s.parse::<f32>() {
|
||||||
|
Ok(val) => {
|
||||||
|
if val >= 0. && val <= 360. {
|
||||||
|
self.update(Message::ChangeTeta(i, (val).to_radians()));
|
||||||
|
self.already_save = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(_) => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Message::ChangeNbPerSec(s) => {
|
||||||
|
let mut_s = s.trim_end_matches(" sec/rev");
|
||||||
|
if mut_s.len() != s.len() {
|
||||||
|
match mut_s.parse::<f32>() {
|
||||||
|
Ok(val) => {
|
||||||
|
let val = (val * 10.).floor() / 10.;
|
||||||
|
if val >= 1. && val < 1000. {
|
||||||
|
self.historic.add(
|
||||||
|
Message::ChangeNbPerSec(format!(
|
||||||
|
"{:.1} sec/rev",
|
||||||
|
self.music.nb_sec_for_rev
|
||||||
|
)),
|
||||||
|
Message::ChangeNbPerSec(s.clone()),
|
||||||
|
self.current_delta,
|
||||||
|
);
|
||||||
|
self.music.nb_sec_for_rev = val;
|
||||||
|
self.already_save = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(_) => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Message::CancelColor(i) => {
|
||||||
|
self.music.set_color_picker(self.current_delta, i, false);
|
||||||
|
self.can_unpaused = true;
|
||||||
|
}
|
||||||
|
Message::SubmitColor(i) => {
|
||||||
|
if !self.paused {
|
||||||
|
self.update(Message::TogglePaused);
|
||||||
|
}
|
||||||
|
self.can_unpaused = false;
|
||||||
|
self.music.set_color_picker(self.current_delta, i, true);
|
||||||
|
}
|
||||||
|
Message::ChooseColor(i, color) => {
|
||||||
|
let old_color = self.music.set_color(self.current_delta, i, color);
|
||||||
|
self.music.set_color_picker(self.current_delta, i, false);
|
||||||
|
self.can_unpaused = true;
|
||||||
|
self.already_save = false;
|
||||||
|
self.historic.add(
|
||||||
|
Message::ChooseColor(i, old_color),
|
||||||
|
Message::ChooseColor(i, color),
|
||||||
|
self.current_delta,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
Message::GoToLoadView => {
|
||||||
|
if self.already_save {
|
||||||
|
self.historic = Historic::new();
|
||||||
|
self.paused = true;
|
||||||
|
self.file_name_to_creat = "Default File Name".to_string();
|
||||||
|
self.show_warning_message_creat = false;
|
||||||
|
self.mode_file_load = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Message::ForceToQuit => {
|
||||||
|
self.already_save = true;
|
||||||
|
}
|
||||||
|
Message::Undo => {
|
||||||
|
if let Some(item) = self.historic.undo() {
|
||||||
|
self.historic.ignore_add = true;
|
||||||
|
self.update(Message::ChangeDelta(item.1));
|
||||||
|
self.update(item.0);
|
||||||
|
self.historic.ignore_add = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Message::Redo => {
|
||||||
|
if let Some(item) = self.historic.redo() {
|
||||||
|
self.historic.ignore_add = true;
|
||||||
|
self.update(Message::ChangeDelta(item.1));
|
||||||
|
self.update(item.0);
|
||||||
|
self.historic.ignore_add = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Message::None => {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn view(&self) -> iced::Element<Message> {
|
fn view(&self) -> iced::Element<Message> {
|
||||||
let txt_nb_rev = if self.music.nb_sec_for_rev % 1. != 0.0 {
|
if !self.mode_file_load {
|
||||||
format!("{} sec/revolution", self.music.nb_sec_for_rev)
|
music_view(self)
|
||||||
} else {
|
} else {
|
||||||
format!("{}.0 sec/revolution", self.music.nb_sec_for_rev)
|
load_file_view(self)
|
||||||
};
|
|
||||||
|
|
||||||
let mut i = 0;
|
|
||||||
let entries = self.all_sounds.clone();
|
|
||||||
//Create all polygon options
|
|
||||||
let polygon_rows: Vec<Element<Message>> = self
|
|
||||||
.music
|
|
||||||
.current_frame(self.current_delta)
|
|
||||||
.polygons
|
|
||||||
.iter()
|
|
||||||
.map(|polygon| {
|
|
||||||
let current_index = i;
|
|
||||||
i += 1;
|
|
||||||
column![
|
|
||||||
row![
|
|
||||||
text(&polygon.name),
|
|
||||||
button("Remove").on_press(Message::Remove(i)),
|
|
||||||
pick_list(
|
|
||||||
["Black", "Blue", "Green", "Pink", "Yellow", "Cyan"]
|
|
||||||
.map(|s| s.to_string())
|
|
||||||
.to_vec(),
|
|
||||||
Some(&polygon.color_name),
|
|
||||||
move |s| { Message::ChangeColor(current_index, s) }
|
|
||||||
),
|
|
||||||
pick_list(entries.clone(), Some(&polygon.sound_name), move |s| {
|
|
||||||
Message::ChangeSound(current_index, s)
|
|
||||||
}),
|
|
||||||
]
|
|
||||||
.spacing(20),
|
|
||||||
slider(0.0..=2.0 * PI, polygon.global_teta, move |f| {
|
|
||||||
Message::ChangeTeta(current_index, f)
|
|
||||||
})
|
|
||||||
.step(PI / 84f32), // 84 | 4 for do PI / 4
|
|
||||||
]
|
|
||||||
.spacing(10)
|
|
||||||
.into()
|
|
||||||
})
|
|
||||||
.collect();
|
|
||||||
let ngon_options: Vec<String> = (5..=42).map(|sides| format!("Ngon{sides}")).collect();
|
|
||||||
let all_options: Vec<String> = [
|
|
||||||
"Segment",
|
|
||||||
"Triangle",
|
|
||||||
"Square",
|
|
||||||
"Nr6In30",
|
|
||||||
"Nr7In30",
|
|
||||||
"Nr8In30",
|
|
||||||
"Nr9In30",
|
|
||||||
"Nr8In42",
|
|
||||||
"Nr9In42",
|
|
||||||
"Nr10aIn42",
|
|
||||||
"Nr10bIn42",
|
|
||||||
]
|
|
||||||
.iter()
|
|
||||||
.map(|s| s.to_string())
|
|
||||||
.chain(ngon_options)
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
let polygon_column = scrollable(Column::with_children(polygon_rows).spacing(20));
|
|
||||||
let mut save_panel: Vec<Element<Message>> = vec![
|
|
||||||
button("Toggle Save Panel")
|
|
||||||
.on_press(Message::ToggleSavePanel)
|
|
||||||
.into(),
|
|
||||||
];
|
|
||||||
|
|
||||||
if self.show_save_panel {
|
|
||||||
save_panel.push(
|
|
||||||
TextInput::new("Name File", &self.music.file_name)
|
|
||||||
.on_input(|new_value| Message::FileNameChanged(new_value))
|
|
||||||
.into(),
|
|
||||||
);
|
|
||||||
save_panel.push(button("Save").on_press(Message::Save).into());
|
|
||||||
save_panel.push(
|
|
||||||
pick_list(
|
|
||||||
self.all_saves.clone(),
|
|
||||||
Some(&self.music.file_name),
|
|
||||||
move |s| Message::FileNameChanged(s),
|
|
||||||
)
|
|
||||||
.into(),
|
|
||||||
);
|
|
||||||
|
|
||||||
save_panel.push(button("Load").on_press(Message::Load).into());
|
|
||||||
}
|
}
|
||||||
column![
|
|
||||||
text(&self.music.file_name).size(32.0),
|
|
||||||
row(save_panel).spacing(20),
|
|
||||||
row![
|
|
||||||
text("Music Length").size(20),
|
|
||||||
TextInput::new("MM:SS:CS", &self.str_music_length)
|
|
||||||
.on_input(|new_value| Message::LengthChange(new_value))
|
|
||||||
.icon(Icon {
|
|
||||||
font: Font::DEFAULT,
|
|
||||||
code_point: if self.is_length_valid() {
|
|
||||||
'\u{2705}'
|
|
||||||
} else {
|
|
||||||
'\u{274C}'
|
|
||||||
},
|
|
||||||
size: None,
|
|
||||||
spacing: 10.,
|
|
||||||
side: Side::Left,
|
|
||||||
}),
|
|
||||||
button("Valid").on_press(Message::SetMusicLength),
|
|
||||||
text(txt_nb_rev).size(20),
|
|
||||||
button("Increment").on_press(Message::ButtonPressedIncrement),
|
|
||||||
button("Decrement").on_press(Message::ButtonPressedDecrement),
|
|
||||||
]
|
|
||||||
.spacing(20),
|
|
||||||
row![
|
|
||||||
container(
|
|
||||||
canvas(self.music.current_frame(self.current_delta))
|
|
||||||
.height(Length::FillPortion(1))
|
|
||||||
.width(Length::FillPortion(1))
|
|
||||||
),
|
|
||||||
column![
|
|
||||||
text("Polygon options"),
|
|
||||||
pick_list(all_options, Some("Choose polygon".to_string()), |s| {
|
|
||||||
Message::AddPolygon(s)
|
|
||||||
}),
|
|
||||||
polygon_column,
|
|
||||||
]
|
|
||||||
.spacing(10)
|
|
||||||
.height(Length::FillPortion(1))
|
|
||||||
.width(Length::FillPortion(2)),
|
|
||||||
]
|
|
||||||
.height(Length::FillPortion(2))
|
|
||||||
.spacing(20),
|
|
||||||
column![
|
|
||||||
row![
|
|
||||||
button("Toggle Play").on_press(Message::TogglePaused),
|
|
||||||
text(format!(
|
|
||||||
"{}/{}",
|
|
||||||
delta_to_string(self.current_delta),
|
|
||||||
delta_to_string(self.music.length)
|
|
||||||
))
|
|
||||||
.size(20.0),
|
|
||||||
button("Add Point").on_press(Message::AddPoint),
|
|
||||||
button("Remove Point").on_press(Message::RemovePoint),
|
|
||||||
]
|
|
||||||
.spacing(20),
|
|
||||||
column![
|
|
||||||
/*
|
|
||||||
slider(0.0..=self.music.length, self.current_delta, move |f| {
|
|
||||||
Message::ChangeDelta(f)
|
|
||||||
})
|
|
||||||
.step(&self.music.length / 10_000.),*/
|
|
||||||
canvas(&self.music)
|
|
||||||
.height(Length::FillPortion(1))
|
|
||||||
.width(Length::FillPortion(1))
|
|
||||||
]
|
|
||||||
.spacing(0),
|
|
||||||
]
|
|
||||||
.spacing(20)
|
|
||||||
.height(Length::FillPortion(1))
|
|
||||||
.width(Length::FillPortion(1)),
|
|
||||||
]
|
|
||||||
.spacing(25)
|
|
||||||
.padding(25)
|
|
||||||
.into()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn is_length_valid(&self) -> bool {
|
|
||||||
let re = Regex::new(r"^\d{2}:\d{2}:\d{2}$").unwrap();
|
|
||||||
re.is_match(self.str_music_length.as_str())
|
|
||||||
}
|
|
||||||
fn subscription(&self) -> iced::Subscription<Message> {
|
fn subscription(&self) -> iced::Subscription<Message> {
|
||||||
|
let subscr_key = event::listen_with(|event, status, _| match (event, status) {
|
||||||
|
(
|
||||||
|
Event::Keyboard(iced::keyboard::Event::KeyPressed {
|
||||||
|
key: Key::Character(c),
|
||||||
|
modifiers: Modifiers::CTRL,
|
||||||
|
..
|
||||||
|
}),
|
||||||
|
Status::Ignored,
|
||||||
|
) if c.as_ref() == "z" => Some(Message::Undo),
|
||||||
|
(
|
||||||
|
Event::Keyboard(iced::keyboard::Event::KeyPressed {
|
||||||
|
key: Key::Character(c),
|
||||||
|
modifiers: Modifiers::CTRL,
|
||||||
|
..
|
||||||
|
}),
|
||||||
|
Status::Ignored,
|
||||||
|
) if c.as_ref() == "y" => Some(Message::Redo),
|
||||||
|
(
|
||||||
|
Event::Keyboard(iced::keyboard::Event::KeyPressed {
|
||||||
|
key: Key::Character(c),
|
||||||
|
modifiers: Modifiers::CTRL,
|
||||||
|
..
|
||||||
|
}),
|
||||||
|
Status::Ignored,
|
||||||
|
) if c.as_ref() == "s" => Some(Message::Save),
|
||||||
|
(
|
||||||
|
Event::Keyboard(iced::keyboard::Event::KeyPressed {
|
||||||
|
key: Key::Named(Named::Space),
|
||||||
|
..
|
||||||
|
}),
|
||||||
|
Status::Ignored,
|
||||||
|
) => Some(Message::TogglePaused),
|
||||||
|
(
|
||||||
|
Event::Keyboard(iced::keyboard::Event::KeyPressed {
|
||||||
|
key: Key::Named(Named::ArrowUp),
|
||||||
|
..
|
||||||
|
}),
|
||||||
|
Status::Ignored,
|
||||||
|
) => Some(Message::ChangeDelta(0.0)),
|
||||||
|
(
|
||||||
|
Event::Keyboard(iced::keyboard::Event::KeyPressed {
|
||||||
|
key: Key::Character(c),
|
||||||
|
modifiers: Modifiers::CTRL,
|
||||||
|
..
|
||||||
|
}),
|
||||||
|
Status::Ignored,
|
||||||
|
) if c.as_ref() == "f" => Some(Message::ForceToQuit),
|
||||||
|
|
||||||
|
_ => None,
|
||||||
|
});
|
||||||
|
if self.paused {
|
||||||
|
subscr_key
|
||||||
|
} else {
|
||||||
iced::Subscription::batch([
|
iced::Subscription::batch([
|
||||||
//window::events().map(|(_id, event)| Message::WindowEvent(event)),
|
subscr_key,
|
||||||
iced::time::every(std::time::Duration::from_millis(16)).map(|_| Message::Tick),
|
iced::time::every(std::time::Duration::from_millis(16)).map(|_| Message::Tick),
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn update_canvas_if_paused(&mut self) {
|
||||||
|
if self.paused {
|
||||||
|
self.update(Message::TogglePaused);
|
||||||
|
self.update(Message::Tick);
|
||||||
|
self.update(Message::TogglePaused);
|
||||||
|
self.update(Message::None);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn load_path_sounds() -> Vec<String> {
|
fn load_path_sounds() -> Vec<String> {
|
||||||
@@ -353,7 +462,7 @@ fn load_path_sounds() -> Vec<String> {
|
|||||||
|
|
||||||
fn load_path_saves() -> Vec<String> {
|
fn load_path_saves() -> Vec<String> {
|
||||||
fs::create_dir_all("./saves").expect("fail to creat 'saves' !");
|
fs::create_dir_all("./saves").expect("fail to creat 'saves' !");
|
||||||
fs::read_dir("./saves")
|
let mut saves: Vec<String> = fs::read_dir("./saves")
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.filter_map(|res| res.ok())
|
.filter_map(|res| res.ok())
|
||||||
.map(|e| {
|
.map(|e| {
|
||||||
@@ -365,5 +474,7 @@ fn load_path_saves() -> Vec<String> {
|
|||||||
.trim_end_matches(".pmx")
|
.trim_end_matches(".pmx")
|
||||||
.to_string()
|
.to_string()
|
||||||
})
|
})
|
||||||
.collect()
|
.collect();
|
||||||
|
saves.sort();
|
||||||
|
saves
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,22 +1,41 @@
|
|||||||
|
use iced::Color;
|
||||||
|
|
||||||
|
use crate::polygon_draw::Polygon;
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
pub enum Message {
|
pub enum Message {
|
||||||
ButtonPressedIncrement,
|
None,
|
||||||
ButtonPressedDecrement,
|
CreatFile,
|
||||||
|
SetFileNameCreat(String),
|
||||||
|
GoToLoadView,
|
||||||
|
ForceToQuit,
|
||||||
Tick,
|
Tick,
|
||||||
AddPolygon(String),
|
|
||||||
ChangeTeta(usize, f32),
|
|
||||||
Remove(usize),
|
|
||||||
ChangeColor(usize, String),
|
|
||||||
ChangeSound(usize, String),
|
|
||||||
ToggleSavePanel,
|
|
||||||
Save,
|
Save,
|
||||||
Load,
|
Load,
|
||||||
FileNameChanged(String),
|
FileNameChanged(String),
|
||||||
TogglePaused,
|
TogglePaused,
|
||||||
SetMusicLength,
|
|
||||||
LengthChange(String),
|
|
||||||
ChangeDelta(f32),
|
ChangeDelta(f32),
|
||||||
|
ClickedOnTimeLine(f32),
|
||||||
|
ChangeDeltaString(String),
|
||||||
|
|
||||||
|
ChangeNbPerSec(String),
|
||||||
|
AddPolygon(String),
|
||||||
|
ReAddPolygon(Polygon),
|
||||||
|
ChangeTeta(usize, f32),
|
||||||
|
Remove(usize),
|
||||||
|
ChangeSound(usize, String),
|
||||||
|
LengthChange(String),
|
||||||
AddPoint,
|
AddPoint,
|
||||||
RemovePoint,
|
RemovePoint,
|
||||||
ClickedOnTimeLine(f32),
|
SlidePointLeft,
|
||||||
|
SlidePointRight,
|
||||||
|
ChangeDegree(usize, String),
|
||||||
|
ReAddPoint,
|
||||||
|
|
||||||
|
ChooseColor(usize, Color),
|
||||||
|
CancelColor(usize),
|
||||||
|
SubmitColor(usize),
|
||||||
|
|
||||||
|
Undo,
|
||||||
|
Redo,
|
||||||
}
|
}
|
||||||
|
|||||||
244
src/music.rs
244
src/music.rs
@@ -1,20 +1,25 @@
|
|||||||
use crate::message::Message;
|
use crate::message::Message;
|
||||||
|
use crate::polygon_draw::*;
|
||||||
use crate::utils::string_to_polygon;
|
use crate::utils::string_to_polygon;
|
||||||
use crate::{polygon_draw::*, utils::string_to_color};
|
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
use kira::{AudioManager, sound::static_sound::StaticSoundData};
|
use kira::{sound::static_sound::StaticSoundData, AudioManager};
|
||||||
|
|
||||||
use iced::event::Status;
|
use iced::event::Status;
|
||||||
use iced::mouse::Cursor;
|
use iced::mouse::Cursor;
|
||||||
use iced::widget::canvas::Event;
|
use iced::widget::canvas::{Event, Geometry};
|
||||||
use iced::{mouse, padding};
|
use iced::{keyboard, Vector};
|
||||||
|
use iced::{
|
||||||
|
mouse::{self, ScrollDelta},
|
||||||
|
Size,
|
||||||
|
};
|
||||||
|
|
||||||
use iced::widget::canvas;
|
use iced::widget::canvas;
|
||||||
use iced::widget::canvas::Stroke;
|
use iced::widget::canvas::Stroke;
|
||||||
use iced::widget::canvas::Style;
|
use iced::widget::canvas::Style;
|
||||||
use iced::{Color, Rectangle, Renderer, Theme};
|
use iced::{Color, Rectangle, Renderer, Theme};
|
||||||
use std::f32::consts::PI;
|
use std::f32::consts::PI;
|
||||||
|
use std::mem::swap;
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
#[derive(Serialize, Deserialize)]
|
#[derive(Serialize, Deserialize)]
|
||||||
pub struct Music {
|
pub struct Music {
|
||||||
@@ -26,6 +31,8 @@ pub struct Music {
|
|||||||
teta: f32,
|
teta: f32,
|
||||||
#[serde(skip)]
|
#[serde(skip)]
|
||||||
pub current_delta: f32,
|
pub current_delta: f32,
|
||||||
|
#[serde(skip)]
|
||||||
|
point_removed: Vec<(f32, PolygonFrame)>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Music {
|
impl Music {
|
||||||
@@ -68,10 +75,11 @@ impl Music {
|
|||||||
Music {
|
Music {
|
||||||
poly_frame: vec![(0.0, PolygonFrame::default())],
|
poly_frame: vec![(0.0, PolygonFrame::default())],
|
||||||
nb_sec_for_rev: 1.0,
|
nb_sec_for_rev: 1.0,
|
||||||
file_name: "Default Name".to_string(),
|
file_name: "Default File Name".to_string(),
|
||||||
length: 60.0,
|
length: 60.0,
|
||||||
teta: 0.,
|
teta: 0.,
|
||||||
current_delta: 0.,
|
current_delta: 0.,
|
||||||
|
point_removed: vec![],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -111,20 +119,30 @@ impl Music {
|
|||||||
index: usize,
|
index: usize,
|
||||||
sound: StaticSoundData,
|
sound: StaticSoundData,
|
||||||
sound_name: String,
|
sound_name: String,
|
||||||
) {
|
) -> String {
|
||||||
let current_frame = self.find_poly_frame(delta);
|
let current_frame = self.find_poly_frame(delta);
|
||||||
current_frame.polygons[index].sound = sound;
|
current_frame.polygons[index].sound = sound;
|
||||||
|
let out = current_frame.polygons[index].sound_name.clone();
|
||||||
current_frame.polygons[index].sound_name = sound_name;
|
current_frame.polygons[index].sound_name = sound_name;
|
||||||
|
out
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn set_teta(&mut self, delta: f32, index: usize, teta: f32) {
|
pub fn set_teta(&mut self, delta: f32, index: usize, teta: f32) -> f32 {
|
||||||
|
let out = self.find_poly_frame(delta).polygons[index].global_teta;
|
||||||
self.find_poly_frame(delta).polygons[index].global_teta = teta;
|
self.find_poly_frame(delta).polygons[index].global_teta = teta;
|
||||||
|
out
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn set_color(&mut self, delta: f32, index: usize, color_name: String) {
|
pub fn set_color(&mut self, delta: f32, index: usize, color: Color) -> Color {
|
||||||
let current_frame = self.find_poly_frame(delta);
|
let current_frame = self.find_poly_frame(delta);
|
||||||
current_frame.polygons[index].color = string_to_color(&color_name);
|
let out = current_frame.polygons[index].color.clone();
|
||||||
current_frame.polygons[index].color_name = color_name;
|
current_frame.polygons[index].color = color;
|
||||||
|
out
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn set_color_picker(&mut self, delta: f32, i: usize, b: bool) {
|
||||||
|
let current_frame = self.find_poly_frame(delta);
|
||||||
|
current_frame.polygons[i].show_color_picker = b;
|
||||||
}
|
}
|
||||||
|
|
||||||
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ADD/REMOVE~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ADD/REMOVE~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
@@ -137,63 +155,137 @@ impl Music {
|
|||||||
self.poly_frame
|
self.poly_frame
|
||||||
.insert(pos, (delta, self.current_frame(delta).clone()));
|
.insert(pos, (delta, self.current_frame(delta).clone()));
|
||||||
}
|
}
|
||||||
|
pub fn add_point_old(&mut self) {
|
||||||
|
if let Some(pair) = self.point_removed.pop() {
|
||||||
|
let pos = self
|
||||||
|
.poly_frame
|
||||||
|
.binary_search_by(|(d, _)| d.partial_cmp(&pair.0).unwrap())
|
||||||
|
.unwrap_or_else(|e| e);
|
||||||
|
self.poly_frame.insert(pos, pair);
|
||||||
|
}
|
||||||
|
}
|
||||||
pub fn remove_point(&mut self, delta: f32) {
|
pub fn remove_point(&mut self, delta: f32) {
|
||||||
let i = self.find_index_frame(delta);
|
let i = self.find_index_frame(delta);
|
||||||
if i != 0 {
|
if i != 0 {
|
||||||
|
self.point_removed.push(self.poly_frame[i].clone());
|
||||||
self.poly_frame.remove(i);
|
self.poly_frame.remove(i);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn add_polygon(&mut self, delta: f32, polygon_name: String) {
|
pub fn add_polygon(&mut self, delta: f32, polygon_name: String) {
|
||||||
let current_frame = self.find_poly_frame(delta);
|
let current_frame = self.find_poly_frame(delta);
|
||||||
let poly = string_to_polygon(polygon_name);
|
let mut poly = string_to_polygon(polygon_name);
|
||||||
|
poly.update();
|
||||||
current_frame.polygons.push(poly);
|
current_frame.polygons.push(poly);
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn remove_polygon(&mut self, delta: f32, i: usize) {
|
pub fn add_polygon_from(&mut self, delta: f32, polygon: Polygon) {
|
||||||
self.find_poly_frame(delta).polygons.remove(i);
|
let current_frame = self.find_poly_frame(delta);
|
||||||
|
current_frame.polygons.push(polygon);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn remove_polygon(&mut self, delta: f32, i: usize) -> Polygon {
|
||||||
|
let pf = self.find_poly_frame(delta);
|
||||||
|
let mut i = i;
|
||||||
|
if i == usize::MAX {
|
||||||
|
i = pf.polygons.len() - 1
|
||||||
|
}
|
||||||
|
let out = pf.polygons[i].clone();
|
||||||
|
pf.polygons.remove(i);
|
||||||
|
out
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn slide_to_left(&mut self, delta: f32) {
|
||||||
|
let i = self.find_index_frame(delta);
|
||||||
|
if i > 0 {
|
||||||
|
let (left, right) = self.poly_frame.split_at_mut(i);
|
||||||
|
swap(&mut left[i - 1].1, &mut right[0].1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pub fn slide_to_right(&mut self, delta: f32) {
|
||||||
|
let i = self.find_index_frame(delta);
|
||||||
|
if i < self.poly_frame.len() - 1 {
|
||||||
|
let (left, right) = self.poly_frame.split_at_mut(i + 1);
|
||||||
|
swap(&mut left[i].1, &mut right[0].1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#[derive(Default, Debug)]
|
||||||
|
pub struct StateMusic {
|
||||||
|
mouse_left: bool,
|
||||||
|
ctrl: bool,
|
||||||
|
zoom: f32,
|
||||||
|
offset: f32,
|
||||||
|
}
|
||||||
|
|
||||||
impl canvas::Program<Message> for Music {
|
impl canvas::Program<Message> for Music {
|
||||||
// No internal state
|
// No internal state
|
||||||
type State = bool;
|
type State = StateMusic;
|
||||||
|
|
||||||
fn draw(
|
fn draw(
|
||||||
&self,
|
&self,
|
||||||
_state: &Self::State,
|
state: &Self::State,
|
||||||
renderer: &Renderer,
|
renderer: &Renderer,
|
||||||
_theme: &Theme,
|
_theme: &Theme,
|
||||||
bounds: Rectangle,
|
bounds: Rectangle,
|
||||||
_cursor: mouse::Cursor,
|
_cursor: mouse::Cursor,
|
||||||
) -> Vec<canvas::Geometry> {
|
) -> Vec<canvas::Geometry> {
|
||||||
let mut frame = canvas::Frame::new(renderer, bounds.size());
|
let mut geo_small_frame: Vec<Geometry> = vec![];
|
||||||
|
let mut geo_cursor: Vec<Geometry> = vec![];
|
||||||
|
let frame = canvas::Frame::new(renderer, bounds.size());
|
||||||
|
let global_width = bounds.width * state.zoom;
|
||||||
let mut toggle_color = true;
|
let mut toggle_color = true;
|
||||||
let padding = 8.;
|
let padding = 8.;
|
||||||
let w = bounds.width - (padding * 2.);
|
let w = global_width - (padding * 2.);
|
||||||
for (delta, _) in &self.poly_frame {
|
for (delta, polyframe) in &self.poly_frame {
|
||||||
let x = delta / self.length * w + 8.;
|
let x = delta / self.length * w + 8. - state.offset;
|
||||||
frame.fill_rectangle(
|
let mut back_frame = canvas::Frame::new(
|
||||||
iced::Point { x: x, y: 0.0 },
|
renderer,
|
||||||
frame.size(),
|
Size {
|
||||||
if toggle_color {
|
width: global_width.clamp(0.0, bounds.width),
|
||||||
Color::from_rgb(0.3, 0.3, 0.3)
|
height: bounds.height,
|
||||||
} else {
|
|
||||||
Color::from_rgb(0.1, 0.1, 0.1)
|
|
||||||
},
|
|
||||||
);
|
|
||||||
toggle_color = !toggle_color;
|
|
||||||
}
|
|
||||||
frame.stroke_rectangle(
|
|
||||||
iced::Point { x: 0.0, y: 0.0 },
|
|
||||||
frame.size(),
|
|
||||||
Stroke {
|
|
||||||
width: 16.0,
|
|
||||||
..Stroke::default()
|
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
let x = self.current_delta / self.length * w + 8.;
|
back_frame.fill_rectangle(
|
||||||
frame.stroke_rectangle(
|
iced::Point { x: x, y: 0.0 },
|
||||||
|
Size {
|
||||||
|
width: global_width,
|
||||||
|
height: bounds.height,
|
||||||
|
},
|
||||||
|
if toggle_color {
|
||||||
|
Color::from_rgb8(27, 60, 83)
|
||||||
|
} else {
|
||||||
|
Color::from_rgb8(69, 104, 130)
|
||||||
|
},
|
||||||
|
);
|
||||||
|
geo_small_frame.push(back_frame.into_geometry());
|
||||||
|
toggle_color = !toggle_color;
|
||||||
|
let mut small_frame = canvas::Frame::new(
|
||||||
|
renderer,
|
||||||
|
Size {
|
||||||
|
width: global_width.clamp(0.0, bounds.width),
|
||||||
|
height: bounds.height,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
small_frame.translate(Vector {
|
||||||
|
x: x + (bounds.height / 10.),
|
||||||
|
y: (bounds.height / 10.),
|
||||||
|
});
|
||||||
|
polyframe.draw_in_frame(
|
||||||
|
&mut small_frame,
|
||||||
|
Size {
|
||||||
|
width: (8. * bounds.height) / 10.,
|
||||||
|
height: (8. * bounds.height) / 10.,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
geo_small_frame.push(small_frame.into_geometry());
|
||||||
|
}
|
||||||
|
let x = self.current_delta / self.length * w + 8. - state.offset;
|
||||||
|
let mut frame_cursor = canvas::Frame::new(renderer, bounds.size());
|
||||||
|
frame_cursor.stroke_rectangle(
|
||||||
iced::Point::new(x, 0.),
|
iced::Point::new(x, 0.),
|
||||||
iced::Size {
|
iced::Size {
|
||||||
width: 0.,
|
width: 0.,
|
||||||
@@ -201,13 +293,33 @@ impl canvas::Program<Message> for Music {
|
|||||||
},
|
},
|
||||||
Stroke {
|
Stroke {
|
||||||
width: 4.0,
|
width: 4.0,
|
||||||
style: Style::Solid(Color::from_rgb(1.0, 0.0, 0.0)),
|
style: Style::Solid(Color::from_rgba(1.0, 0.0, 0.0, 1.)),
|
||||||
..Stroke::default()
|
..Stroke::default()
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
frame_cursor.stroke_rectangle(
|
||||||
|
iced::Point {
|
||||||
|
x: -state.offset,
|
||||||
|
y: 0.0,
|
||||||
|
},
|
||||||
|
iced::Size {
|
||||||
|
width: global_width,
|
||||||
|
height: bounds.height,
|
||||||
|
},
|
||||||
|
Stroke {
|
||||||
|
width: 16.0,
|
||||||
|
style: Style::Solid(Color::from_rgb8(207, 74, 28)),
|
||||||
|
..Stroke::default()
|
||||||
|
},
|
||||||
|
);
|
||||||
|
geo_cursor.push(frame_cursor.into_geometry());
|
||||||
|
|
||||||
|
//vec_geo.push(frame.into_geometry());
|
||||||
// Then, we produce the geometry
|
// Then, we produce the geometry
|
||||||
vec![frame.into_geometry()]
|
let mut out = vec![frame.into_geometry()];
|
||||||
|
out.append(&mut geo_small_frame);
|
||||||
|
out.append(&mut geo_cursor);
|
||||||
|
out
|
||||||
}
|
}
|
||||||
fn update(
|
fn update(
|
||||||
&self,
|
&self,
|
||||||
@@ -217,12 +329,21 @@ impl canvas::Program<Message> for Music {
|
|||||||
cursor: Cursor,
|
cursor: Cursor,
|
||||||
) -> (Status, Option<Message>) {
|
) -> (Status, Option<Message>) {
|
||||||
//eprintln!("event = {:?}", event);
|
//eprintln!("event = {:?}", event);
|
||||||
|
if let Event::Keyboard(keyboard_event) = &event {
|
||||||
|
match keyboard_event {
|
||||||
|
keyboard::Event::ModifiersChanged(m) => {
|
||||||
|
state.ctrl = m.control();
|
||||||
|
}
|
||||||
|
_ => (),
|
||||||
|
}
|
||||||
|
}
|
||||||
if let Event::Mouse(mouse_event) = event {
|
if let Event::Mouse(mouse_event) = event {
|
||||||
match mouse_event {
|
match mouse_event {
|
||||||
mouse::Event::ButtonPressed(mouse::Button::Left) => {
|
mouse::Event::ButtonPressed(mouse::Button::Left) => {
|
||||||
*state = true;
|
state.mouse_left = true;
|
||||||
if let Some(position) = cursor.position_in(bounds) {
|
if let Some(position) = cursor.position_in(bounds) {
|
||||||
let pos_x = (position.x - 8.0) / (bounds.width - 16.);
|
let pos_x =
|
||||||
|
(position.x + state.offset - 8.0) / (bounds.width * state.zoom - 16.);
|
||||||
let delta = (pos_x * self.length).clamp(0., self.length);
|
let delta = (pos_x * self.length).clamp(0., self.length);
|
||||||
return (
|
return (
|
||||||
Status::Captured,
|
Status::Captured,
|
||||||
@@ -230,19 +351,52 @@ impl canvas::Program<Message> for Music {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
mouse::Event::ButtonReleased(mouse::Button::Left) => *state = false,
|
mouse::Event::ButtonReleased(mouse::Button::Left) => state.mouse_left = false,
|
||||||
mouse::Event::CursorMoved { position: _ } => {
|
mouse::Event::CursorMoved { position: _ } => {
|
||||||
if let Some(position) = cursor.position_in(bounds)
|
if let Some(position) = cursor.position_in(bounds)
|
||||||
&& *state
|
&& state.mouse_left
|
||||||
{
|
{
|
||||||
let pos_x = (position.x - 8.0) / (bounds.width - 16.);
|
let pos_x =
|
||||||
|
(position.x + state.offset - 8.0) / (bounds.width * state.zoom - 16.);
|
||||||
let delta = (pos_x * self.length).clamp(0., self.length);
|
let delta = (pos_x * self.length).clamp(0., self.length);
|
||||||
return (Status::Captured, Some(Message::ClickedOnTimeLine(delta)));
|
return (Status::Captured, Some(Message::ClickedOnTimeLine(delta)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
mouse::Event::WheelScrolled { delta: d } => {
|
||||||
|
if state.ctrl {
|
||||||
|
match d {
|
||||||
|
ScrollDelta::Lines { x: _, y } => {
|
||||||
|
let before = bounds.width * state.zoom;
|
||||||
|
state.zoom += y / 10.;
|
||||||
|
state.offset = state.offset * (bounds.width * state.zoom) / before;
|
||||||
|
}
|
||||||
|
ScrollDelta::Pixels { x: _, y } => {
|
||||||
|
let before = bounds.width * state.zoom;
|
||||||
|
state.zoom += y / 10.;
|
||||||
|
state.offset = state.offset * (bounds.width * state.zoom) / before;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
match d {
|
||||||
|
ScrollDelta::Lines { x: _, y } => {
|
||||||
|
state.offset -= y * 32. * state.zoom;
|
||||||
|
}
|
||||||
|
ScrollDelta::Pixels { x: _, y } => {
|
||||||
|
state.offset -= y * 32. * state.zoom;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
_ => {}
|
_ => {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
state.zoom = state.zoom.clamp(1.0, 10.);
|
||||||
|
if state.offset + bounds.width >= bounds.width * state.zoom {
|
||||||
|
state.offset = bounds.width * state.zoom - bounds.width
|
||||||
|
}
|
||||||
|
if state.offset <= 0. {
|
||||||
|
state.offset = 0.
|
||||||
|
}
|
||||||
|
|
||||||
(Status::Ignored, None)
|
(Status::Ignored, None)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,12 +2,12 @@ use crate::utils::string_to_color;
|
|||||||
|
|
||||||
use std::f32::consts::PI;
|
use std::f32::consts::PI;
|
||||||
|
|
||||||
|
use iced::Size;
|
||||||
use iced::Vector;
|
use iced::Vector;
|
||||||
use iced::mouse;
|
use iced::mouse;
|
||||||
use iced::widget::canvas;
|
use iced::widget::canvas;
|
||||||
use iced::widget::canvas::Stroke;
|
use iced::widget::canvas::{Frame, Stroke, Style};
|
||||||
use iced::widget::canvas::Style;
|
use iced::{Color, Point, Rectangle, Renderer, Theme};
|
||||||
use iced::{Color, Rectangle, Renderer, Theme};
|
|
||||||
use kira::sound::static_sound::StaticSoundData;
|
use kira::sound::static_sound::StaticSoundData;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
@@ -49,6 +49,65 @@ impl PolygonFrame {
|
|||||||
polygons: vec![],
|
polygons: vec![],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
pub fn draw_in_frame(&self, frame: &mut Frame, size: Size) {
|
||||||
|
let radius = size.height / 2.0 - (size.height / 10.);
|
||||||
|
let mut vec = Vector::new(0.0, -radius);
|
||||||
|
let c = Point {
|
||||||
|
x: size.width / 2.,
|
||||||
|
y: size.height / 2.,
|
||||||
|
};
|
||||||
|
|
||||||
|
// Draw Circle
|
||||||
|
let circle = canvas::Path::circle(c, radius);
|
||||||
|
frame.stroke(
|
||||||
|
&circle,
|
||||||
|
Stroke {
|
||||||
|
width: 6.0,
|
||||||
|
style: Style::Solid(Color::from_rgba8(210, 193, 182, 0.25)),
|
||||||
|
..Stroke::default()
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
// Draw all polygons by there points
|
||||||
|
for poly in &self.polygons {
|
||||||
|
let l = poly.points_teta.len();
|
||||||
|
let mut line: canvas::Path;
|
||||||
|
let mut t1: f32;
|
||||||
|
let mut t2: f32;
|
||||||
|
let mut color: Color;
|
||||||
|
for i in 0..l {
|
||||||
|
t1 = poly.points_teta[i] + poly.global_teta;
|
||||||
|
t2 = poly.points_teta[(i + 1) % l] + poly.global_teta;
|
||||||
|
line = canvas::Path::line(c + vec.rotate(t1), c + vec.rotate(t2));
|
||||||
|
color = poly.color.clone();
|
||||||
|
color.a = 0.25;
|
||||||
|
frame.stroke(
|
||||||
|
&line,
|
||||||
|
Stroke {
|
||||||
|
width: 4.0,
|
||||||
|
style: Style::Solid(poly.color.clone()),
|
||||||
|
..Stroke::default()
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
// Draw the red dot on the current position
|
||||||
|
let dot = canvas::Path::circle(frame.center() + vec.rotate(self.teta), 10.0);
|
||||||
|
frame.fill(&dot, Color::from_rgb(1.0, 0.0, 0.0));
|
||||||
|
*/
|
||||||
|
// Draw the frame
|
||||||
|
/*
|
||||||
|
frame.stroke_rectangle(
|
||||||
|
iced::Point { x: 0.0, y: 0.0 },
|
||||||
|
size,
|
||||||
|
Stroke {
|
||||||
|
width: 8.0,
|
||||||
|
style: Style::Solid(Color::from_rgb8(207, 74, 28)),
|
||||||
|
..Stroke::default()
|
||||||
|
},
|
||||||
|
);*/
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<Message> canvas::Program<Message> for PolygonFrame {
|
impl<Message> canvas::Program<Message> for PolygonFrame {
|
||||||
@@ -67,13 +126,18 @@ impl<Message> canvas::Program<Message> for PolygonFrame {
|
|||||||
let radius = frame.size().width.min(frame.size().height) / 2.0 - 32.0;
|
let radius = frame.size().width.min(frame.size().height) / 2.0 - 32.0;
|
||||||
let mut vec = Vector::new(0.0, -radius);
|
let mut vec = Vector::new(0.0, -radius);
|
||||||
let c = frame.center();
|
let c = frame.center();
|
||||||
|
frame.fill_rectangle(
|
||||||
|
iced::Point { x: 0., y: 0. },
|
||||||
|
frame.size(),
|
||||||
|
Color::from_rgb8(27, 60, 83),
|
||||||
|
);
|
||||||
// Draw Circle
|
// Draw Circle
|
||||||
let circle = canvas::Path::circle(frame.center(), radius);
|
let circle = canvas::Path::circle(frame.center(), radius);
|
||||||
frame.stroke(
|
frame.stroke(
|
||||||
&circle,
|
&circle,
|
||||||
Stroke {
|
Stroke {
|
||||||
width: 6.0,
|
width: 6.0,
|
||||||
style: Style::Solid(Color::from_rgba(0.0, 0.0, 0.0, 1.0)),
|
style: Style::Solid(Color::from_rgb8(210, 193, 182)),
|
||||||
..Stroke::default()
|
..Stroke::default()
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
@@ -100,7 +164,7 @@ impl<Message> canvas::Program<Message> for PolygonFrame {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Draw the red dot on the current position
|
// Draw the red dot on the current position
|
||||||
let dot = canvas::Path::circle(frame.center() + vec.rotate(self.teta), 5.0);
|
let dot = canvas::Path::circle(frame.center() + vec.rotate(self.teta), 10.0);
|
||||||
frame.fill(&dot, Color::from_rgb(1.0, 0.0, 0.0));
|
frame.fill(&dot, Color::from_rgb(1.0, 0.0, 0.0));
|
||||||
|
|
||||||
// Draw the frame
|
// Draw the frame
|
||||||
@@ -109,6 +173,7 @@ impl<Message> canvas::Program<Message> for PolygonFrame {
|
|||||||
frame.size(),
|
frame.size(),
|
||||||
Stroke {
|
Stroke {
|
||||||
width: 16.0,
|
width: 16.0,
|
||||||
|
style: Style::Solid(Color::from_rgb8(207, 74, 28)),
|
||||||
..Stroke::default()
|
..Stroke::default()
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
@@ -129,6 +194,8 @@ pub struct Polygon {
|
|||||||
#[serde(skip)]
|
#[serde(skip)]
|
||||||
pub color: Color,
|
pub color: Color,
|
||||||
pub color_name: String,
|
pub color_name: String,
|
||||||
|
#[serde(skip)]
|
||||||
|
pub show_color_picker: bool,
|
||||||
}
|
}
|
||||||
#[warn(dead_code)]
|
#[warn(dead_code)]
|
||||||
impl Polygon {
|
impl Polygon {
|
||||||
@@ -153,61 +220,55 @@ impl Polygon {
|
|||||||
}
|
}
|
||||||
sound_to_play
|
sound_to_play
|
||||||
}
|
}
|
||||||
|
pub fn default(sound: StaticSoundData) -> Self {
|
||||||
|
Polygon {
|
||||||
|
global_teta: 0.,
|
||||||
|
points_teta: vec![],
|
||||||
|
sound: sound,
|
||||||
|
sound_name: "tick.ogg".to_string(),
|
||||||
|
color_name: "Black".to_string(),
|
||||||
|
name: "".to_string(),
|
||||||
|
color: Color::BLACK,
|
||||||
|
show_color_picker: false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub fn n_gon(teta: f32, n_side: u8, sound: StaticSoundData) -> Self {
|
pub fn n_gon(n_side: u8, sound: StaticSoundData) -> Self {
|
||||||
let mut v: Vec<f32> = Vec::with_capacity(n_side as usize);
|
let mut v: Vec<f32> = Vec::with_capacity(n_side as usize);
|
||||||
for i in 0..n_side {
|
for i in 0..n_side {
|
||||||
v.push((i as f32 * 2.0 * PI) / n_side as f32);
|
v.push((i as f32 * 2.0 * PI) / n_side as f32);
|
||||||
}
|
}
|
||||||
Polygon {
|
let mut p = Polygon::default(sound);
|
||||||
global_teta: teta,
|
p.points_teta = v;
|
||||||
points_teta: v,
|
p
|
||||||
sound: sound,
|
|
||||||
sound_name: "tick.ogg".to_string(),
|
|
||||||
color_name: "Black".to_string(),
|
|
||||||
name: "".to_string(),
|
|
||||||
color: Color::BLACK,
|
|
||||||
}
|
}
|
||||||
}
|
pub fn segment(sound: StaticSoundData) -> Self {
|
||||||
pub fn segment(teta: f32, sound: StaticSoundData) -> Self {
|
Polygon::n_gon(2, sound)
|
||||||
Polygon::n_gon(teta, 2, sound)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn triangle(teta: f32, sound: StaticSoundData) -> Self {
|
pub fn triangle(sound: StaticSoundData) -> Self {
|
||||||
Polygon::n_gon(teta, 3, sound)
|
Polygon::n_gon(3, sound)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn square(teta: f32, sound: StaticSoundData) -> Self {
|
pub fn square(sound: StaticSoundData) -> Self {
|
||||||
Polygon::n_gon(teta, 4, sound)
|
Polygon::n_gon(4, sound)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn nr_6_in_30(teta: f32, sound: StaticSoundData) -> Self {
|
pub fn nr_6_in_30(sound: StaticSoundData) -> Self {
|
||||||
Polygon {
|
let mut p = Polygon::default(sound);
|
||||||
sound: sound,
|
p.points_teta = vec![
|
||||||
name: "".to_string(),
|
|
||||||
color: Color::BLACK,
|
|
||||||
global_teta: teta,
|
|
||||||
sound_name: "tick.ogg".to_string(),
|
|
||||||
color_name: "Black".to_string(),
|
|
||||||
points_teta: vec![
|
|
||||||
2.0 * 5.0 * PI / 30.0,
|
2.0 * 5.0 * PI / 30.0,
|
||||||
2.0 * 6.0 * PI / 30.0,
|
2.0 * 6.0 * PI / 30.0,
|
||||||
2.0 * 12.0 * PI / 30.0,
|
2.0 * 12.0 * PI / 30.0,
|
||||||
2.0 * 18.0 * PI / 30.0,
|
2.0 * 18.0 * PI / 30.0,
|
||||||
2.0 * 24.0 * PI / 30.0,
|
2.0 * 24.0 * PI / 30.0,
|
||||||
2.0 * 25.0 * PI / 30.0,
|
2.0 * 25.0 * PI / 30.0,
|
||||||
],
|
];
|
||||||
|
p
|
||||||
}
|
}
|
||||||
}
|
pub fn nr_7_in_30(sound: StaticSoundData) -> Self {
|
||||||
pub fn nr_7_in_30(teta: f32, sound: StaticSoundData) -> Self {
|
let mut p = Polygon::default(sound);
|
||||||
Polygon {
|
p.points_teta = vec![
|
||||||
sound: sound,
|
|
||||||
name: "".to_string(),
|
|
||||||
color: Color::BLACK,
|
|
||||||
sound_name: "tick.ogg".to_string(),
|
|
||||||
color_name: "Black".to_string(),
|
|
||||||
global_teta: teta,
|
|
||||||
points_teta: vec![
|
|
||||||
0.0,
|
0.0,
|
||||||
2.0 * 6.0 * PI / 30.0,
|
2.0 * 6.0 * PI / 30.0,
|
||||||
2.0 * 7.0 * PI / 30.0,
|
2.0 * 7.0 * PI / 30.0,
|
||||||
@@ -215,18 +276,12 @@ impl Polygon {
|
|||||||
2.0 * 17.0 * PI / 30.0,
|
2.0 * 17.0 * PI / 30.0,
|
||||||
2.0 * 23.0 * PI / 30.0,
|
2.0 * 23.0 * PI / 30.0,
|
||||||
2.0 * 24.0 * PI / 30.0,
|
2.0 * 24.0 * PI / 30.0,
|
||||||
],
|
];
|
||||||
|
p
|
||||||
}
|
}
|
||||||
}
|
pub fn nr_8_in_30(sound: StaticSoundData) -> Self {
|
||||||
pub fn nr_8_in_30(teta: f32, sound: StaticSoundData) -> Self {
|
let mut p = Polygon::default(sound);
|
||||||
Polygon {
|
p.points_teta = vec![
|
||||||
sound: sound,
|
|
||||||
name: "".to_string(),
|
|
||||||
color: Color::BLACK,
|
|
||||||
sound_name: "tick.ogg".to_string(),
|
|
||||||
color_name: "Black".to_string(),
|
|
||||||
global_teta: teta,
|
|
||||||
points_teta: vec![
|
|
||||||
2.0 * PI / 30.0,
|
2.0 * PI / 30.0,
|
||||||
2.0 * 5.0 * PI / 30.0,
|
2.0 * 5.0 * PI / 30.0,
|
||||||
2.0 * 11.0 * PI / 30.0,
|
2.0 * 11.0 * PI / 30.0,
|
||||||
@@ -235,18 +290,12 @@ impl Polygon {
|
|||||||
2.0 * 19.0 * PI / 30.0,
|
2.0 * 19.0 * PI / 30.0,
|
||||||
2.0 * 25.0 * PI / 30.0,
|
2.0 * 25.0 * PI / 30.0,
|
||||||
2.0 * 29.0 * PI / 30.0,
|
2.0 * 29.0 * PI / 30.0,
|
||||||
],
|
];
|
||||||
|
p
|
||||||
}
|
}
|
||||||
}
|
pub fn nr_9_in_30(sound: StaticSoundData) -> Self {
|
||||||
pub fn nr_9_in_30(teta: f32, sound: StaticSoundData) -> Self {
|
let mut p = Polygon::default(sound);
|
||||||
Polygon {
|
p.points_teta = vec![
|
||||||
sound: sound,
|
|
||||||
name: "".to_string(),
|
|
||||||
color: Color::BLACK,
|
|
||||||
sound_name: "tick.ogg".to_string(),
|
|
||||||
color_name: "Black".to_string(),
|
|
||||||
global_teta: teta,
|
|
||||||
points_teta: vec![
|
|
||||||
0.0,
|
0.0,
|
||||||
2.0 * PI / 30.0,
|
2.0 * PI / 30.0,
|
||||||
2.0 * 7.0 * PI / 30.0,
|
2.0 * 7.0 * PI / 30.0,
|
||||||
@@ -256,18 +305,12 @@ impl Polygon {
|
|||||||
2.0 * 19.0 * PI / 30.0,
|
2.0 * 19.0 * PI / 30.0,
|
||||||
2.0 * 23.0 * PI / 30.0,
|
2.0 * 23.0 * PI / 30.0,
|
||||||
2.0 * 29.0 * PI / 30.0,
|
2.0 * 29.0 * PI / 30.0,
|
||||||
],
|
];
|
||||||
|
p
|
||||||
}
|
}
|
||||||
}
|
pub fn nr_8_in_42(sound: StaticSoundData) -> Self {
|
||||||
pub fn nr_8_in_42(teta: f32, sound: StaticSoundData) -> Self {
|
let mut p = Polygon::default(sound);
|
||||||
Polygon {
|
p.points_teta = vec![
|
||||||
sound: sound,
|
|
||||||
name: "".to_string(),
|
|
||||||
color: Color::BLACK,
|
|
||||||
sound_name: "tick.ogg".to_string(),
|
|
||||||
color_name: "Black".to_string(),
|
|
||||||
global_teta: teta,
|
|
||||||
points_teta: vec![
|
|
||||||
2.0 * 3.0 * PI / 42.0,
|
2.0 * 3.0 * PI / 42.0,
|
||||||
2.0 * 9.0 * PI / 42.0,
|
2.0 * 9.0 * PI / 42.0,
|
||||||
2.0 * 14.0 * PI / 42.0,
|
2.0 * 14.0 * PI / 42.0,
|
||||||
@@ -276,18 +319,12 @@ impl Polygon {
|
|||||||
2.0 * 28.0 * PI / 42.0,
|
2.0 * 28.0 * PI / 42.0,
|
||||||
2.0 * 33.0 * PI / 42.0,
|
2.0 * 33.0 * PI / 42.0,
|
||||||
2.0 * 39.0 * PI / 42.0,
|
2.0 * 39.0 * PI / 42.0,
|
||||||
],
|
];
|
||||||
|
p
|
||||||
}
|
}
|
||||||
}
|
pub fn nr_9_in_42(sound: StaticSoundData) -> Self {
|
||||||
pub fn nr_9_in_42(teta: f32, sound: StaticSoundData) -> Self {
|
let mut p = Polygon::default(sound);
|
||||||
Polygon {
|
p.points_teta = vec![
|
||||||
sound: sound,
|
|
||||||
name: "".to_string(),
|
|
||||||
color: Color::BLACK,
|
|
||||||
sound_name: "tick.ogg".to_string(),
|
|
||||||
color_name: "Black".to_string(),
|
|
||||||
global_teta: teta,
|
|
||||||
points_teta: vec![
|
|
||||||
0.0,
|
0.0,
|
||||||
2.0 * 6.0 * PI / 42.0,
|
2.0 * 6.0 * PI / 42.0,
|
||||||
2.0 * 11.0 * PI / 42.0,
|
2.0 * 11.0 * PI / 42.0,
|
||||||
@@ -297,18 +334,12 @@ impl Polygon {
|
|||||||
2.0 * 30.0 * PI / 42.0,
|
2.0 * 30.0 * PI / 42.0,
|
||||||
2.0 * 31.0 * PI / 42.0,
|
2.0 * 31.0 * PI / 42.0,
|
||||||
2.0 * 36.0 * PI / 42.0,
|
2.0 * 36.0 * PI / 42.0,
|
||||||
],
|
];
|
||||||
|
p
|
||||||
}
|
}
|
||||||
}
|
pub fn nr_10a_in_42(sound: StaticSoundData) -> Self {
|
||||||
pub fn nr_10a_in_42(teta: f32, sound: StaticSoundData) -> Self {
|
let mut p = Polygon::default(sound);
|
||||||
Polygon {
|
p.points_teta = vec![
|
||||||
sound: sound,
|
|
||||||
name: "".to_string(),
|
|
||||||
color: Color::BLACK,
|
|
||||||
sound_name: "tick.ogg".to_string(),
|
|
||||||
color_name: "Black".to_string(),
|
|
||||||
global_teta: teta,
|
|
||||||
points_teta: vec![
|
|
||||||
2.0 * 6.0 * PI / 42.0,
|
2.0 * 6.0 * PI / 42.0,
|
||||||
2.0 * 7.0 * PI / 42.0,
|
2.0 * 7.0 * PI / 42.0,
|
||||||
2.0 * 11.0 * PI / 42.0,
|
2.0 * 11.0 * PI / 42.0,
|
||||||
@@ -319,18 +350,12 @@ impl Polygon {
|
|||||||
2.0 * 31.0 * PI / 42.0,
|
2.0 * 31.0 * PI / 42.0,
|
||||||
2.0 * 35.0 * PI / 42.0,
|
2.0 * 35.0 * PI / 42.0,
|
||||||
2.0 * 36.0 * PI / 42.0,
|
2.0 * 36.0 * PI / 42.0,
|
||||||
],
|
];
|
||||||
|
p
|
||||||
}
|
}
|
||||||
}
|
pub fn nr_10b_in_42(sound: StaticSoundData) -> Self {
|
||||||
pub fn nr_10b_in_42(teta: f32, sound: StaticSoundData) -> Self {
|
let mut p = Polygon::default(sound);
|
||||||
Polygon {
|
p.points_teta = vec![
|
||||||
sound: sound,
|
|
||||||
name: "".to_string(),
|
|
||||||
color: Color::BLACK,
|
|
||||||
sound_name: "tick.ogg".to_string(),
|
|
||||||
color_name: "Black".to_string(),
|
|
||||||
global_teta: teta,
|
|
||||||
points_teta: vec![
|
|
||||||
0.0,
|
0.0,
|
||||||
2.0 * 1.0 * PI / 42.0,
|
2.0 * 1.0 * PI / 42.0,
|
||||||
2.0 * 5.0 * PI / 42.0,
|
2.0 * 5.0 * PI / 42.0,
|
||||||
@@ -341,8 +366,8 @@ impl Polygon {
|
|||||||
2.0 * 29.0 * PI / 42.0,
|
2.0 * 29.0 * PI / 42.0,
|
||||||
2.0 * 30.0 * PI / 42.0,
|
2.0 * 30.0 * PI / 42.0,
|
||||||
2.0 * 41.0 * PI / 42.0,
|
2.0 * 41.0 * PI / 42.0,
|
||||||
],
|
];
|
||||||
}
|
p
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fn dummy_sound() -> StaticSoundData {
|
fn dummy_sound() -> StaticSoundData {
|
||||||
|
|||||||
34
src/utils.rs
34
src/utils.rs
@@ -1,6 +1,12 @@
|
|||||||
use crate::Polygon;
|
use crate::Polygon;
|
||||||
use iced::Color;
|
use iced::Color;
|
||||||
use kira::sound::static_sound::StaticSoundData;
|
use kira::sound::static_sound::StaticSoundData;
|
||||||
|
use regex::Regex;
|
||||||
|
|
||||||
|
pub fn is_delta_format_valid(str: &str) -> bool {
|
||||||
|
let re = Regex::new(r"^\d{1,2}:\d{1,2}:\d{1,2}$").unwrap();
|
||||||
|
re.is_match(str)
|
||||||
|
}
|
||||||
pub fn string_to_color<S: AsRef<str>>(s: S) -> Color {
|
pub fn string_to_color<S: AsRef<str>>(s: S) -> Color {
|
||||||
match s.as_ref() {
|
match s.as_ref() {
|
||||||
"Green" => Color::from_rgb(0.0, 1.0, 0.0),
|
"Green" => Color::from_rgb(0.0, 1.0, 0.0),
|
||||||
@@ -43,46 +49,46 @@ pub fn string_to_polygon<S: AsRef<str>>(str: S) -> Polygon {
|
|||||||
let mut poly: Polygon;
|
let mut poly: Polygon;
|
||||||
if s.starts_with("Ngon") {
|
if s.starts_with("Ngon") {
|
||||||
if let Ok(sides) = s.trim_start_matches("Ngon").parse::<u8>() {
|
if let Ok(sides) = s.trim_start_matches("Ngon").parse::<u8>() {
|
||||||
poly = Polygon::n_gon(0.0, sides, dummy_sound());
|
poly = Polygon::n_gon(sides, dummy_sound());
|
||||||
} else {
|
} else {
|
||||||
poly = Polygon::n_gon(0.0, 0, dummy_sound());
|
poly = Polygon::n_gon(0, dummy_sound());
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
match s {
|
match s {
|
||||||
"Segment" => {
|
"Segment" => {
|
||||||
poly = Polygon::segment(0.0, dummy_sound());
|
poly = Polygon::segment(dummy_sound());
|
||||||
}
|
}
|
||||||
"Triangle" => {
|
"Triangle" => {
|
||||||
poly = Polygon::triangle(0.0, dummy_sound());
|
poly = Polygon::triangle(dummy_sound());
|
||||||
}
|
}
|
||||||
"Square" => {
|
"Square" => {
|
||||||
poly = Polygon::square(0.0, dummy_sound());
|
poly = Polygon::square(dummy_sound());
|
||||||
}
|
}
|
||||||
"Nr6In30" => {
|
"Nr6In30" => {
|
||||||
poly = Polygon::nr_6_in_30(0.0, dummy_sound());
|
poly = Polygon::nr_6_in_30(dummy_sound());
|
||||||
}
|
}
|
||||||
"Nr7In30" => {
|
"Nr7In30" => {
|
||||||
poly = Polygon::nr_7_in_30(0.0, dummy_sound());
|
poly = Polygon::nr_7_in_30(dummy_sound());
|
||||||
}
|
}
|
||||||
"Nr8In30" => {
|
"Nr8In30" => {
|
||||||
poly = Polygon::nr_8_in_30(0.0, dummy_sound());
|
poly = Polygon::nr_8_in_30(dummy_sound());
|
||||||
}
|
}
|
||||||
"Nr9In30" => {
|
"Nr9In30" => {
|
||||||
poly = Polygon::nr_9_in_30(0.0, dummy_sound());
|
poly = Polygon::nr_9_in_30(dummy_sound());
|
||||||
}
|
}
|
||||||
"Nr8In42" => {
|
"Nr8In42" => {
|
||||||
poly = Polygon::nr_8_in_42(0.0, dummy_sound());
|
poly = Polygon::nr_8_in_42(dummy_sound());
|
||||||
}
|
}
|
||||||
"Nr9In42" => {
|
"Nr9In42" => {
|
||||||
poly = Polygon::nr_9_in_42(0.0, dummy_sound());
|
poly = Polygon::nr_9_in_42(dummy_sound());
|
||||||
}
|
}
|
||||||
"Nr10aIn42" => {
|
"Nr10aIn42" => {
|
||||||
poly = Polygon::nr_10a_in_42(0.0, dummy_sound());
|
poly = Polygon::nr_10a_in_42(dummy_sound());
|
||||||
}
|
}
|
||||||
"Nr10bIn42" => {
|
"Nr10bIn42" => {
|
||||||
poly = Polygon::nr_10b_in_42(0.0, dummy_sound());
|
poly = Polygon::nr_10b_in_42(dummy_sound());
|
||||||
}
|
}
|
||||||
_ => poly = Polygon::n_gon(0.0, 0, dummy_sound()),
|
_ => poly = Polygon::n_gon(0, dummy_sound()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
poly.name = s.to_string();
|
poly.name = s.to_string();
|
||||||
|
|||||||
Reference in New Issue
Block a user