badhouseplants/killbox
4
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Packages Projects Releases Activity

And once again

Browse Source
This commit is contained in:
Nikolai Rodionov
2025-02-18 13:30:48 +01:00
parent 37154955d6
commit 16b06ba642
77 changed files with 581 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

194
rust/Cargo.lock generated
View File

@ -11,12 +11,91 @@ dependencies = [
"memchr",
]
[[package]]
name = "anstream"
version = "0.6.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
dependencies = [
"anstyle",
"anstyle-parse",
"anstyle-query",
"anstyle-wincon",
"colorchoice",
"is_terminal_polyfill",
"utf8parse",
]
[[package]]
name = "anstyle"
version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
[[package]]
name = "anstyle-parse"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
dependencies = [
"utf8parse",
]
[[package]]
name = "anstyle-query"
version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
dependencies = [
"windows-sys",
]
[[package]]
name = "anstyle-wincon"
version = "3.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
dependencies = [
"anstyle",
"once_cell",
"windows-sys",
]
[[package]]
name = "cfg-if"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "colorchoice"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
[[package]]
name = "env_filter"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
dependencies = [
"log",
"regex",
]
[[package]]
name = "env_logger"
version = "0.11.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0"
dependencies = [
"anstream",
"anstyle",
"env_filter",
"humantime",
"log",
]
[[package]]
name = "gdextension-api"
version = "0.2.1"
@ -135,12 +214,39 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
[[package]]
name = "humantime"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]]
name = "is_terminal_polyfill"
version = "1.70.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
[[package]]
name = "killbox"
version = "0.1.0"
dependencies = [
"env_logger",
"godot",
"log",
]
[[package]]
name = "libc"
version = "0.2.169"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
[[package]]
name = "log"
version = "0.4.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
[[package]]
name = "memchr"
version = "2.7.4"
@ -163,11 +269,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e943b2c21337b7e3ec6678500687cdc741b7639ad457f234693352075c082204"
[[package]]
name = "open-strike-2"
version = "0.1.0"
dependencies = [
"godot",
]
name = "once_cell"
version = "1.20.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
[[package]]
name = "paste"
@ -239,6 +344,12 @@ version = "1.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
[[package]]
name = "utf8parse"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]]
name = "uuid"
version = "1.12.1"
@ -263,3 +374,76 @@ name = "wasi"
version = "0.11.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "windows-sys"
version = "0.59.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
dependencies = [
"windows-targets",
]
[[package]]
name = "windows-targets"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
dependencies = [
"windows_aarch64_gnullvm",
"windows_aarch64_msvc",
"windows_i686_gnu",
"windows_i686_gnullvm",
"windows_i686_msvc",
"windows_x86_64_gnu",
"windows_x86_64_gnullvm",
"windows_x86_64_msvc",
]
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
[[package]]
name = "windows_aarch64_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
[[package]]
name = "windows_i686_gnu"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
[[package]]
name = "windows_i686_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
[[package]]
name = "windows_i686_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
[[package]]
name = "windows_x86_64_gnu"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
[[package]]
name = "windows_x86_64_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"

4
rust/Cargo.toml
View File

@ -1,10 +1,12 @@
[package]
name = "open-strike-2"
name = "killbox"
version = "0.1.0"
edition = "2021"
[dependencies]
env_logger = "0.11.6"
godot = "0.2.3"
log = "0.4.25"
[lib]
crate-type = ["cdylib"]

23
rust/src/entrypoint.rs Normal file
View File

@ -0,0 +1,23 @@
use godot::classes::{INode, Node};
use godot::prelude::*;
use std;
#[derive(GodotClass)]
#[class(base=Node)]
// EntryPoint should decide whether the game should be launched in the
// server or the playing mode and load corresponding resources
struct EntryPoint {
base: Base<Node>,
}
#[godot_api]
impl INode for EntryPoint {
fn init(base: Base<Node>) -> Self {
Self { base }
}
fn ready(&mut self) {}
}
#[godot_api]
impl EntryPoint {}

1
rust/src/lib.rs
View File

@ -5,6 +5,7 @@ struct MyExtension;
mod player;
//mod server;
mod globals;
mod entrypoint;
#[gdextension]
unsafe impl ExtensionLibrary for MyExtension {}

58
rust/src/server/game_server.rs
View File

@ -13,68 +13,16 @@ use super::player_data::PlayerData;
#[class(base=Node)]
struct GameServer {
base: Base<Node>,
#[export]
port: i32,
#[export]
player_limit: i32,
#[export]
current_map: GString,
#[export]
current_player_data: Gd<PlayerData>,
#[export]
pub(crate) players: Dictionary
}
#[godot_api]
impl INode for GameServer {
fn init(base: Base<Node>) -> Self {
let players = Dictionary::new();
Self {
base,
players,
port: 27015,
player_limit: 10,
current_map: "lowpoly_tdm_2".into(),
current_player_data: PlayerData::new_gd(),
}
Self { base }
}
fn ready(&mut self) {
if let Some(multiplayer) = self.base().get_multiplayer() {
let on_connected = multiplayer.callable("peer_connected");
self.base_mut().connect("on_player_connected", &on_connected);
}
}
fn ready(&mut self) {}
}
#[godot_api]
impl GameServer {
// Signals
#[func]
fn on_player_connected(&mut self, id: i32) {
godot_print!("test");
}
// Main methods
#[func]
fn create_server(&mut self, server_only: bool) {
let mut peer = ENetMultiplayerPeer::new_gd();
let server = peer.create_server_ex(self.port)
.max_clients(self.player_limit)
.done();
if let Some(mut multiplayer) = self.base().get_multiplayer() {
let id = multiplayer.get_unique_id();
multiplayer.set_multiplayer_peer(&peer);
let player = PlayerData::new_gd();
self.players.set(id, player);
}
}
#[func]
fn join_server(&mut self, ip: GString, port: i32) {
let mut peer = ENetMultiplayerPeer::new_gd();
peer.create_client(&ip, port);
if let Some(mut multiplayer) = self.base().get_multiplayer() {
multiplayer.set_multiplayer_peer(&peer);
}
}
}
impl GameServer {}