????

Cargo.lock

@@ -769,6 +769,15 @@ dependencies = [
  "adler2",
 ]
 
+[[package]]
+name = "moonhare_derives"
+version = "0.1.0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "moonhare_ecs"
 version = "0.1.0"
@@ -791,6 +800,7 @@ version = "0.1.0"
 name = "moonhare_game"
 version = "0.1.0"
 dependencies = [
+ "moonhare_derives",
  "moonhare_ecs",
  "moonhare_graphics",
  "moonhare_log",
@@ -811,6 +821,7 @@ dependencies = [
 name = "moonhare_internal"
 version = "0.1.0"
 dependencies = [
+ "moonhare_derives",
  "moonhare_ecs",
  "moonhare_event",
  "moonhare_game",

crates/moonhare_derives/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+edition = "2024"
+name = "moonhare_derives"
+version.workspace = true
+authors.workspace = true
+
+[dependencies]
+syn = "2.0"
+proc-macro2 = "1"
+quote = "1"
+
+[lib]
+proc-macro = true
+

crates/moonhare_derives/src/lib.rs

@@ -0,0 +1,32 @@
+use proc_macro2::TokenStream as TokenStream2;
+use syn::{parse_macro_input, parse_quote, DeriveInput, GenericParam, Generics};
+use proc_macro::{self, TokenStream};
+
+mod node;
+mod system;
+
+#[proc_macro_derive(System)]
+pub fn system(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    let input = parse_macro_input!(input as DeriveInput);
+
+    system::system(input)
+}
+
+
+
+#[proc_macro_derive(Node)]
+pub fn node(input: proc_macro::TokenStream) -> TokenStream {
+    let input = parse_macro_input!(input as DeriveInput);
+
+    TokenStream::from(node::node(input))
+}
+
+// Add a bound `T: Node` to every type parameter T.
+fn add_trait_bounds(mut generics: Generics) -> Generics {
+    for param in &mut generics.params {
+        if let GenericParam::Type(ref mut type_param) = *param {
+            type_param.bounds.push(parse_quote!(node::Node));
+        }
+    }
+    generics
+}

crates/moonhare_derives/src/node.rs

@@ -0,0 +1,24 @@
+use proc_macro::TokenStream;
+use proc_macro2::TokenStream as TokenStream2;
+use quote::quote;
+use syn::DeriveInput;
+
+use crate::add_trait_bounds;
+
+pub fn node(input: DeriveInput) -> TokenStream2 {
+    let name = input.ident;
+
+    let expanded = quote! {
+        impl Node for #name {
+            fn init(&mut self) {
+                self.init();
+            }
+
+            fn update(&mut self) {
+                self.update();
+            }
+        }
+    };
+
+    expanded
+}

crates/moonhare_derives/src/system.rs

@@ -0,0 +1,31 @@
+use proc_macro::TokenStream;
+use quote::quote;
+use syn::DeriveInput;
+
+use crate::add_trait_bounds;
+
+
+pub fn system(input: DeriveInput) -> TokenStream {
+    let name = input.ident;
+
+    let generics = add_trait_bounds(input.generics);
+    let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
+
+    let expanded = quote! {
+        impl #name {
+            fn init(&mut self) {
+
+            }
+
+            fn update(&mut self) {
+
+            }
+
+            fn add_child(&mut self, child: Self) {
+
+            }
+        }
+    };
+
+    proc_macro::TokenStream::from(expanded)
+}

crates/moonhare_game/Cargo.toml

@@ -5,7 +5,9 @@ version.workspace = true
 authors.workspace = true
 
 [dependencies]
+moonhare_derives = { path = "../moonhare_derives" }
 moonhare_ecs = { path = "../moonhare_ecs" }
 moonhare_graphics = { path = "../moonhare_graphics" }
 moonhare_log = { path = "../moonhare_log" }
 moonhare_window = { path = "../moonhare_window" }
+

crates/moonhare_game/src/basic/mod.rs

@@ -1 +0,0 @@
-pub mod node;

crates/moonhare_game/src/basic/node.rs

@@ -1,3 +0,0 @@
-pub trait Node {
-
-}

crates/moonhare_game/src/lib.rs

@@ -10,9 +10,7 @@ use moonhare_window::{platforms::glfw_window::GLFWWindow};
 use crate::systems::system::{BaseSystems, System};
 
 pub mod systems;
-pub mod basic;
-
-/// Only one Game may exist per project
+pub mod nodes;
 /* #[derive(Debug)]
 pub struct Game {
     pub base_systems: BaseSystems,
@@ -22,6 +20,7 @@ pub struct Game {
     pub name: String,
 } */
 
+
 // when creating a game, you can add systems to it, which do _things_ 
 // BaseSystems -> Window, Update, Render
 
@@ -73,6 +72,8 @@ impl Game {
     }
 
     pub fn run(self) {
+
+
         info("Running Game...");
         //------------------------------
         //  Run Init on all Systems
@@ -116,3 +117,4 @@ fn render(context: Rc<Context>) {
     let target = moonhare_graphics::glium::Frame::new(context.clone(), context.get_framebuffer_dimensions());
     moonhare_graphics::draw_background_color(Color::color_from_rgb(255, 255, 255), target);
 }
+

crates/moonhare_game/src/nodes/mod.rs

@@ -0,0 +1,2 @@
+pub mod node;
+pub mod window;

crates/moonhare_game/src/nodes/node.rs

@@ -0,0 +1,16 @@
+use moonhare_derives::Node;
+
+pub trait Node {
+    fn init(&mut self);
+    fn update(&mut self);
+}
+
+impl<T> Node for Box<T> {
+    fn init(&mut self) {
+        todo!()
+    }
+
+    fn update(&mut self) {
+        todo!()
+    }
+}

crates/moonhare_game/src/nodes/window.rs

@@ -0,0 +1,17 @@
+use moonhare_derives::Node;
+use crate::nodes::node::Node;
+
+#[derive(Node)]
+struct Window {
+    a: Box<String>
+}
+
+impl Window {
+    fn init(&mut self) {
+
+    }
+
+    fn update(&mut self) {
+
+    }
+}

crates/moonhare_internal/Cargo.toml

@@ -6,6 +6,7 @@ authors.workspace = true
 
 [dependencies]
 
+moonhare_derives = { path = "../moonhare_derives" }
 moonhare_ecs = { path = "../moonhare_ecs" }
 moonhare_event = { path = "../moonhare_event" }
 moonhare_game = { path = "../moonhare_game" }

crates/moonhare_internal/src/lib.rs

@@ -1,3 +1,4 @@
+pub use moonhare_derives as moon_derives;
 pub use moonhare_ecs as ecs;
 pub use moonhare_event as event;
 pub use moonhare_game as game;

playground/src/main.rs

@@ -2,6 +2,7 @@ use std::fs::File;
 
 use moonhare_engine::{game::Game, log};
 
+
 fn main() {
     let _ = log::configere_logger();
     log::info("test");