From b26623861feb2d7c049003b7db1b40cd3067ba87 Mon Sep 17 00:00:00 2001 From: amwatson Date: Wed, 17 Jan 2024 16:22:37 -0600 Subject: [PATCH] [vr] updated all VR files to say GPLv3, for clarity. All other files are still subject to v3 due to the "or later" suffix --- src/android/app/src/main/jni/vr/OpenXR.cpp | 2 +- src/android/app/src/main/jni/vr/OpenXR.h | 2 +- src/android/app/src/main/jni/vr/Swapchain.h | 2 +- src/android/app/src/main/jni/vr/XrController.cpp | 2 +- src/android/app/src/main/jni/vr/XrController.h | 2 +- src/android/app/src/main/jni/vr/gl/Egl.cpp | 2 +- src/android/app/src/main/jni/vr/gl/Egl.h | 2 +- src/android/app/src/main/jni/vr/layers/CursorLayer.cpp | 2 +- src/android/app/src/main/jni/vr/layers/CursorLayer.h | 2 +- src/android/app/src/main/jni/vr/layers/GameSurfaceLayer.cpp | 2 +- src/android/app/src/main/jni/vr/layers/GameSurfaceLayer.h | 2 +- src/android/app/src/main/jni/vr/layers/PassthroughLayer.cpp | 2 +- src/android/app/src/main/jni/vr/layers/PassthroughLayer.h | 2 +- src/android/app/src/main/jni/vr/main_helper.h | 2 +- src/android/app/src/main/jni/vr/utils/Common.h | 2 +- src/android/app/src/main/jni/vr/utils/JniUtils.cpp | 2 +- src/android/app/src/main/jni/vr/utils/JniUtils.h | 2 +- src/android/app/src/main/jni/vr/utils/LogUtils.h | 2 +- src/android/app/src/main/jni/vr/utils/SyspropUtils.h | 2 +- src/android/app/src/main/jni/vr/utils/XrMath.h | 2 +- src/android/app/src/main/jni/vr/vr_main.cpp | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/android/app/src/main/jni/vr/OpenXR.cpp b/src/android/app/src/main/jni/vr/OpenXR.cpp index 89860c0fe..97cbe58fc 100644 --- a/src/android/app/src/main/jni/vr/OpenXR.cpp +++ b/src/android/app/src/main/jni/vr/OpenXR.cpp @@ -5,7 +5,7 @@ Filename : OpenXR.cpp Content : OpenXR initialization and shutdown code. Authors : Amanda M. Watson -License : Licensed under GPLv2 or any later version. +License : Licensed under GPLv3 or any later version. Refer to the license.txt file included. *******************************************************************************/ diff --git a/src/android/app/src/main/jni/vr/OpenXR.h b/src/android/app/src/main/jni/vr/OpenXR.h index 1ab91f7ff..400331acc 100644 --- a/src/android/app/src/main/jni/vr/OpenXR.h +++ b/src/android/app/src/main/jni/vr/OpenXR.h @@ -5,7 +5,7 @@ Filename : OpenXR.h Content : OpenXR initialization and shutdown code. Authors : Amanda M. Watson -License : Licensed under GPLv2 or any later version. +License : Licensed under GPLv3 or any later version. Refer to the license.txt file included. *******************************************************************************/ diff --git a/src/android/app/src/main/jni/vr/Swapchain.h b/src/android/app/src/main/jni/vr/Swapchain.h index fbced025b..c7d52f2e5 100644 --- a/src/android/app/src/main/jni/vr/Swapchain.h +++ b/src/android/app/src/main/jni/vr/Swapchain.h @@ -5,7 +5,7 @@ Filename : Swapchain.h Content : A Swapchain. Authors : Amanda M. Watson -License : Licensed under GPLv2 or any later version. +License : Licensed under GPLv3 or any later version. Refer to the license.txt file included. *******************************************************************************/ diff --git a/src/android/app/src/main/jni/vr/XrController.cpp b/src/android/app/src/main/jni/vr/XrController.cpp index 715936aa6..c04b69d82 100644 --- a/src/android/app/src/main/jni/vr/XrController.cpp +++ b/src/android/app/src/main/jni/vr/XrController.cpp @@ -4,7 +4,7 @@ Filename : XrController.cpp Content : XR-specific input handling. Authors : Amanda M. Watson -License : Licensed under GPLv2 or any later version. +License : Licensed under GPLv3 or any later version. Refer to the license.txt file included. *******************************************************************************/ diff --git a/src/android/app/src/main/jni/vr/XrController.h b/src/android/app/src/main/jni/vr/XrController.h index 692b1d903..4e5f5e6a8 100644 --- a/src/android/app/src/main/jni/vr/XrController.h +++ b/src/android/app/src/main/jni/vr/XrController.h @@ -6,7 +6,7 @@ Content : XR-specific input handling. Specifically defines the XR tracked controllers and their input states, not gamepad. Authors : Amanda M. Watson -License : Licensed under GPLv2 or any later version. +License : Licensed under GPLv3 or any later version. Refer to the license.txt file included. *******************************************************************************/ diff --git a/src/android/app/src/main/jni/vr/gl/Egl.cpp b/src/android/app/src/main/jni/vr/gl/Egl.cpp index 9c9cd75dc..6bafecb2d 100644 --- a/src/android/app/src/main/jni/vr/gl/Egl.cpp +++ b/src/android/app/src/main/jni/vr/gl/Egl.cpp @@ -4,7 +4,7 @@ Filename : Egl.cpp Authors : Amanda M. Watson -License : Licensed under GPLv2 or any later version. +License : Licensed under GPLv3 or any later version. Refer to the license.txt file included. *******************************************************************************/ diff --git a/src/android/app/src/main/jni/vr/gl/Egl.h b/src/android/app/src/main/jni/vr/gl/Egl.h index 47f63acbb..b08f302b3 100644 --- a/src/android/app/src/main/jni/vr/gl/Egl.h +++ b/src/android/app/src/main/jni/vr/gl/Egl.h @@ -4,7 +4,7 @@ Filename : Egl.h Authors : Amanda M. Watson -License : Licensed under GPLv2 or any later version. +License : Licensed under GPLv3 or any later version. Refer to the license.txt file included. *******************************************************************************/ diff --git a/src/android/app/src/main/jni/vr/layers/CursorLayer.cpp b/src/android/app/src/main/jni/vr/layers/CursorLayer.cpp index eb2a4b6c6..7a3109b89 100644 --- a/src/android/app/src/main/jni/vr/layers/CursorLayer.cpp +++ b/src/android/app/src/main/jni/vr/layers/CursorLayer.cpp @@ -3,7 +3,7 @@ Filename : CursorLayer.cpp Content : Renders a cursor Authors : Amanda M. Watson -License : Licensed under GPLv2 or any later version. +License : Licensed under GPLv3 or any later version. Refer to the license.txt file included. *******************************************************************************/ diff --git a/src/android/app/src/main/jni/vr/layers/CursorLayer.h b/src/android/app/src/main/jni/vr/layers/CursorLayer.h index 931b412e9..e062a75c5 100644 --- a/src/android/app/src/main/jni/vr/layers/CursorLayer.h +++ b/src/android/app/src/main/jni/vr/layers/CursorLayer.h @@ -3,7 +3,7 @@ Filename : CursorLayer.h Content : Renders a cursor Authors : Amanda M. Watson -License : Licensed under GPLv2 or any later version. +License : Licensed under GPLv3 or any later version. Refer to the license.txt file included. *******************************************************************************/ diff --git a/src/android/app/src/main/jni/vr/layers/GameSurfaceLayer.cpp b/src/android/app/src/main/jni/vr/layers/GameSurfaceLayer.cpp index 033db5743..9c5eacba2 100644 --- a/src/android/app/src/main/jni/vr/layers/GameSurfaceLayer.cpp +++ b/src/android/app/src/main/jni/vr/layers/GameSurfaceLayer.cpp @@ -7,7 +7,7 @@ Content : Handles the projection of the "Game Surface" panels into XR. panel (mono touchpad). Authors : Amanda M. Watson -License : Licensed under GPLv2 or any later version. +License : Licensed under GPLv3 or any later version. Refer to the license.txt file included. *******************************************************************************/ diff --git a/src/android/app/src/main/jni/vr/layers/GameSurfaceLayer.h b/src/android/app/src/main/jni/vr/layers/GameSurfaceLayer.h index 0a6df4a96..b20464a04 100644 --- a/src/android/app/src/main/jni/vr/layers/GameSurfaceLayer.h +++ b/src/android/app/src/main/jni/vr/layers/GameSurfaceLayer.h @@ -46,7 +46,7 @@ Content : Handles the projection of the "Game Surface" panels into XR. except at the highest stereo depths. Authors : Amanda M. Watson -License : Licensed under GPLv2 or any later version. +License : Licensed under GPLv3 or any later version. Refer to the license.txt file included. *******************************************************************************/ diff --git a/src/android/app/src/main/jni/vr/layers/PassthroughLayer.cpp b/src/android/app/src/main/jni/vr/layers/PassthroughLayer.cpp index 0d430f6b3..2a9cdb39c 100644 --- a/src/android/app/src/main/jni/vr/layers/PassthroughLayer.cpp +++ b/src/android/app/src/main/jni/vr/layers/PassthroughLayer.cpp @@ -2,7 +2,7 @@ Filename : PassthroughLayer.cpp Authors : Amanda M. Watson -License : Licensed under GPLv2 or any later version. +License : Licensed under GPLv3 or any later version. Refer to the license.txt file included. *******************************************************************************/ diff --git a/src/android/app/src/main/jni/vr/layers/PassthroughLayer.h b/src/android/app/src/main/jni/vr/layers/PassthroughLayer.h index 95006a3dc..7e10f0afd 100644 --- a/src/android/app/src/main/jni/vr/layers/PassthroughLayer.h +++ b/src/android/app/src/main/jni/vr/layers/PassthroughLayer.h @@ -2,7 +2,7 @@ Filename : PassthroughLayer.h Authors : Amanda M. Watson -License : Licensed under GPLv2 or any later version. +License : Licensed under GPLv3 or any later version. Refer to the license.txt file included. *******************************************************************************/ diff --git a/src/android/app/src/main/jni/vr/main_helper.h b/src/android/app/src/main/jni/vr/main_helper.h index eb93d49cc..8c1f15ca4 100644 --- a/src/android/app/src/main/jni/vr/main_helper.h +++ b/src/android/app/src/main/jni/vr/main_helper.h @@ -5,7 +5,7 @@ Filename : main_helper.h Content : Used by other parts of the project to set the high-pri TID. Authors : Amanda M. Watson -License : Licensed under GPLv2 or any later version. +License : Licensed under GPLv3 or any later version. Refer to the license.txt file included. *******************************************************************************/ diff --git a/src/android/app/src/main/jni/vr/utils/Common.h b/src/android/app/src/main/jni/vr/utils/Common.h index 8f5211d5d..4fbcfe8c5 100644 --- a/src/android/app/src/main/jni/vr/utils/Common.h +++ b/src/android/app/src/main/jni/vr/utils/Common.h @@ -5,7 +5,7 @@ Filename : Common.h Content : Common utilities Authors : Amanda M. Watson -License : Licensed under GPLv2 or any later version. +License : Licensed under GPLv3 or any later version. Refer to the license.txt file included. *******************************************************************************/ diff --git a/src/android/app/src/main/jni/vr/utils/JniUtils.cpp b/src/android/app/src/main/jni/vr/utils/JniUtils.cpp index 562ae0609..6ac7db87e 100644 --- a/src/android/app/src/main/jni/vr/utils/JniUtils.cpp +++ b/src/android/app/src/main/jni/vr/utils/JniUtils.cpp @@ -5,7 +5,7 @@ Content : Lightweight lib for JNI. Authors : Amanda M. Watson -License : Licensed under GPLv2 or any later version. +License : Licensed under GPLv3 or any later version. Refer to the license.txt file included. *******************************************************************************/ diff --git a/src/android/app/src/main/jni/vr/utils/JniUtils.h b/src/android/app/src/main/jni/vr/utils/JniUtils.h index f8985ffc6..511044c13 100644 --- a/src/android/app/src/main/jni/vr/utils/JniUtils.h +++ b/src/android/app/src/main/jni/vr/utils/JniUtils.h @@ -11,7 +11,7 @@ said, this app is pretty simple, hoping I avoided any leaks. Authors : Amanda M. Watson -License : Licensed under GPLv2 or any later version. +License : Licensed under GPLv3 or any later version. Refer to the license.txt file included. *******************************************************************************/ diff --git a/src/android/app/src/main/jni/vr/utils/LogUtils.h b/src/android/app/src/main/jni/vr/utils/LogUtils.h index 182e44287..a35b0b1ce 100644 --- a/src/android/app/src/main/jni/vr/utils/LogUtils.h +++ b/src/android/app/src/main/jni/vr/utils/LogUtils.h @@ -5,7 +5,7 @@ Filename : LogUtils.h Content : Logging macros I define in every project Authors : Amanda M. Watson -License : Licensed under GPLv2 or any later version. +License : Licensed under GPLv3 or any later version. Refer to the license.txt file included. *******************************************************************************/ diff --git a/src/android/app/src/main/jni/vr/utils/SyspropUtils.h b/src/android/app/src/main/jni/vr/utils/SyspropUtils.h index 753db29ed..6bdb51fa0 100644 --- a/src/android/app/src/main/jni/vr/utils/SyspropUtils.h +++ b/src/android/app/src/main/jni/vr/utils/SyspropUtils.h @@ -5,7 +5,7 @@ Filename : SyspropUtils.h Content : Utility functions for accessing system properties Authors : Amanda M. Watson -License : Licensed under GPLv2 or any later version. +License : Licensed under GPLv3 or any later version. Refer to the license.txt file included. *******************************************************************************/ diff --git a/src/android/app/src/main/jni/vr/utils/XrMath.h b/src/android/app/src/main/jni/vr/utils/XrMath.h index 3cc1a22d6..dbfd0fc85 100644 --- a/src/android/app/src/main/jni/vr/utils/XrMath.h +++ b/src/android/app/src/main/jni/vr/utils/XrMath.h @@ -3,7 +3,7 @@ Filename : XrMath.h Content : Lightweight 3D math library for OpenXR. Authors : Amanda M. Watson -License : Licensed under GPLv2 or any later version. +License : Licensed under GPLv3 or any later version. Refer to the license.txt file included. *******************************************************************************/ diff --git a/src/android/app/src/main/jni/vr/vr_main.cpp b/src/android/app/src/main/jni/vr/vr_main.cpp index 69d9e1af3..a58ee846d 100644 --- a/src/android/app/src/main/jni/vr/vr_main.cpp +++ b/src/android/app/src/main/jni/vr/vr_main.cpp @@ -5,7 +5,7 @@ Content : VR entrypoint for Android. Called from onCreate to iniitalize the "VrApp" thread, which handles OpenXR and XR-specific rendering. Authors : Amanda M. Watson -License : Licensed under GPLv2 or any later version. +License : Licensed under GPLv3 or any later version. Refer to the license.txt file included. *******************************************************************************/