diff --git a/godot/native/libroutes_native.so b/godot/native/libroutes_native.so index 84dcca8..06496e7 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 14b645a..33ef3f4 100644 --- a/godot/world/StateApi.gd +++ b/godot/world/StateApi.gd @@ -2,8 +2,8 @@ extends Node onready var server = $StateServer -export var xsize = 16 -export var ysize = 16 +export var xsize = 256 +export var ysize = 256 export var zsize = 16 var Tilemap = preload("res://world/Tilemap.tscn") diff --git a/routes-native/Cargo.toml b/routes-native/Cargo.toml index fd26335..631ac24 100644 --- a/routes-native/Cargo.toml +++ b/routes-native/Cargo.toml @@ -12,6 +12,7 @@ crate-type = ["cdylib"] gdnative = {version = "0.10", features = ["async"]} strum = { version = "0.24", features = ["derive"] } strum_macros = "0.24" +derive_builder = "0.11.2" # tokio = {version = "1.18.0", features = ["sync"]} # lazy_static = "1.4.0" # pathfinding = "3.0.12" diff --git a/routes-native/src/stateserver/world/tiles.rs b/routes-native/src/stateserver/world/tiles.rs index f716122..0e2cbfd 100644 --- a/routes-native/src/stateserver/world/tiles.rs +++ b/routes-native/src/stateserver/world/tiles.rs @@ -1,7 +1,7 @@ -use strum::{AsRefStr, EnumIter, FromRepr, EnumDiscriminants}; +use derive_builder::Builder; +use strum::{AsRefStr, EnumDiscriminants, EnumIter, FromRepr}; - -#[derive(Debug, Clone, AsRefStr, Copy, EnumIter, FromRepr, EnumDiscriminants)] +#[derive(AsRefStr, EnumIter, FromRepr, EnumDiscriminants, Clone)] #[repr(u16)] pub enum Tiletypes { Air, @@ -11,15 +11,17 @@ pub enum Tiletypes { Sand, } -#[derive(Debug, Clone, Copy)] +#[allow(dead_code)] +#[derive(Builder)] pub struct Tile { kind: Tiletypes, + #[builder(default = "true")] + is_support: bool, } impl Tile { pub fn new(kind: Tiletypes) -> Tile { - - Tile { kind } + TileBuilder::default().kind(kind).is_support(false).build().unwrap() } pub fn kind_to_string(&self) -> String { self.kind.as_ref().to_string()