Move all thirdparty libraries into a thirdparty folder

.github/workflows/build-on-push.yml

@@ -70,13 +70,13 @@ jobs:
 
       - name: Run the build for godot-cpp (Linux)
         run: |
-          cd $GITHUB_WORKSPACE/godot-cpp
+          cd $GITHUB_WORKSPACE/thirdparty/godot-cpp
           scons platform=${{ matrix.platform }} -j2 target=release generate_bindings=yes bits=64
         if: matrix.platform == 'linux'
 
       - name: Run the build for godot-cpp (Windows)
         run: |
-          cd ${env:GITHUB_WORKSPACE}\godot-cpp
+          cd ${env:GITHUB_WORKSPACE}\thirdparty\godot-cpp
           scons platform=${{ matrix.platform }} -j2 target=release generate_bindings=yes bits=64
         if: matrix.platform == 'windows'
 
@@ -95,8 +95,8 @@ jobs:
       # for android, run generate bindings python script
       - name: Generate bindings (Android)
         run: |
-          cd $GITHUB_WORKSPACE/godot-cpp
-          python ../android/generate.py
+          cd $GITHUB_WORKSPACE/thirdparty/godot-cpp
+          python ../../android/generate.py
         if: matrix.platform == 'android'
 
       # then run gradlew to build aar
@@ -125,7 +125,7 @@ jobs:
           name: build-files-windows
           path: |
             demo/addons/godot-openxr/bin/win64/libgodot_openxr.dll
-            openxr_loader/1.0.18/x64/bin/openxr_loader.dll
+            thirdparty/openxr_loader/x64/bin/openxr_loader.dll
         if: matrix.platform == 'windows'
 
       # for android, copy aar
@@ -160,7 +160,7 @@ jobs:
           cp -r godot_openxr/demo/addons/godot-openxr godot_openxr_plugin/addons
           cp build-files-linux/libgodot_openxr.so godot_openxr_plugin/addons/godot-openxr/bin/linux/libgodot_openxr.so
           cp build-files-windows/demo/addons/godot-openxr/bin/win64/libgodot_openxr.dll godot_openxr_plugin/addons/godot-openxr/bin/win64/libgodot_openxr.dll
