Update the plugin's directory structure (#51)

GodotVR · Oct 16, 2023 · b5cff9e · b5cff9e
1 parent 0e8c9c7
commit b5cff9e
Show file tree

Hide file tree

Showing 21 changed files with 217 additions and 187 deletions.
diff --git a/.github/workflows/build-addon-on-push.yml b/.github/workflows/build-addon-on-push.yml
@@ -36,9 +36,9 @@ jobs:
           cp aar/CHANGES.md asset/addons/godotopenxr/GodotOpenXRLoaders_CHANGES.md
       - name: Adding vendor licences
         run: |
-          cp aar/godotopenxrmeta/LICENSE.txt asset/addons/godotopenxr/.export/meta/
-          cp aar/godotopenxrpico/src/main/jniLibs/arm64-v8a/README.md asset/addons/godotopenxr/.export/pico/LICENSE.md
-          cp aar/godotopenxrkhr/LICENSE asset/addons/godotopenxr/.export/khr/LICENSE
+          cp aar/godotopenxrmeta/LICENSE.txt asset/addons/godotopenxr/export/meta/
+          cp aar/godotopenxrpico/src/main/jniLibs/arm64-v8a/README.md asset/addons/godotopenxr/export/pico/LICENSE.md
+          cp aar/godotopenxrkhr/LICENSE asset/addons/godotopenxr/export/khr/LICENSE
       - name: Create Godot OpenXR loader addon artifact
         uses: actions/upload-artifact@v3
         with:

diff --git a/CHANGES.md b/CHANGES.md
@@ -8,6 +8,7 @@
 - Add configs for the OpenXR Eye gaze interaction extension
 - Add the ability to customize supported Meta devices
 - Add support for Quest 3 devices
+- Update the directory structure for the v2 plugin
 
 ## 1.1.0
 - Update Meta OpenXR loader to version 54

diff --git a/config.gradle b/config.gradle
@@ -1,4 +1,4 @@
-final snapshotGodotAndroidLib = "org.godotengine:godot:4.2.0.dev-SNAPSHOT"
+final snapshotGodotAndroidLib = "org.godotengine:godot:4.2.0.beta-SNAPSHOT"
 final stableGodotAndroidLib = "org.godotengine:godot:4.1.0.stable"
 
 ext {
@@ -18,7 +18,7 @@ ext {
 
 // Parse the release version from the gradle project properties (e.g: -Prelease_version=<version>)
 ext.getReleaseVersion = { ->
-    final String defaultVersion = "2.0.0-SNAPSHOT"
+    final String defaultVersion = "2.0.0-dev-SNAPSHOT"
 
     String releaseVersion = project.hasProperty("release_version") ? project.property("release_version") : defaultVersion
     if (releaseVersion == null || releaseVersion.isEmpty()) {

diff --git a/demo/.gitignore b/demo/.gitignore
@@ -1,4 +1,4 @@
 # Godot 4+ specific ignores
 .godot/
-/addons/godotopenxr/.bin/*/*.aar
+/addons/godotopenxr/.bin/**/*.aar
 /android/
diff --git a/demo/addons/godotopenxr/.bin/.gdignore b/demo/addons/godotopenxr/.bin/.gdignore
diff --git a/demo/addons/godotopenxr/.export/.gdignore b/demo/addons/godotopenxr/.export/.gdignore
diff --git a/demo/addons/godotopenxr/.export/godot_openxr_editor_export_plugin.gd b/demo/addons/godotopenxr/.export/godot_openxr_editor_export_plugin.gd
diff --git a/demo/addons/godotopenxr/.export/godot_openxr_editor_plugin.gd b/demo/addons/godotopenxr/.export/godot_openxr_editor_plugin.gd
diff --git a/demo/addons/godotopenxr/.export/globals.gd → demo/addons/godotopenxr/export/globals.gd b/demo/addons/godotopenxr/.export/globals.gd → demo/addons/godotopenxr/export/globals.gd
@@ -15,3 +15,5 @@ const VENDORS_LIST = [
 
 # Set of custom feature tags supported by the plugin
 const EYE_GAZE_INTERACTION_FEATURE = "XR_EXT_eye_gaze_interaction"
+
+const OPENXR_MODE_VALUE = 1
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,3 +15,5 @@ const VENDORS_LIST = [

		# Set of custom feature tags supported by the plugin
		const EYE_GAZE_INTERACTION_FEATURE = "XR_EXT_eye_gaze_interaction"

		const OPENXR_MODE_VALUE = 1