diff options
Diffstat (limited to '')
| -rw-r--r-- | rust/src/lib.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/rust/src/lib.rs b/rust/src/lib.rs index 1be319a..c8afc06 100644 --- a/rust/src/lib.rs +++ b/rust/src/lib.rs @@ -1,22 +1,26 @@ -mod game; -mod spinning_cube; mod buff_bounce; mod buff_phase; mod buff_trait; mod buff_ball; mod buff_extra; +<<<<<<< HEAD pub mod goal_trigger; mod test; +======= +>>>>>>> menu mod basic_die; use gdnative::prelude::{godot_init, InitHandle}; // Function that registers all exposed classes to Godot fn init(handle: InitHandle) { +<<<<<<< HEAD handle.add_class::<game::Game>(); handle.add_class::<spinning_cube::SpinningCube>(); handle.add_class::<goal_trigger::GoalTriggerZone>(); handle.add_class::<test::SpinningCubeReverse>(); +======= +>>>>>>> menu handle.add_class::<basic_die::BasicDie>(); } |