StardustXR/protostar
1
0
Fork 0
Code Issues 5 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat: upgrade molecules

Browse Source
This commit is contained in:
Nova
2024-05-17 23:34:47 -04:00
parent 358a4bec29
commit 4fc7a513b6
10 changed files with 186 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

280
Cargo.lock generated
View File

@@ -84,47 +84,48 @@ dependencies = [
[[package]] [[package]]
name = "anstream" name = "anstream"
version = "0.6.13" version = "0.6.14"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
dependencies = [ dependencies = [
"anstyle", "anstyle",
"anstyle-parse", "anstyle-parse",
"anstyle-query", "anstyle-query",
"anstyle-wincon", "anstyle-wincon",
"colorchoice", "colorchoice",
"is_terminal_polyfill",
"utf8parse", "utf8parse",
] ]
[[package]] [[package]]
name = "anstyle" name = "anstyle"
version = "1.0.6" version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
[[package]] [[package]]
name = "anstyle-parse" name = "anstyle-parse"
version = "0.2.3" version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
dependencies = [ dependencies = [
"utf8parse", "utf8parse",
] ]
[[package]] [[package]]
name = "anstyle-query" name = "anstyle-query"
version = "1.0.2" version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5"
dependencies = [ dependencies = [
"windows-sys 0.52.0", "windows-sys 0.52.0",
] ]
[[package]] [[package]]
name = "anstyle-wincon" name = "anstyle-wincon"
version = "3.0.2" version = "3.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
dependencies = [ dependencies = [
"anstyle", "anstyle",
"windows-sys 0.52.0", "windows-sys 0.52.0",
@@ -136,10 +137,8 @@ version = "0.1.0"
dependencies = [ dependencies = [
"clap", "clap",
"color-eyre", "color-eyre",
"color-rs",
"glam 0.24.2", "glam 0.24.2",
"manifest-dir-macros", "manifest-dir-macros",
"mint",
"protostar", "protostar",
"stardust-xr-fusion", "stardust-xr-fusion",
"stardust-xr-molecules", "stardust-xr-molecules",
@@ -162,9 +161,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
[[package]] [[package]]
name = "autocfg" name = "autocfg"
version = "1.2.0" version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
[[package]] [[package]]
name = "backtrace" name = "backtrace"
@@ -189,9 +188,9 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
[[package]] [[package]]
name = "base64" name = "base64"
version = "0.22.0" version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
[[package]] [[package]]
name = "bit_field" name = "bit_field"
@@ -219,9 +218,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
[[package]] [[package]]
name = "bytemuck" name = "bytemuck"
version = "1.15.0" version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5"
[[package]] [[package]]
name = "byteorder" name = "byteorder"
@@ -237,9 +236,9 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
[[package]] [[package]]
name = "cc" name = "cc"
version = "1.0.95" version = "1.0.97"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4"
[[package]] [[package]]
name = "cfg-if" name = "cfg-if"
@@ -279,7 +278,7 @@ dependencies = [
"anstream", "anstream",
"anstyle", "anstyle",
"clap_lex", "clap_lex",
"strsim 0.11.1", "strsim",
] ]
[[package]] [[package]]
@@ -291,7 +290,7 @@ dependencies = [
"heck", "heck",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.60", "syn 2.0.64",
] ]
[[package]] [[package]]
@@ -337,8 +336,7 @@ dependencies = [
[[package]] [[package]]
name = "color-rs" name = "color-rs"
version = "0.8.0" version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/arturoc/color-rs.git#d50d5e37aaf91ccd39d0832f43a417e3405d2ece"
checksum = "3415c18b81f66b23614db9fcccbf19d2af434e04d9a6c7ac10e49930f39d89f8"
dependencies = [ dependencies = [
"angle", "angle",
"half 1.8.3", "half 1.8.3",
@@ -367,9 +365,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
[[package]] [[package]]
name = "colorchoice" name = "colorchoice"
version = "1.0.0" version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
[[package]] [[package]]
name = "convert_case" name = "convert_case"
@@ -428,9 +426,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
[[package]] [[package]]
name = "darling" name = "darling"
version = "0.20.8" version = "0.20.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1"
dependencies = [ dependencies = [
"darling_core", "darling_core",
"darling_macro", "darling_macro",
@@ -438,27 +436,27 @@ dependencies = [
[[package]] [[package]]
name = "darling_core" name = "darling_core"
version = "0.20.8" version = "0.20.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120"
dependencies = [ dependencies = [
"fnv", "fnv",
"ident_case", "ident_case",
"proc-macro2", "proc-macro2",
"quote", "quote",
"strsim 0.10.0", "strsim",
"syn 2.0.60", "syn 2.0.64",
] ]
[[package]] [[package]]
name = "darling_macro" name = "darling_macro"
version = "0.20.8" version = "0.20.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
dependencies = [ dependencies = [
"darling_core", "darling_core",
"quote", "quote",
"syn 2.0.60", "syn 2.0.64",
] ]
[[package]] [[package]]
@@ -544,9 +542,9 @@ checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257"
[[package]] [[package]]
name = "either" name = "either"
version = "1.11.0" version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
[[package]] [[package]]
name = "equivalent" name = "equivalent"
@@ -610,9 +608,9 @@ dependencies = [
[[package]] [[package]]
name = "flate2" name = "flate2"
version = "1.0.28" version = "1.0.30"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
dependencies = [ dependencies = [
"crc32fast", "crc32fast",
"miniz_oxide", "miniz_oxide",
@@ -706,9 +704,9 @@ checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
[[package]] [[package]]
name = "getrandom" name = "getrandom"
version = "0.2.14" version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"libc", "libc",
@@ -805,9 +803,9 @@ dependencies = [
[[package]] [[package]]
name = "hashbrown" name = "hashbrown"
version = "0.14.3" version = "0.14.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
[[package]] [[package]]
name = "heck" name = "heck"
@@ -827,10 +825,8 @@ version = "0.1.0"
dependencies = [ dependencies = [
"clap", "clap",
"color-eyre", "color-eyre",
"color-rs",
"glam 0.25.0", "glam 0.25.0",
"manifest-dir-macros", "manifest-dir-macros",
"mint",
"protostar", "protostar",
"serde", "serde",
"stardust-xr-fusion", "stardust-xr-fusion",
@@ -917,19 +913,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
dependencies = [ dependencies = [
"equivalent", "equivalent",
"hashbrown 0.14.3", "hashbrown 0.14.5",
"serde", "serde",
] ]
[[package]] [[package]]
name = "instant" name = "instant"
version = "0.1.12" version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
] ]
[[package]]
name = "is_terminal_polyfill"
version = "1.70.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
[[package]] [[package]]
name = "itertools" name = "itertools"
version = "0.11.0" version = "0.11.0"
@@ -1024,9 +1026,9 @@ dependencies = [
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.153" version = "0.2.155"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
[[package]] [[package]]
name = "libredox" name = "libredox"
@@ -1050,9 +1052,9 @@ dependencies = [
[[package]] [[package]]
name = "lock_api" name = "lock_api"
version = "0.4.11" version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
dependencies = [ dependencies = [
"autocfg", "autocfg",
"scopeguard", "scopeguard",
@@ -1073,7 +1075,7 @@ dependencies = [
"once_cell", "once_cell",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.60", "syn 2.0.64",
] ]
[[package]] [[package]]
@@ -1138,7 +1140,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.60", "syn 2.0.64",
] ]
[[package]] [[package]]
@@ -1149,9 +1151,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]] [[package]]
name = "miniz_oxide" name = "miniz_oxide"
version = "0.7.2" version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
dependencies = [ dependencies = [
"adler", "adler",
"simd-adler32", "simd-adler32",
@@ -1226,9 +1228,9 @@ checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
[[package]] [[package]]
name = "num-traits" name = "num-traits"
version = "0.2.18" version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
dependencies = [ dependencies = [
"autocfg", "autocfg",
] ]
@@ -1320,12 +1322,12 @@ dependencies = [
[[package]] [[package]]
name = "parking_lot" name = "parking_lot"
version = "0.12.1" version = "0.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb"
dependencies = [ dependencies = [
"lock_api", "lock_api",
"parking_lot_core 0.9.9", "parking_lot_core 0.9.10",
] ]
[[package]] [[package]]
@@ -1344,15 +1346,15 @@ dependencies = [
[[package]] [[package]]
name = "parking_lot_core" name = "parking_lot_core"
version = "0.9.9" version = "0.9.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"libc", "libc",
"redox_syscall 0.4.1", "redox_syscall 0.5.1",
"smallvec", "smallvec",
"windows-targets 0.48.5", "windows-targets 0.52.5",
] ]
[[package]] [[package]]
@@ -1404,9 +1406,9 @@ dependencies = [
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.81" version = "1.0.82"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
@@ -1567,11 +1569,11 @@ dependencies = [
[[package]] [[package]]
name = "redox_syscall" name = "redox_syscall"
version = "0.4.1" version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 2.5.0",
] ]
[[package]] [[package]]
@@ -1716,9 +1718,9 @@ dependencies = [
[[package]] [[package]]
name = "rustc-demangle" name = "rustc-demangle"
version = "0.1.23" version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
[[package]] [[package]]
name = "rustc-hash" name = "rustc-hash"
@@ -1753,9 +1755,9 @@ dependencies = [
[[package]] [[package]]
name = "ryu" name = "ryu"
version = "1.0.17" version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
[[package]] [[package]]
name = "same-file" name = "same-file"
@@ -1774,35 +1776,35 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]] [[package]]
name = "semver" name = "semver"
version = "1.0.22" version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
[[package]] [[package]]
name = "serde" name = "serde"
version = "1.0.198" version = "1.0.202"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395"
dependencies = [ dependencies = [
"serde_derive", "serde_derive",
] ]
[[package]] [[package]]
name = "serde_derive" name = "serde_derive"
version = "1.0.198" version = "1.0.202"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.60", "syn 2.0.64",
] ]
[[package]] [[package]]
name = "serde_json" name = "serde_json"
version = "1.0.116" version = "1.0.117"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
dependencies = [ dependencies = [
"itoa", "itoa",
"ryu", "ryu",
@@ -1817,25 +1819,25 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.60", "syn 2.0.64",
] ]
[[package]] [[package]]
name = "serde_spanned" name = "serde_spanned"
version = "0.6.5" version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
dependencies = [ dependencies = [
"serde", "serde",
] ]
[[package]] [[package]]
name = "serde_with" name = "serde_with"
version = "3.8.0" version = "3.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c85f8e96d1d6857f13768fcbd895fcb06225510022a2774ed8b5150581847b0" checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20"
dependencies = [ dependencies = [
"base64 0.22.0", "base64 0.22.1",
"chrono", "chrono",
"hex", "hex",
"indexmap 1.9.3", "indexmap 1.9.3",
@@ -1849,14 +1851,14 @@ dependencies = [
[[package]] [[package]]
name = "serde_with_macros" name = "serde_with_macros"
version = "3.8.0" version = "3.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c8b3a576c4eb2924262d5951a3b737ccaf16c931e39a2810c36f9a7e25575557" checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2"
dependencies = [ dependencies = [
"darling", "darling",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.60", "syn 2.0.64",
] ]
[[package]] [[package]]
@@ -1898,10 +1900,8 @@ version = "0.1.0"
dependencies = [ dependencies = [
"clap", "clap",
"color-eyre", "color-eyre",
"color-rs",
"glam 0.24.2", "glam 0.24.2",
"manifest-dir-macros", "manifest-dir-macros",
"mint",
"protostar", "protostar",
"stardust-xr-fusion", "stardust-xr-fusion",
"stardust-xr-molecules", "stardust-xr-molecules",
@@ -1922,10 +1922,8 @@ version = "0.1.0"
dependencies = [ dependencies = [
"clap", "clap",
"color-eyre", "color-eyre",
"color-rs",
"glam 0.24.2", "glam 0.24.2",
"manifest-dir-macros", "manifest-dir-macros",
"mint",
"protostar", "protostar",
"serde", "serde",
"stardust-xr-fusion", "stardust-xr-fusion",
@@ -1944,9 +1942,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
[[package]] [[package]]
name = "socket2" name = "socket2"
version = "0.5.6" version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
dependencies = [ dependencies = [
"libc", "libc",
"windows-sys 0.52.0", "windows-sys 0.52.0",
@@ -1970,7 +1968,7 @@ checksum = "2f2b15926089e5526bb2dd738a2eb0e59034356e06eb71e1cd912358c0e62c4d"
[[package]] [[package]]
name = "stardust-xr" name = "stardust-xr"
version = "0.45.0" version = "0.45.0"
source = "git+https://github.com/StardustXR/core.git#21120b8924d2a450f4dd92a022d4df40b7e3885d" source = "git+https://github.com/StardustXR/core.git#6ee323df1a1e76666609c1ebfd79f3390ce43c29"
dependencies = [ dependencies = [
"cluFlock", "cluFlock",
"color-rs", "color-rs",
@@ -1978,7 +1976,7 @@ dependencies = [
"global_counter", "global_counter",
"mint", "mint",
"nix", "nix",
"parking_lot 0.12.1", "parking_lot 0.12.2",
"rustc-hash", "rustc-hash",
"serde", "serde",
"stardust-xr-schemas", "stardust-xr-schemas",
@@ -1990,14 +1988,12 @@ dependencies = [
[[package]] [[package]]
name = "stardust-xr-fusion" name = "stardust-xr-fusion"
version = "0.45.0" version = "0.45.0"
source = "git+https://github.com/StardustXR/core.git#21120b8924d2a450f4dd92a022d4df40b7e3885d" source = "git+https://github.com/StardustXR/core.git#6ee323df1a1e76666609c1ebfd79f3390ce43c29"
dependencies = [ dependencies = [
"color-eyre", "color-eyre",
"color-rs",
"glam 0.24.2", "glam 0.24.2",
"mint",
"nanoid", "nanoid",
"parking_lot 0.12.1", "parking_lot 0.12.2",
"rustc-hash", "rustc-hash",
"serde", "serde",
"serde_repr", "serde_repr",
@@ -2011,7 +2007,7 @@ dependencies = [
[[package]] [[package]]
name = "stardust-xr-fusion-codegen" name = "stardust-xr-fusion-codegen"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/StardustXR/core.git#21120b8924d2a450f4dd92a022d4df40b7e3885d" source = "git+https://github.com/StardustXR/core.git#6ee323df1a1e76666609c1ebfd79f3390ce43c29"
dependencies = [ dependencies = [
"convert_case", "convert_case",
"mint", "mint",
@@ -2024,14 +2020,12 @@ dependencies = [
[[package]] [[package]]
name = "stardust-xr-molecules" name = "stardust-xr-molecules"
version = "0.45.0" version = "0.45.0"
source = "git+https://github.com/StardustXR/molecules.git#e996025989d971e0b3c7b5ad0cc3f8d4a29ea736" source = "git+https://github.com/StardustXR/molecules.git#55e7d75088c7b0d4b2d170f9a1106680d393dccc"
dependencies = [ dependencies = [
"color-rs",
"glam 0.25.0", "glam 0.25.0",
"lazy_static", "lazy_static",
"lerp", "lerp",
"map-range", "map-range",
"mint",
"rustc-hash", "rustc-hash",
"serde", "serde",
"stardust-xr-fusion", "stardust-xr-fusion",
@@ -2042,14 +2036,12 @@ dependencies = [
[[package]] [[package]]
name = "stardust-xr-schemas" name = "stardust-xr-schemas"
version = "1.5.3" version = "1.5.3"
source = "git+https://github.com/StardustXR/core.git#21120b8924d2a450f4dd92a022d4df40b7e3885d" source = "git+https://github.com/StardustXR/core.git#6ee323df1a1e76666609c1ebfd79f3390ce43c29"
dependencies = [ dependencies = [
"flatbuffers", "flatbuffers",
"flexbuffers", "flexbuffers",
"glam 0.25.0",
"kdl", "kdl",
"manifest-dir-macros", "manifest-dir-macros",
"mint",
"serde", "serde",
"serde_repr", "serde_repr",
"thiserror", "thiserror",
@@ -2064,12 +2056,6 @@ dependencies = [
"float-cmp", "float-cmp",
] ]
[[package]]
name = "strsim"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]] [[package]]
name = "strsim" name = "strsim"
version = "0.11.1" version = "0.11.1"
@@ -2119,9 +2105,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "2.0.60" version = "2.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" checksum = "7ad3dee41f36859875573074334c200d1add8e4a87bb37113ebd31d926b7b11f"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@@ -2140,22 +2126,22 @@ dependencies = [
[[package]] [[package]]
name = "thiserror" name = "thiserror"
version = "1.0.59" version = "1.0.61"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
dependencies = [ dependencies = [
"thiserror-impl", "thiserror-impl",
] ]
[[package]] [[package]]
name = "thiserror-impl" name = "thiserror-impl"
version = "1.0.59" version = "1.0.61"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.60", "syn 2.0.64",
] ]
[[package]] [[package]]
@@ -2245,7 +2231,7 @@ dependencies = [
"bytes", "bytes",
"libc", "libc",
"mio", "mio",
"parking_lot 0.12.1", "parking_lot 0.12.2",
"pin-project-lite", "pin-project-lite",
"signal-hook-registry", "signal-hook-registry",
"socket2", "socket2",
@@ -2261,26 +2247,26 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.60", "syn 2.0.64",
] ]
[[package]] [[package]]
name = "toml" name = "toml"
version = "0.8.12" version = "0.8.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba"
dependencies = [ dependencies = [
"serde", "serde",
"serde_spanned", "serde_spanned",
"toml_datetime", "toml_datetime",
"toml_edit 0.22.12", "toml_edit 0.22.13",
] ]
[[package]] [[package]]
name = "toml_datetime" name = "toml_datetime"
version = "0.6.5" version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
dependencies = [ dependencies = [
"serde", "serde",
] ]
@@ -2298,15 +2284,15 @@ dependencies = [
[[package]] [[package]]
name = "toml_edit" name = "toml_edit"
version = "0.22.12" version = "0.22.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c"
dependencies = [ dependencies = [
"indexmap 2.2.6", "indexmap 2.2.6",
"serde", "serde",
"serde_spanned", "serde_spanned",
"toml_datetime", "toml_datetime",
"winnow 0.6.6", "winnow 0.6.8",
] ]
[[package]] [[package]]
@@ -2328,7 +2314,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.60", "syn 2.0.64",
] ]
[[package]] [[package]]
@@ -2442,9 +2428,9 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94"
[[package]] [[package]]
name = "unicode-width" name = "unicode-width"
version = "0.1.11" version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"
[[package]] [[package]]
name = "ustr" name = "ustr"
@@ -2455,7 +2441,7 @@ dependencies = [
"ahash 0.8.11", "ahash 0.8.11",
"byteorder", "byteorder",
"lazy_static", "lazy_static",
"parking_lot 0.12.1", "parking_lot 0.12.2",
] ]
[[package]] [[package]]
@@ -2546,7 +2532,7 @@ dependencies = [
"once_cell", "once_cell",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.60", "syn 2.0.64",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@@ -2568,7 +2554,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.60", "syn 2.0.64",
"wasm-bindgen-backend", "wasm-bindgen-backend",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@@ -2775,9 +2761,9 @@ dependencies = [
[[package]] [[package]]
name = "winnow" name = "winnow"
version = "0.6.6" version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0c976aaaa0e1f90dbb21e9587cdaf1d9679a1cde8875c0d6bd83ab96a208352" checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d"
dependencies = [ dependencies = [
"memchr", "memchr",
] ]
@@ -2796,22 +2782,22 @@ checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"
[[package]] [[package]]
name = "zerocopy" name = "zerocopy"
version = "0.7.32" version = "0.7.34"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
dependencies = [ dependencies = [
"zerocopy-derive", "zerocopy-derive",
] ]
[[package]] [[package]]
name = "zerocopy-derive" name = "zerocopy-derive"
version = "0.7.32" version = "0.7.34"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.60", "syn 2.0.64",
] ]
[[package]] [[package]]

2
app_grid/Cargo.toml
View File

@@ -7,11 +7,9 @@ edition = "2021"
tokio = { version = "1.32.0", features = ["rt", "tokio-macros", "sync"] } tokio = { version = "1.32.0", features = ["rt", "tokio-macros", "sync"] }
protostar = { path = "../protostar" } protostar = { path = "../protostar" }
color-eyre = "0.6.2" color-eyre = "0.6.2"
color-rs = "0.8.0"
clap = "4.4.6" clap = "4.4.6"
manifest-dir-macros = "0.1.18" manifest-dir-macros = "0.1.18"
glam = "0.24.2" glam = "0.24.2"
mint = "0.5.9"
tween = "2.0.1" tween = "2.0.1"
tracing-subscriber = "0.3.17" tracing-subscriber = "0.3.17"

6
app_grid/src/main.rs
View File

@@ -1,22 +1,20 @@
use color::rgba_linear;
use color_eyre::eyre::Result; use color_eyre::eyre::Result;
use glam::{Quat, Vec3}; use glam::{Quat, Vec3};
use manifest_dir_macros::directory_relative_path; use manifest_dir_macros::directory_relative_path;
use mint::Vector3;
use protostar::{ use protostar::{
application::Application, application::Application,
xdg::{get_desktop_files, parse_desktop_file, DesktopFile, Icon, IconType}, xdg::{get_desktop_files, parse_desktop_file, DesktopFile, Icon, IconType},
}; };
use stardust_xr_fusion::{ use stardust_xr_fusion::{
client::{Client, ClientState, FrameInfo, RootHandler}, client::{Client, ClientState, FrameInfo, RootHandler},
core::values::ResourceID, core::values::{color::rgba_linear, ResourceID, Vector3},
drawable::{ drawable::{
MaterialParameter, Model, ModelPartAspect, Text, TextBounds, TextFit, TextStyle, XAlign, MaterialParameter, Model, ModelPartAspect, Text, TextBounds, TextFit, TextStyle, XAlign,
YAlign, YAlign,
}, },
fields::BoxField, fields::BoxField,
node::NodeType, node::NodeType,
spatial::{Spatial, SpatialAspect, Transform}, spatial::{Spatial, SpatialAspect, SpatialRefAspect, Transform},
}; };
use stardust_xr_molecules::{Grabbable, GrabbableSettings}; use stardust_xr_molecules::{Grabbable, GrabbableSettings};
use std::f32::consts::PI; use std::f32::consts::PI;

2
hexagon_launcher/Cargo.toml
View File

@@ -5,12 +5,10 @@ edition = "2021"
[dependencies] [dependencies]
protostar = { path = "../protostar" } protostar = { path = "../protostar" }
color-rs = "0.8.0"
color-eyre = "0.6.2" color-eyre = "0.6.2"
clap = "4.4.6" clap = "4.4.6"
manifest-dir-macros = "0.1.18" manifest-dir-macros = "0.1.18"
glam = { version = "0.25.0", features = ["mint"] } glam = { version = "0.25.0", features = ["mint"] }
mint = "0.5.9"
tween = "2.0.1" tween = "2.0.1"
tracing-subscriber = "0.3.17" tracing-subscriber = "0.3.17"
tokio = { workspace = true } tokio = { workspace = true }

5
hexagon_launcher/src/app.rs
View File

@@ -1,20 +1,19 @@
use color_eyre::eyre::Result; use color_eyre::eyre::Result;
use glam::{EulerRot, Quat, Vec3}; use glam::{EulerRot, Quat, Vec3};
use mint::Vector3;
use protostar::{ use protostar::{
application::Application, application::Application,
xdg::{DesktopFile, Icon, IconType}, xdg::{DesktopFile, Icon, IconType},
}; };
use stardust_xr_fusion::{ use stardust_xr_fusion::{
client::FrameInfo, client::FrameInfo,
core::values::ResourceID, core::values::{ResourceID, Vector3},
drawable::{ drawable::{
MaterialParameter, Model, ModelPartAspect, Text, TextBounds, TextFit, TextStyle, XAlign, MaterialParameter, Model, ModelPartAspect, Text, TextBounds, TextFit, TextStyle, XAlign,
YAlign, YAlign,
}, },
fields::BoxField, fields::BoxField,
node::NodeType, node::NodeType,
spatial::{Spatial, SpatialAspect, Transform}, spatial::{Spatial, SpatialAspect, SpatialRefAspect, Transform},
}; };
use stardust_xr_molecules::{Grabbable, GrabbableSettings}; use stardust_xr_molecules::{Grabbable, GrabbableSettings};
use std::f32::consts::PI; use std::f32::consts::PI;

58
hexagon_launcher/src/main.rs
View File

@@ -2,7 +2,6 @@ pub mod app;
pub mod hex; pub mod hex;
use app::App; use app::App;
use color::{color_space::LinearRgb, rgba_linear, Rgba};
use color_eyre::eyre::Result; use color_eyre::eyre::Result;
use glam::Quat; use glam::Quat;
use hex::{HEX_CENTER, HEX_DIRECTION_VECTORS}; use hex::{HEX_CENTER, HEX_DIRECTION_VECTORS};
@@ -11,12 +10,21 @@ use protostar::xdg::{get_desktop_files, parse_desktop_file, DesktopFile};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use stardust_xr_fusion::{ use stardust_xr_fusion::{
client::{Client, ClientState, FrameInfo, RootHandler}, client::{Client, ClientState, FrameInfo, RootHandler},
core::{schemas::flex::flexbuffers, values::ResourceID}, core::{
schemas::flex::flexbuffers,
values::{
color::{color_space::LinearRgb, rgba_linear, Rgba},
ResourceID,
},
},
drawable::{MaterialParameter, Model, ModelPartAspect}, drawable::{MaterialParameter, Model, ModelPartAspect},
node::{NodeError, NodeType}, node::{NodeError, NodeType},
spatial::{Spatial, SpatialAspect, Transform}, spatial::{Spatial, SpatialAspect, Transform},
}; };
use stardust_xr_molecules::{touch_plane::TouchPlane, Grabbable, GrabbableSettings, PointerMode}; use stardust_xr_molecules::{
button::{Button, ButtonSettings},
Grabbable, GrabbableSettings, PointerMode,
};
use std::{f32::consts::PI, time::Duration}; use std::{f32::consts::PI, time::Duration};
const APP_SIZE: f32 = 0.06; const APP_SIZE: f32 = 0.06;
@@ -55,7 +63,7 @@ pub struct State {
struct AppHexGrid { struct AppHexGrid {
movable_root: Spatial, movable_root: Spatial,
apps: Vec<App>, apps: Vec<App>,
button: Button, button: CenterButton,
state: State, state: State,
} }
impl AppHexGrid { impl AppHexGrid {
@@ -65,7 +73,7 @@ impl AppHexGrid {
let movable_root = let movable_root =
Spatial::create(client.get_root(), Transform::identity(), false).unwrap(); Spatial::create(client.get_root(), Transform::identity(), false).unwrap();
let button = Button::new(client, &client.state()).unwrap(); let button = CenterButton::new(client, &client.state()).unwrap();
tokio::time::sleep(Duration::from_millis(10)).await; // give it a bit of time to send the messages properly tokio::time::sleep(Duration::from_millis(10)).await; // give it a bit of time to send the messages properly
let mut desktop_files: Vec<DesktopFile> = get_desktop_files() let mut desktop_files: Vec<DesktopFile> = get_desktop_files()
@@ -112,7 +120,7 @@ impl AppHexGrid {
impl RootHandler for AppHexGrid { impl RootHandler for AppHexGrid {
fn frame(&mut self, info: FrameInfo) { fn frame(&mut self, info: FrameInfo) {
self.button.frame(info); self.button.frame(info);
if self.button.touch_plane.touch_started() { if self.button.button.pressed() {
self.button self.button
.model .model
.model_part("Hex") .model_part("Hex")
@@ -123,7 +131,7 @@ impl RootHandler for AppHexGrid {
for app in &mut self.apps { for app in &mut self.apps {
app.apply_state(&self.state); app.apply_state(&self.state);
} }
} else if self.button.touch_plane.touch_stopped() { } else if self.button.button.released() {
self.button self.button
.model .model
.model_part("Hex") .model_part("Hex")
@@ -156,34 +164,36 @@ impl RootHandler for AppHexGrid {
} }
} }
struct Button { struct CenterButton {
touch_plane: TouchPlane, button: Button,
grabbable: Grabbable, grabbable: Grabbable,
model: Model, model: Model,
} }
impl Button { impl CenterButton {
fn new(client: &Client, state: &ClientState) -> Result<Self, NodeError> { fn new(client: &Client, state: &ClientState) -> Result<Self, NodeError> {
let touch_plane = TouchPlane::create( // (APP_SIZE + PADDING) / 2.0,
let button = Button::create(
client.get_root(), client.get_root(),
Transform::identity(), Transform::identity(),
[(APP_SIZE + PADDING) / 2.0; 2], [(APP_SIZE + PADDING) / 2.0; 2],
(APP_SIZE + PADDING) / 2.0, ButtonSettings {
0.0..1.0, visuals: None,
0.0..1.0, ..Default::default()
},
)?; )?;
let grabbable = Grabbable::create( let grabbable = Grabbable::create(
client.get_root(), client.get_root(),
Transform::none(), Transform::none(),
&touch_plane.field(), &button.touch_plane().field(),
GrabbableSettings { GrabbableSettings {
max_distance: 0.01, max_distance: 0.025,
pointer_mode: PointerMode::Align, pointer_mode: PointerMode::Align,
magnet: false, magnet: false,
zoneable: true,
..Default::default() ..Default::default()
}, },
)?; )?;
touch_plane button
.touch_plane()
.root() .root()
.set_spatial_parent(grabbable.content_parent())?; .set_spatial_parent(grabbable.content_parent())?;
@@ -203,8 +213,8 @@ impl Button {
.content_parent() .content_parent()
.set_relative_transform(content_parent, Transform::identity())?; .set_relative_transform(content_parent, Transform::identity())?;
} }
Ok(Button { Ok(CenterButton {
touch_plane, button,
grabbable, grabbable,
model, model,
}) })
@@ -212,12 +222,6 @@ impl Button {
fn frame(&mut self, info: FrameInfo) { fn frame(&mut self, info: FrameInfo) {
let _ = self.grabbable.update(&info); let _ = self.grabbable.update(&info);
if self.grabbable.grab_action().actor_started() { self.button.update();
let _ = self.touch_plane.set_enabled(false);
}
if self.grabbable.grab_action().actor_stopped() {
let _ = self.touch_plane.set_enabled(true);
}
self.touch_plane.update();
} }
} }

2
single/Cargo.toml
View File

@@ -6,11 +6,9 @@ edition = "2021"
[dependencies] [dependencies]
protostar = { path = "../protostar" } protostar = { path = "../protostar" }
color-eyre = "0.6.2" color-eyre = "0.6.2"
color-rs = "0.8.0"
clap = "4.4.6" clap = "4.4.6"
manifest-dir-macros = "0.1.18" manifest-dir-macros = "0.1.18"
glam = "0.24.2" glam = "0.24.2"
mint = "0.5.9"
tween = "2.0.1" tween = "2.0.1"
tracing-subscriber = "0.3.17" tracing-subscriber = "0.3.17"
tokio = { workspace = true } tokio = { workspace = true }

6
single/src/single.rs
View File

@@ -1,21 +1,19 @@
use color::rgba_linear;
use color_eyre::eyre::Result; use color_eyre::eyre::Result;
use glam::{Quat, Vec3}; use glam::{Quat, Vec3};
use mint::Vector3;
use protostar::{ use protostar::{
application::Application, application::Application,
xdg::{DesktopFile, Icon, IconType}, xdg::{DesktopFile, Icon, IconType},
}; };
use stardust_xr_fusion::{ use stardust_xr_fusion::{
client::{ClientState, FrameInfo, RootHandler}, client::{ClientState, FrameInfo, RootHandler},
core::values::ResourceID, core::values::{color::rgba_linear, ResourceID, Vector3},
drawable::{ drawable::{
MaterialParameter, Model, ModelPartAspect, Text, TextBounds, TextFit, TextStyle, XAlign, MaterialParameter, Model, ModelPartAspect, Text, TextBounds, TextFit, TextStyle, XAlign,
YAlign, YAlign,
}, },
fields::BoxField, fields::BoxField,
node::NodeType, node::NodeType,
spatial::{Spatial, SpatialAspect, Transform}, spatial::{Spatial, SpatialAspect, SpatialRefAspect, Transform},
}; };
use stardust_xr_molecules::{Grabbable, GrabbableSettings}; use stardust_xr_molecules::{Grabbable, GrabbableSettings};
use std::f32::consts::PI; use std::f32::consts::PI;

2
sirius/Cargo.toml
View File

@@ -6,11 +6,9 @@ edition = "2021"
[dependencies] [dependencies]
protostar = { path = "../protostar" } protostar = { path = "../protostar" }
color-eyre = "0.6.2" color-eyre = "0.6.2"
color-rs = "0.8.0"
clap = "4.4.6" clap = "4.4.6"
manifest-dir-macros = "0.1.18" manifest-dir-macros = "0.1.18"
glam = "0.24.2" glam = "0.24.2"
mint = "0.5.9"
tween = "2.0.1" tween = "2.0.1"
tracing-subscriber = "0.3.17" tracing-subscriber = "0.3.17"
walkdir = "2.4.0" walkdir = "2.4.0"

30
sirius/src/main.rs
View File

@@ -1,9 +1,7 @@
use clap::{self, Parser}; use clap::{self, Parser};
use color::rgba_linear;
use color_eyre::eyre::Result; use color_eyre::eyre::Result;
use glam::{Quat, Vec3}; use glam::{Quat, Vec3};
use manifest_dir_macros::directory_relative_path; use manifest_dir_macros::directory_relative_path;
use mint::Vector3;
use protostar::{ use protostar::{
application::Application, application::Application,
xdg::{parse_desktop_file, DesktopFile, Icon, IconType}, xdg::{parse_desktop_file, DesktopFile, Icon, IconType},
@@ -11,16 +9,22 @@ use protostar::{
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use stardust_xr_fusion::{ use stardust_xr_fusion::{
client::{Client, ClientState, FrameInfo, RootHandler}, client::{Client, ClientState, FrameInfo, RootHandler},
core::{schemas::flex::flexbuffers, values::ResourceID}, core::{
schemas::flex::flexbuffers,
values::{color::rgba_linear, ResourceID, Vector3},
},
drawable::{ drawable::{
MaterialParameter, Model, ModelPartAspect, Text, TextBounds, TextFit, TextStyle, XAlign, MaterialParameter, Model, ModelPartAspect, Text, TextBounds, TextFit, TextStyle, XAlign,
YAlign, YAlign,
}, },
fields::BoxField, fields::BoxField,
node::{NodeError, NodeType}, node::{NodeError, NodeType},
spatial::{Spatial, SpatialAspect, Transform}, spatial::{Spatial, SpatialAspect, SpatialRefAspect, Transform},
};
use stardust_xr_molecules::{
button::{Button, ButtonSettings},
Grabbable, GrabbableSettings,
}; };
use stardust_xr_molecules::{touch_plane::TouchPlane, Grabbable, GrabbableSettings};
use std::{f32::consts::PI, path::PathBuf}; use std::{f32::consts::PI, path::PathBuf};
use tween::{QuartInOut, Tweener}; use tween::{QuartInOut, Tweener};
@@ -66,7 +70,7 @@ struct State {
} }
struct Sirius { struct Sirius {
touch_plane: TouchPlane, button: Button,
model: Model, model: Model,
clients: Vec<App>, clients: Vec<App>,
state: State, state: State,
@@ -83,13 +87,11 @@ impl Sirius {
&field, &field,
GrabbableSettings::default(), GrabbableSettings::default(),
)?; )?;
let touch_plane = TouchPlane::create( let button = Button::create(
grabbable.content_parent(), grabbable.content_parent(),
Transform::identity(), Transform::identity(),
[0.1; 2], [0.1; 2],
0.03, ButtonSettings::default(),
1.0..0.0,
1.0..0.0,
)?; )?;
let walkdir = WalkDir::new(args.apps_directory.canonicalize().unwrap()); let walkdir = WalkDir::new(args.apps_directory.canonicalize().unwrap());
@@ -122,7 +124,7 @@ impl Sirius {
let state = State { visible: false }; let state = State { visible: false };
Ok(Sirius { Ok(Sirius {
touch_plane, button,
model, model,
clients, clients,
state, state,
@@ -144,8 +146,8 @@ impl RootHandler for Sirius {
} }
self.grabbable.update(&info).unwrap(); self.grabbable.update(&info).unwrap();
self.touch_plane.update(); self.button.update();
if self.touch_plane.touch_started() { if self.button.pressed() {
println!("Touch started"); println!("Touch started");
self.state.visible = !self.state.visible; self.state.visible = !self.state.visible;
match self.state.visible { match self.state.visible {
@@ -194,7 +196,7 @@ impl RootHandler for Sirius {
.unwrap(); .unwrap();
} }
if self.touch_plane.touch_stopped() { if self.button.released() {
println!("Touch ended"); println!("Touch ended");
self.model self.model
.model_part("?????") .model_part("?????")