aboutsummaryrefslogtreecommitdiffstats
path: root/rust/src/lib.rs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--rust/src/lib.rs12
1 files changed, 12 insertions, 0 deletions
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
index f683d35..c8afc06 100644
--- a/rust/src/lib.rs
+++ b/rust/src/lib.rs
@@ -3,12 +3,24 @@ 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>();
}