Skip to content

Commit 755a80b

Browse files
authored
fix: shadowed variable names in is_xr_class() (#751)
1 parent c20e6ad commit 755a80b

76 files changed

Lines changed: 148 additions & 148 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

addons/godot-xr-tools/audio/area_audio.gd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ extends AudioStreamPlayer3D
1818

1919

2020
# Add support for is_class on XRTools classes
21-
func is_xr_class(name : String) -> bool:
22-
return name == "XRToolsAreaAudio"
21+
func is_xr_class(xr_name: String) -> bool:
22+
return xr_name == "XRToolsAreaAudio"
2323

2424

2525
# Called when the node enters the scene tree for the first time.

addons/godot-xr-tools/audio/pickable_audio.gd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ extends AudioStreamPlayer3D
2121

2222

2323
# Add support for is_class on XRTools classes
24-
func is_xr_class(name : String) -> bool:
25-
return name == "XRToolsPickableAudio"
24+
func is_xr_class(xr_name: String) -> bool:
25+
return xr_name == "XRToolsPickableAudio"
2626

2727

2828
# Called when the node enters the scene tree for the first time.

addons/godot-xr-tools/audio/surface_audio.gd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ extends Node
1616

1717

1818
# Add support for is_class on XRTools classes
19-
func is_xr_class(name : String) -> bool:
20-
return name == "XRToolsSurfaceAudio"
19+
func is_xr_class(xr_name: String) -> bool:
20+
return xr_name == "XRToolsSurfaceAudio"
2121

2222

2323
# This method checks for configuration issues.

addons/godot-xr-tools/desktop-support/controler_hider.gd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ func _ready() -> void:
2626
_pointer_disabler = true
2727

2828
# Add support for is_xr_class on XRTools classes
29-
func is_xr_class(name : String) -> bool:
30-
return name == "XRToolsDesktopControlerHider"
29+
func is_xr_class(xr_name: String) -> bool:
30+
return xr_name == "XRToolsDesktopControlerHider"
3131

3232
func _process(_delta: float) -> void:
3333
if Engine.is_editor_hint() or !is_inside_tree():

addons/godot-xr-tools/desktop-support/function_desktop_pointer.gd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ var _world_scale : float = 1.0
117117
"XRToolsStaging"),"StartXR","Node")
118118

119119
## Add support for is_xr_class on XRTools classes
120-
func is_xr_class(name : String) -> bool:
121-
return name == "XRToolsDesktopFunctionPointer"
120+
func is_xr_class(xr_name: String) -> bool:
121+
return xr_name == "XRToolsDesktopFunctionPointer"
122122

123123

124124
# Called when the node enters the scene tree for the first time.

addons/godot-xr-tools/desktop-support/mouse_capture.gd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ extends XRToolsMovementProvider
2626

2727

2828
# Add support for is_xr_class on XRTools classes
29-
func is_xr_class(name : String) -> bool:
30-
return name == "XRToolsDesktopMouseCapture" or super(name)
29+
func is_xr_class(xr_name: String) -> bool:
30+
return xr_name == "XRToolsDesktopMouseCapture" or super(xr_name)
3131

3232

3333
# Perform jump movement

addons/godot-xr-tools/desktop-support/movement_desktop_crouch.gd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ var _crouch_button_down : bool = false
4747

4848

4949
# Add support for is_xr_class on XRTools classes
50-
func is_xr_class(name : String) -> bool:
51-
return name == "XRToolsMovementCrouch" or super(name)
50+
func is_xr_class(xr_name: String) -> bool:
51+
return xr_name == "XRToolsMovementCrouch" or super(xr_name)
5252

5353

5454
# Perform jump movement

addons/godot-xr-tools/desktop-support/movement_desktop_direct.gd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ extends XRToolsMovementProvider
3636

3737

3838
# Add support for is_xr_class on XRTools classes
39-
func is_xr_class(name : String) -> bool:
40-
return name == "XRToolsDesktopMovementDirect" or super(name)
39+
func is_xr_class(xr_name: String) -> bool:
40+
return xr_name == "XRToolsDesktopMovementDirect" or super(xr_name)
4141

4242

4343
# Perform jump movement

addons/godot-xr-tools/desktop-support/movement_desktop_flight.gd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ var _flight_button : bool = false
7979

8080

8181
# Add support for is_xr_class on XRTools classes
82-
func is_xr_class(name : String) -> bool:
83-
return name == "XRToolsDesktopMovementFlight" or super(name)
82+
func is_xr_class(xr_name: String) -> bool:
83+
return xr_name == "XRToolsDesktopMovementFlight" or super(xr_name)
8484

8585

8686
func _ready():

addons/godot-xr-tools/desktop-support/movement_desktop_jump.gd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ extends XRToolsMovementProvider
2828

2929

3030
# Add support for is_xr_class on XRTools classes
31-
func is_xr_class(name : String) -> bool:
32-
return name == "XRToolsDesktopMovementJump" or super(name)
31+
func is_xr_class(xr_name: String) -> bool:
32+
return xr_name == "XRToolsDesktopMovementJump" or super(xr_name)
3333

3434

3535
# Perform jump movement

0 commit comments

Comments
 (0)