New action map logic

Author: BastiaanOlij

demo/addons/godot-openxr/editor/OpenXRActionSetsEditor.gd

@@ -0,0 +1,15 @@
+extends Control
+
+class_name OpenXRActionSetsEditor
+
+var edit_action_sets : OpenXRActionSets = null
+
+func set_edit_action_sets(action_sets : OpenXRActionSets):
+	edit_action_sets = action_sets
+	if edit_action_sets:
+		# setup our interface
+		pass
+
+# Called when the node enters the scene tree for the first time.
+func _ready():
+	pass # Replace with function body.

demo/addons/godot-openxr/editor/OpenXRActionSetsEditor.tscn

@@ -0,0 +1,9 @@
+[gd_scene load_steps=2 format=3 uid="uid://dq5euwagt54y1"]
+
+[ext_resource type="Script" path="res://addons/godot-openxr/editor/OpenXRActionSetsEditor.gd" id="1_oxgn0"]
+
+[node name="OpenXRActionSetsEditor" type="Control"]
+script = ExtResource( "1_oxgn0" )
+__meta__ = {
+"_edit_use_anchors_": false
+}

demo/addons/godot-openxr/editor/OpenXRRunSelect.gd

@@ -1,13 +1,12 @@
+@tool
 extends OptionButton
 
-# @tool
-
 var available_runtimes : Array = Array()
-onready var platform = OS.get_name()
+@onready var platform = OS.get_name()
 
 var home_folder = ''
 
-func _parse_path(p_path):
+func _parse_path(p_path) -> String:
 	# we might want to add more stuff here at some point
 	p_path = p_path.replace("~", home_folder)
 	return p_path
@@ -31,8 +30,10 @@ func _ready():
 	# read our json file, may have entries for multiple platforms, we'll filter them later
 	var f = File.new()
 	if (f.open("res://addons/godot-openxr/runtimes.json", File.READ)) == OK:
-		var json = JSON.parse(f.get_as_text())
-		available_runtimes = json.result as Array
+		var json = JSON.new()
+		var err : int = json.parse(f.get_as_text())
+		if err == OK:
+			available_runtimes = json.get_data()
 		f.close()
 
 	# check what our current value is
@@ -44,8 +45,8 @@ func _ready():
 		add_item("Default", -1)
 
 		# check which runtimes are actually available
-		var dir = Directory.new()
-		var index = 0
+		var dir : Directory = Directory.new()
+		var index : int = 0
 		for i in available_runtimes.size():
 			var runtime = available_runtimes[i]
 			var path = _parse_path(runtime["path"])
@@ -63,8 +64,7 @@ func _ready():
 		# I guess nothing supported on this platform
 		visible = false
 
-func _on_OpenXRRunSelect_item_selected(index):
-	# this need latest 3.2.4
+func _on_OpenXRRunSelect_item_selected(index : int):
 	if index == 0:
 		print("Returning to default")
 		OS.set_environment("XR_RUNTIME_JSON", "")

demo/addons/godot-openxr/editor/OpenXRRunSelect.tscn

@@ -1,12 +1,13 @@
-[gd_scene load_steps=2 format=2]
+[gd_scene load_steps=2 format=3 uid="uid://7eqmk3bil2rq"]
 
-[ext_resource path="res://addons/godot-openxr/editor/OpenXRRunSelect.gd" type="Script" id=1]
+[ext_resource type="Script" path="res://addons/godot-openxr/editor/OpenXRRunSelect.gd" id="1"]
 
 [node name="OpenXRRunSelect" type="OptionButton"]
+theme_override_font_sizes/font_size = 16
 text = "Default"
-items = [ "Default", null, false, 0, null, "SteamVR", null, false, 2, null, "Oculus", null, false, 3, null, "Microsoft MR", null, false, 4, null ]
+items = ["Default", null, false, 0, null, "SteamVR", null, false, 2, null, "Oculus", null, false, 3, null, "Microsoft MR", null, false, 4, null]
 selected = 0
-script = ExtResource( 1 )
+script = ExtResource( "1" )
 __meta__ = {
 "_edit_use_anchors_": false
 }

demo/addons/godot-openxr/plugin.gd

@@ -1,14 +1,49 @@
-tool
+@tool
 extends EditorPlugin
 
 var openxr_run_select = null
+var action_set_editor : OpenXRActionSetsEditor = null
+var action_set_button = null
 
 func _enter_tree():
-	openxr_run_select = preload("res://addons/godot-openxr/editor/OpenXRRunSelect.tscn").instance()
+	openxr_run_select = preload("res://addons/godot-openxr/editor/OpenXRRunSelect.tscn").instantiate()
 	add_control_to_container(CONTAINER_TOOLBAR, openxr_run_select)
