Support making hybrid apps for Pico headsets

Author: dsnopek

plugin/src/main/cpp/export/export_plugin.cpp

@@ -95,6 +95,25 @@ OpenXREditorExportPlugin::HybridType OpenXREditorExportPlugin::_get_hybrid_app_s
 	return (HybridType)(int)ProjectSettings::get_singleton()->get_setting_with_override("xr/openxr/hybrid_app");
 }
 
+String OpenXREditorExportPlugin::_get_opening_activity_tag_for_panel_app() const {
+	ProjectSettings *project_settings = ProjectSettings::get_singleton();
+
+	return vformat(
+			"        <activity android:name=\"org.godotengine.openxr.vendors.GodotPanelApp\" "
+			"android:process=\":GodotPanelApp\" "
+			"android:theme=\"@style/GodotPanelAppSplashTheme\" "
+			"android:launchMode=\"singleInstancePerTask\" "
+			"android:exported=\"true\" "
+			"android:excludeFromRecents=\"%s\" "
+			"android:screenOrientation=\"%s\" "
+			"android:resizeableActivity=\"%s\" "
+			"android:configChanges=\"orientation|keyboardHidden|screenSize|smallestScreenSize|density|keyboard|navigation|screenLayout|uiMode\" "
+			"tools:ignore=\"UnusedAttribute\">\n",
+			_bool_to_string(_get_bool_option("package/exclude_from_recents")),
+			_get_android_orientation_label((DisplayServer::ScreenOrientation)(int)project_settings->get_setting_with_override("display/window/handheld/orientation")),
+			_bool_to_string(project_settings->get_setting_with_override("display/window/size/resizable")));
+}
+
 bool OpenXREditorExportPlugin::_is_openxr_enabled() const {
 	return _get_int_option("xr_features/xr_mode", REGULAR_MODE_VALUE) == OPENXR_MODE_VALUE;
 }

plugin/src/main/cpp/export/meta_export_plugin.cpp

@@ -482,22 +482,7 @@ String MetaEditorExportPlugin::_get_android_manifest_application_element_content
 
 	HybridType hybrid_type = _get_hybrid_app_setting_value();
 	if (hybrid_type != HYBRID_TYPE_DISABLED) {
-		ProjectSettings *project_settings = ProjectSettings::get_singleton();
-
-		contents += vformat(
-				"        <activity android:name=\"org.godotengine.openxr.vendors.GodotPanelApp\" "
-				"android:process=\":GodotPanelApp\" "
-				"android:theme=\"@style/GodotPanelAppSplashTheme\" "
-				"android:launchMode=\"singleInstancePerTask\" "
-				"android:exported=\"true\" "
-				"android:excludeFromRecents=\"%s\" "
-				"android:screenOrientation=\"%s\" "
-				"android:resizeableActivity=\"%s\" "
-				"android:configChanges=\"orientation|keyboardHidden|screenSize|smallestScreenSize|density|keyboard|navigation|screenLayout|uiMode\" "
-				"tools:ignore=\"UnusedAttribute\">\n",
-				_bool_to_string(_get_bool_option("package/exclude_from_recents")),
-				_get_android_orientation_label((DisplayServer::ScreenOrientation)(int)project_settings->get_setting_with_override("display/window/handheld/orientation")),
-				_bool_to_string(project_settings->get_setting_with_override("display/window/size/resizable")));
+		contents += _get_opening_activity_tag_for_panel_app();
 
 		contents +=
 				"          <intent-filter>\n"

plugin/src/main/cpp/export/pico_export_plugin.cpp

@@ -119,6 +119,11 @@ PackedStringArray PicoEditorExportPlugin::_get_export_features(const Ref<EditorE
 		features.append(EYE_GAZE_INTERACTION_FEATURE);
 	}
 
+	// Add a feature to indicate that this is a hybrid app.
+	if (_is_openxr_enabled() && _get_hybrid_app_setting_value() != HYBRID_TYPE_DISABLED) {
+		features.append(HYBRID_APP_FEATURE);
+	}
+
 	return features;
 }
 
