Skip to content

Commit

Permalink
Using ResourceLoader.load() instead of preload() for images, fixes st…
Browse files Browse the repository at this point in the history 
…art-up error in new projects

Related issue: godotengine/godot#17483
  • Loading branch information
@alessandrofama
alessandrofama committed Sep 19, 2020
1 parent 166d5e9 commit 3a49eda
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
32 changes: 16 additions & 16 deletions wwise-gdnative/gdnative-demo/addons/wwise_custom_nodes/wwise_custom_nodes.gd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,26 @@ var ak_event_gizmo = AkEventGizmo.new()

func _enter_tree():
# 3D Nodes
add_custom_type("AkEvent", "Spatial", preload("res://wwise/runtime/nodes/ak_event.gd"), preload("res://addons/wwise_custom_nodes/wwise_node.png"))
add_custom_type("AkBank", "Spatial", preload("res://wwise/runtime/nodes/ak_bank.gd"), preload("res://addons/wwise_custom_nodes/wwise_node.png"))
add_custom_type("AkListener", "Spatial", preload("res://wwise/runtime/nodes/ak_listener.gd"), preload("res://addons/wwise_custom_nodes/wwise_node.png"))
add_custom_type("AkState", "Spatial", preload("res://wwise/runtime/nodes/ak_state.gd"), preload("res://addons/wwise_custom_nodes/wwise_node.png"))
add_custom_type("AkSwitch", "Spatial", preload("res://wwise/runtime/nodes/ak_switch.gd"), preload("res://addons/wwise_custom_nodes/wwise_node.png"))
add_custom_type("AkEnvironment", "Area", preload("res://wwise/runtime/nodes/ak_environment.gd"), preload("res://addons/wwise_custom_nodes/wwise_node.png"))
add_custom_type("AkEvent", "Spatial", preload("res://wwise/runtime/nodes/ak_event.gd"), ResourceLoader.load("res://addons/wwise_custom_nodes/wwise_node.png"))
add_custom_type("AkBank", "Spatial", preload("res://wwise/runtime/nodes/ak_bank.gd"), ResourceLoader.load("res://addons/wwise_custom_nodes/wwise_node.png"))
add_custom_type("AkListener", "Spatial", preload("res://wwise/runtime/nodes/ak_listener.gd"), ResourceLoader.load("res://addons/wwise_custom_nodes/wwise_node.png"))
add_custom_type("AkState", "Spatial", preload("res://wwise/runtime/nodes/ak_state.gd"), ResourceLoader.load("res://addons/wwise_custom_nodes/wwise_node.png"))
add_custom_type("AkSwitch", "Spatial", preload("res://wwise/runtime/nodes/ak_switch.gd"), ResourceLoader.load("res://addons/wwise_custom_nodes/wwise_node.png"))
add_custom_type("AkEnvironment", "Area", preload("res://wwise/runtime/nodes/ak_environment.gd"), ResourceLoader.load("res://addons/wwise_custom_nodes/wwise_node.png"))
add_spatial_gizmo_plugin(ak_event_gizmo)

# Spatial Audio Nodes
add_custom_type("AkGeometry", "Spatial", preload("res://wwise/runtime/nodes/ak_geometry.gd"), preload("res://addons/wwise_custom_nodes/wwise_node.png"))
add_custom_type("AkRoom", "Area", preload("res://wwise/runtime/nodes/ak_room.gd"), preload("res://addons/wwise_custom_nodes/wwise_node.png"))
add_custom_type("AkPortal", "Area", preload("res://wwise/runtime/nodes/ak_portal.gd"), preload("res://addons/wwise_custom_nodes/wwise_node.png"))
add_custom_type("AkEarlyReflections", "Node", preload("res://wwise/runtime/nodes/ak_early_reflections.gd"), preload("res://addons/wwise_custom_nodes/wwise_node.png"))
add_custom_type("AkGeometry", "Spatial", preload("res://wwise/runtime/nodes/ak_geometry.gd"), ResourceLoader.load("res://addons/wwise_custom_nodes/wwise_node.png"))
add_custom_type("AkRoom", "Area", preload("res://wwise/runtime/nodes/ak_room.gd"), ResourceLoader.load("res://addons/wwise_custom_nodes/wwise_node.png"))
add_custom_type("AkPortal", "Area", preload("res://wwise/runtime/nodes/ak_portal.gd"), ResourceLoader.load("res://addons/wwise_custom_nodes/wwise_node.png"))
add_custom_type("AkEarlyReflections", "Node", preload("res://wwise/runtime/nodes/ak_early_reflections.gd"), ResourceLoader.load("res://addons/wwise_custom_nodes/wwise_node.png"))

