godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-13 13:31:48 +00:00
Code Releases Wiki Activity

Make the meta-data name attribute settable. This will facilitate reuse for ARCore integration.

Browse Source
This commit is contained in:
fhuya
2019-07-02 09:22:47 -07:00
parent ae65c610e7
commit dea414abc8
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
platform/android/export/export.cpp
View File

@@ -824,11 +824,17 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
encode_uint32(min_gles3 ? 0x00030000 : 0x00020000, &p_manifest.write[iofs + 16]); encode_uint32(min_gles3 ? 0x00030000 : 0x00020000, &p_manifest.write[iofs + 16]);
} }
if (tname == "meta-data" && attrname == "value") { if (tname == "meta-data" && attrname == "name" && string_table[attr_value] == "xr_mode_metadata_name") {
// Update the meta-data 'android:name' attribute based on the selected XR mode.
if (xr_mode_index == 1 /* XRMode.OVR */) {
string_table.write[attr_value] = "com.samsung.android.vr.application.mode";
}
}
if (tname == "meta-data" && attrname == "value" && string_table[attr_value] == "xr_mode_metadata_value") {
// Update the meta-data 'android:value' attribute based on the selected XR mode.
if (xr_mode_index == 1 /* XRMode.OVR */) { if (xr_mode_index == 1 /* XRMode.OVR */) {
string_table.write[attr_value] = "vr_only"; string_table.write[attr_value] = "vr_only";
} else {
string_table.write[attr_value] = "";
} }
} }

4
platform/android/java/AndroidManifest.xml
View File

@@ -25,8 +25,8 @@
<!--The following values are replaced when Godot exports, modifying them here has no effect. Do these changes in the--> <!--The following values are replaced when Godot exports, modifying them here has no effect. Do these changes in the-->
<!--export preset. Adding new ones is fine.--> <!--export preset. Adding new ones is fine.-->
<!-- Metadata for VR app detection on Oculus devices. This is modified by the exporter based on the selected xr mode. Changing this value here has no effect. --> <!-- XR mode metadata. This is modified by the exporter based on the selected xr mode. DO NOT CHANGE the values here. -->
<meta-data android:name="com.samsung.android.vr.application.mode" android:value=""/> <meta-data android:name="xr_mode_metadata_name" android:value="xr_mode_metadata_value"/>
<activity android:name="org.godotengine.godot.Godot" <activity android:name="org.godotengine.godot.Godot"
android:label="@string/godot_project_name_string" android:label="@string/godot_project_name_string"