Skip to content

Commit 262a9d9

Browse files
committed
Rename #[godot] to #[method]
1 parent e55c804 commit 262a9d9

File tree

17 files changed

+53
-53
lines changed

17 files changed

+53
-53
lines changed

examples/dodge-the-creeps/src/hud.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ impl Hud {
1616
Hud
1717
}
1818

19-
#[godot]
19+
#[method]
2020
pub fn show_message(&self, #[base] owner: &CanvasLayer, text: String) {
2121
let message_label = unsafe { owner.get_node_as::<Label>("message_label").unwrap() };
2222
message_label.set_text(text);
@@ -37,20 +37,20 @@ impl Hud {
3737
button.show();
3838
}
3939

40-
#[godot]
40+
#[method]
4141
pub fn update_score(&self, #[base] owner: &CanvasLayer, score: i64) {
4242
let label = unsafe { owner.get_node_as::<Label>("score_label").unwrap() };
4343
label.set_text(score.to_string());
4444
}
4545

46-
#[godot]
46+
#[method]
4747
fn on_start_button_pressed(&self, #[base] owner: &CanvasLayer) {
4848
let button = unsafe { owner.get_node_as::<Button>("start_button").unwrap() };
4949
button.hide();
5050
owner.emit_signal("start_game", &[]);
5151
}
5252

53-
#[godot]
53+
#[method]
5454
fn on_message_timer_timeout(&self, #[base] owner: &CanvasLayer) {
5555
let message_label = unsafe { owner.get_node_as::<Label>("message_label").unwrap() };
5656
message_label.hide()

examples/dodge-the-creeps/src/main_scene.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ impl Main {
2424
}
2525
}
2626

27-
#[godot]
27+
#[method]
2828
fn game_over(&self, #[base] owner: &Node) {
2929
let score_timer = unsafe { owner.get_node_as::<Timer>("score_timer").unwrap() };
3030
let mob_timer = unsafe { owner.get_node_as::<Timer>("mob_timer").unwrap() };
@@ -38,7 +38,7 @@ impl Main {
3838
.unwrap_or_else(|| godot_print!("Unable to get hud"));
3939
}
4040

41-
#[godot]
41+
#[method]
4242
fn new_game(&mut self, #[base] owner: &Node) {
4343
let start_position = unsafe { owner.get_node_as::<Position2D>("start_position").unwrap() };
4444
let player = unsafe {
@@ -66,15 +66,15 @@ impl Main {
6666
.unwrap_or_else(|| godot_print!("Unable to get hud"));
6767
}
6868

69-
#[godot]
69+
#[method]
7070
fn on_start_timer_timeout(&self, #[base] owner: &Node) {
7171
let mob_timer = unsafe { owner.get_node_as::<Timer>("mob_timer").unwrap() };
7272
let score_timer = unsafe { owner.get_node_as::<Timer>("score_timer").unwrap() };
7373
mob_timer.start(0.0);
7474
score_timer.start(0.0);
7575
}
7676

77-
#[godot]
77+
#[method]
7878
fn on_score_timer_timeout(&mut self, #[base] owner: &Node) {
7979
self.score += 1;
8080

@@ -84,7 +84,7 @@ impl Main {
8484
.unwrap_or_else(|| godot_print!("Unable to get hud"));
8585
}
8686

87-
#[godot]
87+
#[method]
8888
fn on_mob_timer_timeout(&self, #[base] owner: &Node) {
8989
let mob_spawn_location = unsafe {
9090
owner

examples/dodge-the-creeps/src/mob.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ impl Mob {
4040
}
4141
}
4242

43-
#[godot]
43+
#[method]
4444
fn _ready(&mut self, #[base] owner: &RigidBody2D) {
4545
let mut rng = rand::thread_rng();
4646
let animated_sprite = unsafe {
@@ -51,14 +51,14 @@ impl Mob {
5151
animated_sprite.set_animation(MOB_TYPES.choose(&mut rng).unwrap().to_str())
5252
}
5353

54-
#[godot]
54+
#[method]
5555
fn on_visibility_screen_exited(&self, #[base] owner: &RigidBody2D) {
5656
unsafe {
5757
owner.assume_unique().queue_free();
5858
}
5959
}
6060

61-
#[godot]
61+
#[method]
6262
fn on_start_game(&self, #[base] owner: &RigidBody2D) {
6363
unsafe {
6464
owner.assume_unique().queue_free();

examples/dodge-the-creeps/src/player.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ impl Player {
2626
}
2727
}
2828

29-
#[godot]
29+
#[method]
3030
fn _ready(&mut self, #[base] owner: &Area2D) {
3131
let viewport = owner.get_viewport_rect();
3232
self.screen_size = viewport.size;
3333
owner.hide();
3434
}
3535

36-
#[godot]
36+
#[method]
3737
fn _process(&mut self, #[base] owner: &Area2D, delta: f32) {
3838
let animated_sprite = unsafe {
3939
owner
@@ -88,7 +88,7 @@ impl Player {
8888
owner.set_global_position(position);
8989
}
9090

91-
#[godot]
91+
#[method]
9292
fn on_player_body_entered(&self, #[base] owner: &Area2D, _body: Ref<PhysicsBody2D>) {
9393
owner.hide();
9494
owner.emit_signal("hit", &[]);
@@ -102,7 +102,7 @@ impl Player {
102102
collision_shape.set_deferred("disabled", true);
103103
}
104104

105-
#[godot]
105+
#[method]
106106
pub fn start(&self, #[base] owner: &Area2D, pos: Vector2) {
107107
owner.set_global_position(pos);
108108
owner.show();

examples/hello-world/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ impl HelloWorld {
1010
HelloWorld
1111
}
1212

13-
#[godot]
13+
#[method]
1414
fn _ready(&self) {
1515
godot_print!("hello, world.")
1616
}

examples/native-plugin/src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ impl CustomNode {
1414
CustomNode
1515
}
1616

17-
#[godot]
17+
#[method]
1818
fn _enter_tree(&self, #[base] owner: TRef<EditorPlugin>) {
1919
// Initialization of the plugin goes here.
2020
// Add the new type with a name, a parent type, a script and an icon.
@@ -25,7 +25,7 @@ impl CustomNode {
2525
owner.add_custom_type("MyButton", "Button", script, texture);
2626
}
2727

28-
#[godot]
28+
#[method]
2929
fn _exit_tree(&self, #[base] owner: TRef<EditorPlugin>) {
3030
// Clean-up of the plugin goes here.
3131
// Always remember to remove it from the engine when deactivated.
@@ -43,14 +43,14 @@ impl MyButton {
4343
MyButton
4444
}
4545

46-
#[godot]
46+
#[method]
4747
fn _enter_tree(&self, #[base] owner: TRef<Button>) {
4848
owner
4949
.connect("pressed", owner, "clicked", VariantArray::new_shared(), 0)
5050
.unwrap();
5151
}
5252

53-
#[godot]
53+
#[method]
5454
fn clicked(&self) {
5555
godot_print!("You clicked me!");
5656
}

examples/resource/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ impl Greeter {
3737
}
3838
}
3939

40-
#[godot]
40+
#[method]
4141
fn _ready(&self) {
4242
if let Some(greeting_resource) = self.greeting_resource.as_ref() {
4343
let greeting_resource = unsafe { greeting_resource.assume_safe() };

examples/rpc/src/client.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ impl ServerPuppet {
1717
Self
1818
}
1919

20-
#[godot]
20+
#[method]
2121
fn _ready(&mut self, #[base] owner: TRef<Node>) {
2222
let peer = NetworkedMultiplayerENet::new();
2323
peer.create_client(
@@ -44,12 +44,12 @@ impl ServerPuppet {
4444
.unwrap();
4545
}
4646

47-
#[godot]
47+
#[method]
4848
fn on_connected_to_server(&mut self, #[base] owner: TRef<Node>) {
4949
owner.rpc("greet_server", &[Variant::new("hello")]);
5050
}
5151

52-
#[godot(rpc = "puppet")]
52+
#[method(rpc = "puppet")]
5353
fn return_greeting(&mut self, msg: GodotString) {
5454
godot_print!("Server says: {}", msg);
5555
}

examples/rpc/src/server.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ impl Server {
1616
Self
1717
}
1818

19-
#[godot]
19+
#[method]
2020
fn _ready(&mut self, #[base] owner: &Node) {
2121
let peer = NetworkedMultiplayerENet::new();
2222
peer.create_server(PORT, MAX_CLIENTS, IN_BANDWIDTH, OUT_BANDWIDTH)
@@ -28,7 +28,7 @@ impl Server {
2828
tree.set_network_peer(peer);
2929
}
3030

31-
#[godot(rpc = "master")]
31+
#[method(rpc = "master")]
3232
fn greet_server(&mut self, #[base] owner: &Node, msg: GodotString) {
3333
godot_print!("Client says: {}", msg);
3434

examples/scene-create/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ impl SceneCreate {
3333
}
3434
}
3535

36-
#[gdnative::derive::godot]
36+
#[gdnative::derive::method]
3737
fn _ready(&mut self) {
3838
self.template = load_scene("res://Child_scene.tscn");
3939
match &self.template {
@@ -42,7 +42,7 @@ impl SceneCreate {
4242
}
4343
}
4444

45-
#[gdnative::derive::godot]
45+
#[gdnative::derive::method]
4646
fn spawn_one(&mut self, #[base] owner: &Spatial, message: GodotString) {
4747
godot_print!("Called spawn_one({})", message.to_string());
4848

@@ -77,7 +77,7 @@ impl SceneCreate {
7777
update_panel(owner, num_children);
7878
}
7979

80-
#[gdnative::derive::godot]
80+
#[gdnative::derive::method]
8181
fn remove_one(&mut self, #[base] owner: &Spatial, str: GodotString) {
8282
godot_print!("Called remove_one({})", str);
8383
let num_children = owner.get_child_count();

0 commit comments

Comments
 (0)