# 2D Nodes
add_custom_type("AkEvent2D", "Node2D", preload("res://wwise/runtime/nodes/ak_event_2d.gd"), preload("res://addons/wwise_custom_nodes/wwise_node.png"))
add_custom_type("AkBank2D", "Node2D", preload("res://wwise/runtime/nodes/ak_bank_2d.gd"), preload("res://addons/wwise_custom_nodes/wwise_node.png"))
add_custom_type("AkListener2D", "Node2D", preload("res://wwise/runtime/nodes/ak_listener_2d.gd"), preload("res://addons/wwise_custom_nodes/wwise_node.png"))
add_custom_type("AkState2D", "Node2D", preload("res://wwise/runtime/nodes/ak_state_2d.gd"), preload("res://addons/wwise_custom_nodes/wwise_node.png"))
add_custom_type("AkSwitch2D", "Node2D", preload("res://wwise/runtime/nodes/ak_switch_2d.gd"), preload("res://addons/wwise_custom_nodes/wwise_node.png"))
add_custom_type("AkEvent2D", "Node2D", preload("res://wwise/runtime/nodes/ak_event_2d.gd"), ResourceLoader.load("res://addons/wwise_custom_nodes/wwise_node.png"))
add_custom_type("AkBank2D", "Node2D", preload("res://wwise/runtime/nodes/ak_bank_2d.gd"), ResourceLoader.load("res://addons/wwise_custom_nodes/wwise_node.png"))
add_custom_type("AkListener2D", "Node2D", preload("res://wwise/runtime/nodes/ak_listener_2d.gd"), ResourceLoader.load("res://addons/wwise_custom_nodes/wwise_node.png"))
add_custom_type("AkState2D", "Node2D", preload("res://wwise/runtime/nodes/ak_state_2d.gd"), ResourceLoader.load("res://addons/wwise_custom_nodes/wwise_node.png"))
add_custom_type("AkSwitch2D", "Node2D", preload("res://wwise/runtime/nodes/ak_switch_2d.gd"), ResourceLoader.load("res://addons/wwise_custom_nodes/wwise_node.png"))

# Visual Script Nodes
VisualScriptEditor.add_custom_node("AkLoadBank", "Wwise", preload("res://wwise/runtime/visual nodes/ak_load_bank_vs.gd"))
Expand All @@ -41,7 +41,7 @@ func _enter_tree():
VisualScriptEditor.add_custom_node("AkSetRTPCValue", "Wwise", preload("res://wwise/runtime/visual nodes/ak_set_rtpc_value_vs.gd"))

# Resources
add_custom_type("AkAcousticTexture", "Resource", preload("res://wwise/runtime/nodes/ak_acoustic_texture.gd"), preload("res://addons/wwise_custom_nodes/wwise_node.png"))
add_custom_type("AkAcousticTexture", "Resource", preload("res://wwise/runtime/nodes/ak_acoustic_texture.gd"), ResourceLoader.load("res://addons/wwise_custom_nodes/wwise_node.png"))

func _exit_tree():
# 3D Nodes
Expand Down
2 changes: 1 addition & 1 deletion wwise-gdnative/gdnative-demo/wwise/editor/ak_event_gizmo.gd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const AkEventNode = preload("res://wwise/runtime/nodes/ak_event.gd")

func _init():
create_icon_material("ak_event_icon",
preload("res://wwise/editor/WwiseAudioSpeaker.png") as Texture, true)
ResourceLoader.load("res://wwise/editor/WwiseAudioSpeaker.png") as Texture, true)

func has_gizmo(spatial):
return spatial is AkEventNode
Expand Down

0 comments on commit 3a49eda

Please sign in to comment.