diff --git a/.gitignore b/.gitignore index df381c3..6eb1e8b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,7 @@ .export/ .itchio/ .steam/ + .DS_Store + +target/ diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 index 0000000..772aa5c --- /dev/null +++ b/Cargo.lock @@ -0,0 +1,425 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "bitflags" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "device_query" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "429b683ad2cf0d2f0f37f510655854baf18d5f108c3790ab5dd1d09a26874436" +dependencies = [ + "macos-accessibility-client", + "pkg-config", + "readkey", + "readmouse", + "windows", + "x11", +] + +[[package]] +name = "gdextension-api" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ec0a03c8f9c91e3d8eb7ca56dea81c7248c03826dd3f545f33cd22ef275d4d1" + +[[package]] +name = "gensym" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "913dce4c5f06c2ea40fc178c06f777ac89fc6b1383e90c254fafb1abe4ba3c82" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "uuid", +] + +[[package]] +name = "getrandom" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasi", +] + +[[package]] +name = "glam" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94" + +[[package]] +name = "global-input-reading" +version = "0.1.0" +dependencies = [ + "device_query", + "godot", +] + +[[package]] +name = "godot" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a29a3646d4b02bf4587fedba4ac7b44a47d45c933fd85ba7e61292408818eaa4" +dependencies = [ + "godot-core", + "godot-macros", +] + +[[package]] +name = "godot-bindings" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0014540bff93ba275031bc852f1cf9a3ff3216f02cdd51dc249745dccc8c578" +dependencies = [ + "gdextension-api", +] + +[[package]] +name = "godot-cell" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88184d525d763ebc88ff6806ffee35e19c7118d5c9e4eedbc74e70e069f8a671" + +[[package]] +name = "godot-codegen" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caa72d9b8be812fef2932f2a172b80c8b3feaee030571682f8f770c3d1c348d8" +dependencies = [ + "godot-bindings", + "heck", + "nanoserde", + "proc-macro2", + "quote", + "regex", +] + +[[package]] +name = "godot-core" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ff8345372e4c990ca592d7b61490ef88ff249fc77226f5b79beca173b4a0458" +dependencies = [ + "glam", + "godot-bindings", + "godot-cell", + "godot-codegen", + "godot-ffi", +] + +[[package]] +name = "godot-ffi" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "606d08085bd590d2f9c72633d4d218fee665ab3a0760b2d9daff2d964d628def" +dependencies = [ + "gensym", + "godot-bindings", + "godot-codegen", + "libc", + "paste", +] + +[[package]] +name = "godot-macros" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c11b3188e54ebacf88feb4c968ed19048a71a329c4cfd4a06cf374f18357a36" +dependencies = [ + "godot-bindings", + "proc-macro2", + "quote", + "venial", +] + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "libc" +version = "0.2.172" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" + +[[package]] +name = "macos-accessibility-client" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edf7710fbff50c24124331760978fb9086d6de6288dcdb38b25a97f8b1bdebbb" +dependencies = [ + "core-foundation", + "core-foundation-sys", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "nanoserde" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de9cf844ab1e25a0353525bd74cb889843a6215fa4a0d156fd446f4857a1b99" +dependencies = [ + "nanoserde-derive", +] + +[[package]] +name = "nanoserde-derive" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e943b2c21337b7e3ec6678500687cdc741b7639ad457f234693352075c082204" + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "pkg-config" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" + +[[package]] +name = "proc-macro2" +version = "1.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "r-efi" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" + +[[package]] +name = "readkey" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a36870cefdfcff57edbc0fa62165f42dfd4e5a0d8965117c1ea84c5700e4450" + +[[package]] +name = "readmouse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be105c72a1e6a5a1198acee3d5b506a15676b74a02ecd78060042a447f408d94" + +[[package]] +name = "regex" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "syn" +version = "2.0.101" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "unicode-ident" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" + +[[package]] +name = "uuid" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" +dependencies = [ + "getrandom", +] + +[[package]] +name = "venial" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a42528baceab6c7784446df2a10f4185078c39bf73dc614f154353f1a6b1229" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "wasi" +version = "0.14.2+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +dependencies = [ + "wit-bindgen-rt", +] + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "wit-bindgen-rt" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" +dependencies = [ + "bitflags", +] + +[[package]] +name = "x11" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" +dependencies = [ + "libc", + "pkg-config", +] diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 0000000..9e446dc --- /dev/null +++ b/Cargo.toml @@ -0,0 +1,3 @@ +[workspace] +resolver = "3" +members = ["global-input-reading"] diff --git a/global-input-reading.gdextension b/global-input-reading.gdextension new file mode 100644 index 0000000..dbdf628 --- /dev/null +++ b/global-input-reading.gdextension @@ -0,0 +1,14 @@ +[configuration] +entry_symbol = "gdext_rust_init" +compatibility_minimum = 4.4 +reloadable = true + +[libraries] +linux.debug.x86_64 = "res://target/debug/libglobal_input_reading.so" +linux.release.x86_64 = "res://target/release/libglobal_input_reading.so" +windows.debug.x86_64 = "res://target/debug/global_input_reading.dll" +windows.release.x86_64 = "res://target/release/global_input_reading.dll" +macos.debug = "res://target/debug/libglobal_input_reading.dylib" +macos.release = "res://target/release/libglobal_input_reading.dylib" +macos.debug.arm64 = "res://target/debug/libglobal_input_reading.dylib" +macos.release.arm64 = "res://target/release/libglobal_input_reading.dylib" diff --git a/global-input-reading.gdextension.uid b/global-input-reading.gdextension.uid new file mode 100644 index 0000000..303c8f2 --- /dev/null +++ b/global-input-reading.gdextension.uid @@ -0,0 +1 @@ +uid://bq6xpjsh5e51m diff --git a/global-input-reading/Cargo.toml b/global-input-reading/Cargo.toml new file mode 100644 index 0000000..4fe6f55 --- /dev/null +++ b/global-input-reading/Cargo.toml @@ -0,0 +1,11 @@ +[package] +name = "global-input-reading" +version = "0.1.0" +edition = "2024" + +[lib] +crate-type = ["cdylib"] + +[dependencies] +device_query = "3.0.1" +godot = "0.2.4" diff --git a/global-input-reading/src/lib.rs b/global-input-reading/src/lib.rs new file mode 100644 index 0000000..a926f47 --- /dev/null +++ b/global-input-reading/src/lib.rs @@ -0,0 +1,144 @@ +use device_query::{DeviceQuery, DeviceState, Keycode}; +use godot::{global::Key, prelude::*}; + +struct MyExtension; + +#[gdextension] +unsafe impl ExtensionLibrary for MyExtension {} + +#[derive(GodotClass)] +#[class(init, base = Node)] +pub struct BackgroundInputCapture { + device_state: DeviceState, + base: Base, +} + +#[godot_api] +impl BackgroundInputCapture { + #[func] + pub fn get_keys(&mut self) -> Vec { + self.device_state + .get_keys() + .into_iter() + .filter_map(|k| { + Some( + match k { + Keycode::Key0 => Key::KEY_0, + Keycode::Key1 => Key::KEY_1, + Keycode::Key2 => Key::KEY_2, + Keycode::Key3 => Key::KEY_3, + Keycode::Key4 => Key::KEY_4, + Keycode::Key5 => Key::KEY_5, + Keycode::Key6 => Key::KEY_6, + Keycode::Key7 => Key::KEY_7, + Keycode::Key8 => Key::KEY_8, + Keycode::Key9 => Key::KEY_9, + Keycode::A => Key::A, + Keycode::B => Key::B, + Keycode::C => Key::C, + Keycode::D => Key::D, + Keycode::E => Key::E, + Keycode::F => Key::F, + Keycode::G => Key::G, + Keycode::H => Key::H, + Keycode::I => Key::I, + Keycode::J => Key::J, + Keycode::K => Key::K, + Keycode::L => Key::L, + Keycode::M => Key::M, + Keycode::N => Key::N, + Keycode::O => Key::O, + Keycode::P => Key::P, + Keycode::Q => Key::Q, + Keycode::R => Key::R, + Keycode::S => Key::S, + Keycode::T => Key::T, + Keycode::U => Key::U, + Keycode::V => Key::V, + Keycode::W => Key::W, + Keycode::X => Key::X, + Keycode::Y => Key::Y, + Keycode::Z => Key::Z, + Keycode::F1 => Key::F1, + Keycode::F2 => Key::F2, + Keycode::F3 => Key::F3, + Keycode::F4 => Key::F4, + Keycode::F5 => Key::F5, + Keycode::F6 => Key::F6, + Keycode::F7 => Key::F7, + Keycode::F8 => Key::F8, + Keycode::F9 => Key::F9, + Keycode::F10 => Key::F10, + Keycode::F11 => Key::F11, + Keycode::F12 => Key::F12, + Keycode::F13 => Key::F13, + Keycode::F14 => Key::F14, + Keycode::F15 => Key::F15, + Keycode::F16 => Key::F16, + Keycode::F17 => Key::F17, + Keycode::F18 => Key::F18, + Keycode::F19 => Key::F19, + Keycode::F20 => Key::F20, + Keycode::Escape => Key::ESCAPE, + Keycode::Space => Key::SPACE, + Keycode::LControl => return None, + Keycode::RControl => return None, + Keycode::LShift => return None, + Keycode::RShift => return None, + Keycode::LAlt => return None, + Keycode::RAlt => return None, + Keycode::Command => return None, + Keycode::RCommand => return None, + Keycode::LOption => return None, + Keycode::ROption => return None, + Keycode::LMeta => return None, + Keycode::RMeta => return None, + Keycode::Enter => Key::ENTER, + Keycode::Up => Key::UP, + Keycode::Down => Key::DOWN, + Keycode::Left => Key::LEFT, + Keycode::Right => Key::RIGHT, + Keycode::Backspace => Key::BACKSPACE, + Keycode::CapsLock => Key::CAPSLOCK, + Keycode::Tab => Key::TAB, + Keycode::Home => Key::HOME, + Keycode::End => Key::END, + Keycode::PageUp => Key::PAGEUP, + Keycode::PageDown => Key::PAGEDOWN, + Keycode::Insert => Key::INSERT, + Keycode::Delete => Key::DELETE, + Keycode::Numpad0 => Key::KP_0, + Keycode::Numpad1 => Key::KP_1, + Keycode::Numpad2 => Key::KP_2, + Keycode::Numpad3 => Key::KP_3, + Keycode::Numpad4 => Key::KP_4, + Keycode::Numpad5 => Key::KP_5, + Keycode::Numpad6 => Key::KP_6, + Keycode::Numpad7 => Key::KP_7, + Keycode::Numpad8 => Key::KP_8, + Keycode::Numpad9 => Key::KP_9, + Keycode::NumpadSubtract => Key::KP_SUBTRACT, + Keycode::NumpadAdd => Key::KP_ADD, + Keycode::NumpadDivide => Key::KP_DIVIDE, + Keycode::NumpadMultiply => Key::KP_MULTIPLY, + Keycode::NumpadEquals => Key::EQUAL, + Keycode::NumpadEnter => Key::KP_ENTER, + Keycode::NumpadDecimal => Key::KP_PERIOD, + Keycode::Grave => Key::QUOTELEFT, + Keycode::Minus => Key::MINUS, + Keycode::Equal => Key::EQUAL, + Keycode::LeftBracket => Key::BRACKETLEFT, + Keycode::RightBracket => Key::BRACKETRIGHT, + Keycode::BackSlash => Key::BACKSLASH, + Keycode::Semicolon => Key::SEMICOLON, + Keycode::Apostrophe => Key::APOSTROPHE, + Keycode::Comma => Key::COMMA, + Keycode::Dot => Key::PERIOD, + Keycode::Slash => Key::SLASH, + } + .to_godot(), + ) + }) + .collect() + } +} diff --git a/main_scenes/main.gd b/main_scenes/main.gd index c098fde..1ceb270 100644 --- a/main_scenes/main.gd +++ b/main_scenes/main.gd @@ -133,6 +133,7 @@ func _ready(): camera.position = origin.position func _process(delta): + process_key_presses($BackgroundInputCapture.get_keys()) var hold = origin.get_parent().position.y origin.get_parent().position.y += yVel * 0.0166 @@ -584,12 +585,11 @@ func _on_settings_buttons_pressed(): settingsMenu.visible = !settingsMenu.visible -func _on_background_input_capture_bg_key_pressed(node, keys_pressed): +func process_key_presses(keys_pressed): var keyStrings = [] for i in keys_pressed: - if keys_pressed[i]: - keyStrings.append(OS.get_keycode_string(i) if !OS.get_keycode_string(i).strip_edges().is_empty() else "Keycode" + str(i)) + keyStrings.append(OS.get_keycode_string(i) if !OS.get_keycode_string(i).strip_edges().is_empty() else "Keycode" + str(i)) if fileSystemOpen: return diff --git a/main_scenes/main.tscn b/main_scenes/main.tscn index 1ea1f5d..c12e7d5 100644 --- a/main_scenes/main.tscn +++ b/main_scenes/main.tscn @@ -620,17 +620,6 @@ texture = ExtResource("24_joqmn") position = Vector2(360, 360) [node name="BackgroundInputCapture" type="BackgroundInputCapture" parent="."] -_import_path = NodePath("") -unique_name_in_owner = false -process_mode = 0 -process_priority = 0 -process_physics_priority = 0 -process_thread_group = 0 -physics_interpolation_mode = 0 -auto_translate_mode = 0 -editor_description = "" -position = Vector2(-28, -28) -script = null [node name="PushUpdates" parent="." instance=ExtResource("30_q43vl")] z_index = 4090 diff --git a/project.godot b/project.godot index 30db985..fb2520a 100644 --- a/project.godot +++ b/project.godot @@ -47,11 +47,6 @@ window/vsync/vsync_mode=0 project/assembly_name="PNGTuberPlus" -[editor] - -version_control/plugin_name="GitPlugin" -version_control/autoload_on_startup=true - [editor_plugins] enabled=PackedStringArray("res://addons/godot-streamdeck-addon/plugin.cfg")