@@ -200,5 +205,25 @@ String PicoEditorExportPlugin::_get_android_manifest_application_element_content
 		contents += "        <meta-data tools:node=\"replace\" android:name=\"Hand_Tracking_HighFrequency\" android:value=\"1\" />\n";
 	}
 
+	HybridType hybrid_type = _get_hybrid_app_setting_value();
+	if (hybrid_type != HYBRID_TYPE_DISABLED) {
+		contents += "        <meta-data tools:node=\"replace\" android:name=\"pvr.app.type\" android:value=\"2d\" />\n";
+
+		contents += _get_opening_activity_tag_for_panel_app();
+
+		contents +=
+				"          <intent-filter>\n"
+				"            <action android:name=\"android.intent.action.MAIN\" />\n"
+				"            <category android:name=\"android.intent.category.DEFAULT\" />\n";
+
+		if (hybrid_type == HYBRID_TYPE_START_AS_PANEL) {
+			contents += "            <category android:name=\"android.intent.category.LAUNCHER\" />\n";
+		}
+
+		contents +=
+				"          </intent-filter>\n"
+				"        </activity>\n";
+	}
+
 	return contents;
 }

plugin/src/main/cpp/include/export/export_plugin.h

@@ -116,6 +116,8 @@ class OpenXREditorExportPlugin : public EditorExportPlugin {
 
 	HybridType _get_hybrid_app_setting_value() const;
 
+	String _get_opening_activity_tag_for_panel_app() const;
+
 	bool _is_openxr_enabled() const;
 
 	bool _get_bool_option(const String &option) const;

plugin/src/pico/AndroidManifest.xml

@@ -22,6 +22,9 @@
         <meta-data android:name="org.godotengine.plugin.v2.GodotOpenXRPico"
             android:value="org.godotengine.openxr.vendors.pico.GodotOpenXRPico" />
 
+        <meta-data android:name="org.godotengine.plugin.v2.GodotOpenXRHybridAppInternal"
+            android:value="org.godotengine.openxr.vendors.GodotOpenXRHybridAppInternal" />
+
         <!-- Enable VR mode on Pico headsets -->
         <meta-data android:name="pvr.app.type" android:value="vr" />
         <meta-data android:name="pvr.sdk.version" android:value="OpenXR" />";

samples/hybrid-app-sample/export_presets.cfg

@@ -2,7 +2,7 @@
 
 name="Quest"
 platform="Android"
-runnable=true
+runnable=false
 advanced_options=true
 dedicated_server=false
 custom_features=""
@@ -245,3 +245,252 @@ pico_xr_features/face_tracking=0
 pico_xr_features/hand_tracking=0
 xr_features/enable_magicleap_plugin=false
 magicleap_xr_features/hand_tracking=0
+pico_xr_features/hybrid_app=0
+
+[preset.1]
+
+name="Pico"
+platform="Android"
+runnable=true
+advanced_options=false
+dedicated_server=false
+custom_features=""
+export_filter="all_resources"
+include_filter=""
+exclude_filter=""
+export_path="../builds/PicoHybridAppSample.apk"
+patches=PackedStringArray()
+encryption_include_filters=""
+encryption_exclude_filters=""
+seed=0
+encrypt_pck=false
+encrypt_directory=false
+script_export_mode=2
+
+[preset.1.options]
+
+custom_template/debug=""
+custom_template/release=""
+gradle_build/use_gradle_build=true
+gradle_build/gradle_build_directory=""
+gradle_build/android_source_template=""
+gradle_build/compress_native_libraries=false
+gradle_build/export_format=0
+gradle_build/min_sdk=""
+gradle_build/target_sdk=""
+architectures/armeabi-v7a=false
+architectures/arm64-v8a=true
+architectures/x86=false
+architectures/x86_64=false
+version/code=1
+version/name=""
+package/unique_name="com.godotopenxrvendors.picohybridappsample"
+package/name=""
+package/signed=true
+package/app_category=2
+package/retain_data_on_uninstall=false
+package/exclude_from_recents=false
+package/show_in_android_tv=false
+package/show_in_app_library=true
+package/show_as_launcher_app=false
+launcher_icons/main_192x192=""
+launcher_icons/adaptive_foreground_432x432=""
+launcher_icons/adaptive_background_432x432=""
+launcher_icons/adaptive_monochrome_432x432=""
+graphics/opengl_debug=false
+xr_features/xr_mode=1
+wear_os/swipe_to_dismiss=true
+screen/immersive_mode=true
+screen/support_small=true
+screen/support_normal=true
+screen/support_large=true
+screen/support_xlarge=true
+user_data_backup/allow=false
+command_line/extra_args=""
+apk_expansion/enable=false
+apk_expansion/SALT=""
+apk_expansion/public_key=""
+permissions/custom_permissions=PackedStringArray()
+permissions/access_checkin_properties=false
+permissions/access_coarse_location=false
+permissions/access_fine_location=false
+permissions/access_location_extra_commands=false
+permissions/access_media_location=false
+permissions/access_mock_location=false
+permissions/access_network_state=false
+permissions/access_surface_flinger=false
+permissions/access_wifi_state=false
+permissions/account_manager=false
+permissions/add_voicemail=false
+permissions/authenticate_accounts=false
+permissions/battery_stats=false
+permissions/bind_accessibility_service=false
+permissions/bind_appwidget=false
+permissions/bind_device_admin=false
+permissions/bind_input_method=false
+permissions/bind_nfc_service=false
+permissions/bind_notification_listener_service=false
+permissions/bind_print_service=false
+permissions/bind_remoteviews=false
+permissions/bind_text_service=false
+permissions/bind_vpn_service=false
+permissions/bind_wallpaper=false
+permissions/bluetooth=false
+permissions/bluetooth_admin=false
+permissions/bluetooth_privileged=false
+permissions/brick=false
+permissions/broadcast_package_removed=false
+permissions/broadcast_sms=false
+permissions/broadcast_sticky=false
+permissions/broadcast_wap_push=false
+permissions/call_phone=false
+permissions/call_privileged=false
+permissions/camera=false
+permissions/capture_audio_output=false
+permissions/capture_secure_video_output=false
+permissions/capture_video_output=false
+permissions/change_component_enabled_state=false
+permissions/change_configuration=false
+permissions/change_network_state=false
+permissions/change_wifi_multicast_state=false
+permissions/change_wifi_state=false
+permissions/clear_app_cache=false
+permissions/clear_app_user_data=false
+permissions/control_location_updates=false
+permissions/delete_cache_files=false
+permissions/delete_packages=false
+permissions/device_power=false
+permissions/diagnostic=false
+permissions/disable_keyguard=false
+permissions/dump=false
+permissions/expand_status_bar=false
+permissions/factory_test=false
+permissions/flashlight=false
+permissions/force_back=false
+permissions/get_accounts=false
+permissions/get_package_size=false
+permissions/get_tasks=false
+permissions/get_top_activity_info=false
+permissions/global_search=false
+permissions/hardware_test=false
+permissions/inject_events=false
+permissions/install_location_provider=false
+permissions/install_packages=false
+permissions/install_shortcut=false
+permissions/internal_system_window=false
+permissions/internet=false
+permissions/kill_background_processes=false
+permissions/location_hardware=false
+permissions/manage_accounts=false
+permissions/manage_app_tokens=false
+permissions/manage_documents=false
+permissions/manage_external_storage=false
+permissions/master_clear=false
+permissions/media_content_control=false
+permissions/modify_audio_settings=false
+permissions/modify_phone_state=false
+permissions/mount_format_filesystems=false
+permissions/mount_unmount_filesystems=false
+permissions/nfc=false
+permissions/persistent_activity=false
+permissions/post_notifications=false
+permissions/process_outgoing_calls=false
+permissions/read_calendar=false
+permissions/read_call_log=false
+permissions/read_contacts=false
+permissions/read_external_storage=false
+permissions/read_frame_buffer=false
+permissions/read_history_bookmarks=false
+permissions/read_input_state=false
+permissions/read_logs=false
+permissions/read_media_audio=false
+permissions/read_media_images=false
+permissions/read_media_video=false
+permissions/read_media_visual_user_selected=false
+permissions/read_phone_state=false
+permissions/read_profile=false
+permissions/read_sms=false
+permissions/read_social_stream=false
+permissions/read_sync_settings=false
+permissions/read_sync_stats=false
+permissions/read_user_dictionary=false
+permissions/reboot=false
+permissions/receive_boot_completed=false
+permissions/receive_mms=false
+permissions/receive_sms=false
+permissions/receive_wap_push=false
+permissions/record_audio=false
+permissions/reorder_tasks=false
+permissions/restart_packages=false
+permissions/send_respond_via_message=false
+permissions/send_sms=false
+permissions/set_activity_watcher=false
+permissions/set_alarm=false
+permissions/set_always_finish=false
+permissions/set_animation_scale=false
+permissions/set_debug_app=false
+permissions/set_orientation=false
+permissions/set_pointer_speed=false
+permissions/set_preferred_applications=false
+permissions/set_process_limit=false
+permissions/set_time=false
+permissions/set_time_zone=false
+permissions/set_wallpaper=false
+permissions/set_wallpaper_hints=false
+permissions/signal_persistent_processes=false
+permissions/status_bar=false
+permissions/subscribed_feeds_read=false
+permissions/subscribed_feeds_write=false
+permissions/system_alert_window=false
+permissions/transmit_ir=false
+permissions/uninstall_shortcut=false
+permissions/update_device_stats=false
+permissions/use_credentials=false
+permissions/use_sip=false
+permissions/vibrate=false
+permissions/wake_lock=false
+permissions/write_apn_settings=false
+permissions/write_calendar=false
+permissions/write_call_log=false
+permissions/write_contacts=false
+permissions/write_external_storage=false
+permissions/write_gservices=false
+permissions/write_history_bookmarks=false
+permissions/write_profile=false
+permissions/write_secure_settings=false
+permissions/write_settings=false
+permissions/write_sms=false
+permissions/write_social_stream=false
+permissions/write_sync_settings=false
+permissions/write_user_dictionary=false
+xr_features/enable_khronos_plugin=false
+khronos_xr_features/vendors=0
+khronos_xr_features/htc/hand_tracking=0
+khronos_xr_features/htc/tracker=0
+khronos_xr_features/htc/eye_tracking=0
+khronos_xr_features/htc/lip_expression=0
+xr_features/enable_lynx_plugin=false
+xr_features/enable_meta_plugin=false
+meta_xr_features/eye_tracking=0
+meta_xr_features/face_tracking=0
+meta_xr_features/body_tracking=0
+meta_xr_features/hand_tracking=0
+meta_xr_features/hand_tracking_frequency=0
+meta_xr_features/passthrough=0
+meta_xr_features/render_model=0
+meta_xr_features/use_anchor_api=false
+meta_xr_features/use_anchor_sharing=false
+meta_xr_features/use_scene_api=false
+meta_xr_features/use_overlay_keyboard=false
+meta_xr_features/use_experimental_features=false
+meta_xr_features/boundary_mode=0
+meta_xr_features/quest_1_support=false
+meta_xr_features/quest_2_support=true
+meta_xr_features/quest_3_support=true
+meta_xr_features/quest_pro_support=true
+xr_features/enable_pico_plugin=true
+pico_xr_features/eye_tracking=0
+pico_xr_features/face_tracking=0
+pico_xr_features/hand_tracking=0
+xr_features/enable_magicleap_plugin=false
+magicleap_xr_features/hand_tracking=0

samples/hybrid-app-sample/main.gd

@@ -59,9 +59,10 @@ func _process(_delta: float) -> void:
 		panel_switcher_layer.update_pointer(t.origin, -t.basis.z, pointer_pressed)
 
 func _on_right_controller_pointer_button_pressed(p_name: String) -> void:
-	if p_name == 'trigger_click':
+	print("button: ", p_name)
+	if p_name == 'trigger_click' or p_name == 'select_button':
 		pointer_pressed = true
 
 func _on_right_controller_pointer_button_released(p_name: String) -> void:
-	if p_name == 'trigger_click':
+	if p_name == 'trigger_click' or p_name == 'select_button':
 		pointer_pressed = false