diff --git a/godot/native/StateServer.tscn b/godot/native/StateServer.tscn index b57c586..1d4dbcd 100644 --- a/godot/native/StateServer.tscn +++ b/godot/native/StateServer.tscn @@ -4,3 +4,6 @@ [node name="StateServer" type="Node"] script = ExtResource( 1 ) +xsize = 14 +ysize = 14 +zsize = 14 diff --git a/godot/native/libroutes_native.so b/godot/native/libroutes_native.so index a1de287..a555ab2 100755 Binary files a/godot/native/libroutes_native.so and b/godot/native/libroutes_native.so differ diff --git a/godot/world/StateApi.gd b/godot/world/StateApi.gd index b2b7ac9..83f5507 100644 --- a/godot/world/StateApi.gd +++ b/godot/world/StateApi.gd @@ -4,5 +4,4 @@ var server = preload("res://native/StateServer.tscn").instance() func _ready(): add_child(server) - print(server.a) server.foo() diff --git a/routes-native/src/stateserver.rs b/routes-native/src/stateserver.rs index cbc06d7..f7f7eae 100644 --- a/routes-native/src/stateserver.rs +++ b/routes-native/src/stateserver.rs @@ -3,14 +3,9 @@ use lazy_static::lazy_static; use pathfinding::matrix; use tokio::sync::RwLock; -mod terrain; mod pathing; - -enum Tiles { - terrain(terrain::Terrain), - path(pathing::Path) - -} +mod terrain; +mod tiles; lazy_static! { static ref STATE: RwLock>> = RwLock::new(matrix![]); @@ -20,18 +15,26 @@ lazy_static! { #[inherit(Node)] pub struct StateServer { #[property] - a: u8, + xsize: u64, + #[property] + ysize: u64, + #[property] + zsize: u64, } #[methods] impl StateServer { fn new(_owner: &Node) -> Self { - StateServer { a: 9 } + StateServer { + xsize: 14, + ysize: 14, + zsize: 14, + } } #[export] fn _ready(&self, _owner: &Node) { - godot_print!("hello, uwu") + godot_print!("size: {}", self.xsize) } #[export] diff --git a/routes-native/src/stateserver/gen.rs b/routes-native/src/stateserver/gen.rs new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/routes-native/src/stateserver/gen.rs @@ -0,0 +1 @@ + diff --git a/routes-native/src/stateserver/pathing.rs b/routes-native/src/stateserver/pathing.rs index e409cf5..e69de29 100644 --- a/routes-native/src/stateserver/pathing.rs +++ b/routes-native/src/stateserver/pathing.rs @@ -1,5 +0,0 @@ -use pathfinding::prelude::astar; - -pub enum Path { - -} diff --git a/routes-native/src/stateserver/tiles.rs b/routes-native/src/stateserver/tiles.rs new file mode 100644 index 0000000..80eb523 --- /dev/null +++ b/routes-native/src/stateserver/tiles.rs @@ -0,0 +1,10 @@ +use gdnative::derive::{FromVariant, ToVariant}; + +#[derive(ToVariant, FromVariant)] +pub enum Tiletypes { + Air, + Water, + Grass, + Dirt, + Sand, +}