-          cp build-files-windows/openxr_loader/1.0.18/x64/bin/openxr_loader.dll godot_openxr_plugin/addons/godot-openxr/bin/win64/openxr_loader.dll
+          cp build-files-windows/thirdparty/openxr_loader/x64/bin/openxr_loader.dll godot_openxr_plugin/addons/godot-openxr/bin/win64/openxr_loader.dll
           cp build-files-android/sharedLibs/release/arm64-v8a/* godot_openxr_plugin/addons/godot-openxr/bin/android/
           # cp build-files-android/outputs/aar/*.aar godot_openxr_plugin/addons/godot-openxr/bin/android/
           # cp godot_openxr/android/godot_openxr.gdap godot_openxr_plugin/addons/godot-openxr/bin/android/godot_openxr.gdap

.github/workflows/scripts/clang_format.sh

@@ -12,14 +12,12 @@ CLANG_FORMAT_FILE_EXTS=(".c" ".h" ".cpp" ".hpp" ".cc" ".hh" ".cxx" ".m" ".mm" ".
 git grep -zIl '' |
 while IFS= read -rd '' f; do
     # Exclude 3rd party files.
-    if [[ "$f" == "glad"* ]]; then
+    if [[ "$f" == "thirdparty"* ]]; then
         continue
     elif [[ "$f" == "godot-cpp"* ]]; then
         continue
     elif [[ "$f" == "demo/addons/godot-xr-tools"* ]]; then
         continue
-    elif [[ "$f" == "openxr_loader"* ]]; then
-        continue
     elif [[ "$f" == "gradle"* ]]; then
         continue
     elif [[ "$f" == "build"* ]]; then

.github/workflows/scripts/file_format.sh

@@ -15,14 +15,12 @@ IFS=$'\n\t'
 git grep -zIl '' |
 while IFS= read -rd '' f; do
     # Exclude 3rd party files
-    if [[ "$f" == "glad"* ]]; then
+    if [[ "$f" == "thirdparty"* ]]; then
         continue
     elif [[ "$f" == "godot-cpp"* ]]; then
         continue
     elif [[ "$f" == "demo/addons/godot-xr-tools"* ]]; then
         continue
-    elif [[ "$f" == "openxr_loader"* ]]; then
-        continue
     elif [[ "$f" == "gradle"* ]]; then
         continue
     elif [[ "$f" == "build"* ]]; then

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "godot-cpp"]
-	path = godot-cpp
+[submodule "thirdparty/godot-cpp"]
+	path = thirdparty/godot-cpp
 	url = https://github.com/godotengine/godot-cpp

README.md

@@ -29,9 +29,9 @@ This will also include the `godot-headers` submodule.
 
 This submodule needs to be compiled with the following
 ```
-cd godot-cpp
+cd thirdparty/godot-cpp
 scons platform=<platform> target=release generate_bindings=yes
-cd ..
+cd ../..
 ```
 Replace `<platform>` with `linux` or `windows` depending on your platform.
 

SConstruct

@@ -23,7 +23,7 @@ opts.AddVariables(
     PathVariable('target_path', 'The path where the lib is installed.', 'demo/addons/godot-openxr/bin/'),
     PathVariable('target_name', 'The library name.', 'libgodot_openxr', PathVariable.PathAccept),
 )
-opts.Add(PathVariable('openxr_loader_path', 'The path where our openxr loader is located.', 'openxr_loader/1.0.18/'))
+opts.Add(PathVariable('openxr_loader_path', 'The path where our openxr loader is located.', 'thirdparty/openxr_loader/'))
 opts.Add(BoolVariable('use_llvm', "Use the LLVM / Clang compiler", 'no'))
 if cdb_supported:
     opts.Add(BoolVariable('generate_cdb', 'Generate compile_commands.json', 'no'))
@@ -32,9 +32,9 @@ if cdb_supported:
 opts.Update(env)
 
 # Other needed paths
-godot_glad_path = "glad/"
-godot_headers_path = "godot-cpp/godot-headers/"
-godot_cpp_path = "godot-cpp/"
+godot_glad_path = "thirdparty/glad/"
+godot_headers_path = "thirdparty/godot-cpp/godot-headers/"
+godot_cpp_path = "thirdparty/godot-cpp/"
 godot_cpp_library = "libgodot-cpp"
 target_path = env['target_path']
 

android/src/main/cpp/CMakeLists.txt

@@ -54,16 +54,16 @@ project(godot_openxr VERSION 2.0.0)
 ## in the project README.
 
 # Sets the path to the OpenXR mobile library containing directory. Update this variable if the api is in another location.
-set(OPENXR_MOBILE_ROOT_DIR "${CMAKE_SOURCE_DIR}/../openxr_loader/oculus_mobile_sdk/33.0.0/OpenXR")
+set(OPENXR_MOBILE_ROOT_DIR "${CMAKE_SOURCE_DIR}/../thirdparty/oculus_mobile_sdk/OpenXR")
 
 # Location to the Godot-cpp directory.
-set(GODOT_CPP_DIR "${CMAKE_SOURCE_DIR}/../godot-cpp")
+set(GODOT_CPP_DIR "${CMAKE_SOURCE_DIR}/../thirdparty/godot-cpp")
 set(GODOT_HEADERS_DIR "${GODOT_CPP_DIR}/godot-headers")
 ###############################################################################
 
 add_definitions(-DANDROID)
 
-set(OPENXR_HEADERS_DIR "${CMAKE_SOURCE_DIR}/../openxr_loader/1.0.18/include")
+set(OPENXR_HEADERS_DIR "${CMAKE_SOURCE_DIR}/../thirdparty/openxr_loader/include")
 set(OPENXR_MOBILE_HEADERS_DIR "${OPENXR_MOBILE_ROOT_DIR}/Include" CACHE STRING "")
 
 set(GODOT_COMPILE_FLAGS)

demo/addons/godot-openxr/CHANGES.md

@@ -1,6 +1,10 @@
 Changes to the Godot OpenXR asset
 =================================
 
+1.1.1
+-------------------
+- Organised all third party resources into a thirdparty folder for easy maintenance.
+
 1.1.0
 -------------------
 - Implemented Android build (currently using Oculus loader, Quest support only)

thirdparty/README.md

@@ -0,0 +1,29 @@
+# Third party libraries
+
+This folder contains all third party libraries we use. These have separate licenses associated with them.
+
+## Glad 
+
+GLAD is an OpenGL loader library
+
+- Upstream: https://github.com/Dav1dde/glad
+- Version: 0.1.33
+- License: MIT
+
+## Godot-cpp
+
+## Oculus Mobile SDK
+
+This is a copy of the Oculus OpenXR mobile SDK downloaded from [here](https://developer.oculus.com/downloads/package/oculus-openxr-mobile-sdk).
+
+- Upstream: https://developer.oculus.com/downloads/package/oculus-openxr-mobile-sdk
+- Version: 33.0.0
+- License: https://developer.oculus.com/licenses/oculussdk/
+
+## OpenXR loader 1.0.18
+
+This is a copy of the Khronos OpenXR loader library for Windows. We use the include files for all platforms.
+
+- Upstream: https://github.com/KhronosGroup/OpenXR-SDK/releases
+- Version 1.0.18
+- License: Apache 2.0 or MIT