+	
+	action_set_editor = preload("res://addons/godot-openxr/editor/OpenXRActionSetsEditor.tscn").instantiate()
+	if action_set_editor:
+		action_set_button = add_control_to_bottom_panel(action_set_editor, "Action Sets")
+		action_set_button.hide()
 
 func _exit_tree():
+	if action_set_editor:
+		remove_control_from_bottom_panel(action_set_editor)
+		action_set_editor.queue_free()
+		action_set_editor = null
+		action_set_button = null
+
 	if openxr_run_select:
 		remove_control_from_container(EditorPlugin.CONTAINER_TOOLBAR, openxr_run_select)
 		openxr_run_select.queue_free()
 		openxr_run_select = null
+
+func _handles(object) -> bool:
+	if action_set_editor and object.is_class("OpenXRActionSets"):
+		return true
+	
+	return false
+
+func _edit(object):
+	if action_set_editor and object.is_class("OpenXRActionSets"):
+		action_set_editor.set_edit_action_sets(object)
+
+func _make_visible(visible):
+	if visible:
+		action_set_button.show()
+		make_bottom_panel_item_visible(action_set_editor)
+		action_set_editor.set_process_input(true)
+	else:
+		if action_set_editor.is_visible_in_tree():
+			hide_bottom_panel()
+		action_set_button.hide()
+		action_set_editor.set_process_input(false)
+		

demo/project.godot

@@ -8,6 +8,16 @@
 
 config_version=4
 
+_global_script_classes=[{
+"base": "Control",
+"class": &"OpenXRActionSetsEditor",
+"language": &"GDScript",
+"path": "res://addons/godot-openxr/editor/OpenXRActionSetsEditor.gd"
+}]
+_global_script_class_icons={
+"OpenXRActionSetsEditor": ""
+}
+
 [application]
 
 config/name="Godot OpenXR demo"
@@ -20,7 +30,7 @@ window/vsync/use_vsync=false
 
 [editor_plugins]
 
-enabled=PackedStringArray()
+enabled=PackedStringArray("res://addons/godot-openxr/plugin.cfg")
 
 [gdnative]
 

src/gdclasses/actions/OpenXRActionSets.cpp

@@ -103,7 +103,6 @@ Ref<OpenXRInteractionProfile> OpenXRActionSets::get_interaction_profile(int p_in
 	}
 }
 
-/* this needs https://github.com/godotengine/godot-cpp/pull/656
 Array OpenXRActionSets::_get_property_list() {
 	// We are returning hidden entries for our action sets and interaction profiles so they get saved into our resource file
 	// These are not for direct use.
@@ -117,7 +116,7 @@ Array OpenXRActionSets::_get_property_list() {
 		Dictionary property;
 
 		String name = "action_sets/";
-		name += String::num((double) i, 0);
+		name = name + String::num((double) i, 0);
 
 		property["name"] = name;
 		property["type"] = Variant::OBJECT;
@@ -133,13 +132,14 @@ Array OpenXRActionSets::_get_property_list() {
 		Dictionary property;
 
 		String name = "interaction_profile/";
-		name += String::num((double) i, 0);
+		name = name + String::num((double) i, 0);
 
 		property["name"] = name;
 		property["type"] = Variant::OBJECT;
 		property["hint"] = PROPERTY_HINT_RESOURCE_TYPE;
 		property["hint_string"] = "OpenXRInteractionProfile";
-		property["usage"] = PROPERTY_USAGE_NO_EDITOR; // don't show in editor, only load from/save to tscn
+		// property["usage"] = PROPERTY_USAGE_NO_EDITOR; // don't show in editor, only load from/save to tscn
+		property["usage"] = 0;
 
 		arr.push_back(property);
 	}
@@ -193,7 +193,7 @@ bool OpenXRActionSets::_set(const String p_name, Variant p_value) {
 	} else if (p_name.begins_with(str_interaction_profiles)) {
 		Ref<OpenXRInteractionProfile> interaction_profile = p_value;
 
-		if (interaction_profiles.is_valid()) {
+		if (interaction_profile.is_valid()) {
 			String index = p_name.split("/")[1];
 			int id = index.to_int();
 
@@ -211,7 +211,6 @@ bool OpenXRActionSets::_set(const String p_name, Variant p_value) {
 	// Must be a property of our superclass, returning false will handle it further
 	return false;
 }
-*/
 
 OpenXRActionSets::OpenXRActionSets() {
 	// nothing to do here yet...

src/gdclasses/actions/OpenXRActionSets.h

@@ -35,11 +35,9 @@ class OpenXRActionSets : public Resource {
 	int number_of_interaction_profiles() const;
 	Ref<OpenXRInteractionProfile> get_interaction_profile(int p_index) const;
 
-	/* this needs https://github.com/godotengine/godot-cpp/pull/656
 	Array _get_property_list();
 	Variant _get(const String p_name) const;
 	bool _set(const String p_name, Variant p_value);
-	*/
 
 	OpenXRActionSets();
 	~OpenXRActionSets();