Skip to content

Commit

Permalink
Update NDK to r26 and reformat files
Browse files Browse the repository at this point in the history
  • Loading branch information
fmayer authored and DanAlbert committed Jan 10, 2024
1 parent be6b6b0 commit f50ef3c
Show file tree
Hide file tree
Showing 25 changed files with 63 additions and 67 deletions.
4 changes: 1 addition & 3 deletions camera/basic/src/main/cpp/camera_engine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,7 @@ CameraEngine::~CameraEngine() {
DeleteCamera();
}

struct android_app* CameraEngine::AndroidApp(void) const {
return app_;
}
struct android_app* CameraEngine::AndroidApp(void) const { return app_; }

/**
* Create a camera object for onboard BACK_FACING camera
Expand Down
2 changes: 1 addition & 1 deletion endless-tunnel/app/src/main/cpp/ascii_to_geom.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "ascii_to_geom.hpp"

#define GEOM_DEBUG LOGD
//#define GEOM_DEBUG
// #define GEOM_DEBUG

SimpleGeom *AsciiArtToGeom(const char *art, float scale) {
// figure out width and height
Expand Down
24 changes: 12 additions & 12 deletions endless-tunnel/app/src/main/cpp/glm/detail/setup.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
#define GLM_PLATFORM_WINDOWS 0x00010000
#define GLM_PLATFORM_LINUX 0x00020000
#define GLM_PLATFORM_APPLE 0x00040000
//#define GLM_PLATFORM_IOS 0x00080000
// #define GLM_PLATFORM_IOS 0x00080000
#define GLM_PLATFORM_ANDROID 0x00100000
#define GLM_PLATFORM_CHROME_NACL 0x00200000
#define GLM_PLATFORM_UNIX 0x00400000
Expand Down Expand Up @@ -81,8 +81,8 @@
#define GLM_MESSAGE_PLATFORM_DISPLAYED
#if (GLM_PLATFORM & GLM_PLATFORM_QNXNTO)
#pragma message("GLM: QNX platform detected")
//# elif(GLM_PLATFORM & GLM_PLATFORM_IOS)
//# pragma message("GLM: iOS platform detected")
// # elif(GLM_PLATFORM & GLM_PLATFORM_IOS)
// # pragma message("GLM: iOS platform detected")
#elif (GLM_PLATFORM & GLM_PLATFORM_APPLE)
#pragma message("GLM: Apple platform detected")
#elif (GLM_PLATFORM & GLM_PLATFORM_WINCE)
Expand Down Expand Up @@ -484,7 +484,7 @@
#pragma message("GLM: C++ language undetected")
#endif // GLM_MODEL
#pragma message( \
"GLM: #define GLM_FORCE_CXX98, GLM_FORCE_CXX03, GLM_LANG_CXX11 or GLM_FORCE_CXX1Y to force using a specific version of the C++ language")
"GLM: #define GLM_FORCE_CXX98, GLM_FORCE_CXX03, GLM_LANG_CXX11 or GLM_FORCE_CXX1Y to force using a specific version of the C++ language")
#endif // GLM_MESSAGE

///////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -616,7 +616,7 @@
#include <intrin.h>
#endif

//#if(GLM_ARCH != GLM_ARCH_PURE)
// #if(GLM_ARCH != GLM_ARCH_PURE)
#if (GLM_ARCH & GLM_ARCH_AVX2)
#include <immintrin.h>
#endif // GLM_ARCH
Expand Down Expand Up @@ -668,7 +668,7 @@ inline __m128 _mm_castsi128_ps(__m128i PI) {
}
#endif
#endif // GLM_ARCH
//#endif//(GLM_ARCH != GLM_ARCH_PURE)
// #endif//(GLM_ARCH != GLM_ARCH_PURE)

#if (defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_ARCH_DISPLAYED))
#define GLM_MESSAGE_ARCH_DISPLAYED
Expand All @@ -686,13 +686,13 @@ inline __m128 _mm_castsi128_ps(__m128i PI) {
#pragma message("GLM: AVX2 instruction set")
#endif // GLM_ARCH
#pragma message( \
"GLM: #define GLM_FORCE_PURE to avoid using platform specific instruction sets")
"GLM: #define GLM_FORCE_PURE to avoid using platform specific instruction sets")
#endif // GLM_MESSAGE

///////////////////////////////////////////////////////////////////////////////////////////////////
// Radians

//#define GLM_FORCE_RADIANS
// #define GLM_FORCE_RADIANS

///////////////////////////////////////////////////////////////////////////////////////////////////
// Static assert
Expand Down Expand Up @@ -757,7 +757,7 @@ inline __m128 _mm_castsi128_ps(__m128i PI) {
#pragma message("GLM: Swizzling operators enabled")
#else
#pragma message( \
"GLM: Swizzling operators disabled, #define GLM_SWIZZLE to enable swizzle operators")
"GLM: Swizzling operators disabled, #define GLM_SWIZZLE to enable swizzle operators")
#endif
#endif // GLM_MESSAGE

Expand All @@ -778,12 +778,12 @@ typedef int length_t;
#define GLM_MESSAGE_FORCE_SIZE_T_LENGTH
#if defined(GLM_FORCE_SIZE_T_LENGTH)
#pragma message( \
"GLM: .length() returns glm::length_t, a typedef of std::size_t")
"GLM: .length() returns glm::length_t, a typedef of std::size_t")
#else
#pragma message( \
"GLM: .length() returns glm::length_t, a typedef of int following the GLSL specification")
"GLM: .length() returns glm::length_t, a typedef of int following the GLSL specification")
#pragma message( \
"GLM: #define GLM_FORCE_SIZE_T_LENGTH for .length() to return a std::size_t")
"GLM: #define GLM_FORCE_SIZE_T_LENGTH for .length() to return a std::size_t")
#endif
#endif // GLM_MESSAGE

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,6 @@ bool genType<VALTYPE, TYPE>::is_vector() {
} // namespace detail
} // namespace glm

//#include "type_gentype.inl"
// #include "type_gentype.inl"

#endif // glm_core_type_gentype
2 changes: 1 addition & 1 deletion endless-tunnel/app/src/main/cpp/glm/detail/type_vec2.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#ifndef glm_core_type_gentype2
#define glm_core_type_gentype2

//#include "../fwd.hpp"
// #include "../fwd.hpp"
#include "type_vec.hpp"
#ifdef GLM_SWIZZLE
#if GLM_HAS_ANONYMOUS_UNION
Expand Down
2 changes: 1 addition & 1 deletion endless-tunnel/app/src/main/cpp/glm/detail/type_vec3.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#ifndef glm_core_type_gentype3
#define glm_core_type_gentype3

//#include "../fwd.hpp"
// #include "../fwd.hpp"
#include "type_vec.hpp"
#ifdef GLM_SWIZZLE
#if GLM_HAS_ANONYMOUS_UNION
Expand Down
2 changes: 1 addition & 1 deletion endless-tunnel/app/src/main/cpp/glm/detail/type_vec4.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#ifndef glm_core_type_gentype4
#define glm_core_type_gentype4

//#include "../fwd.hpp"
// #include "../fwd.hpp"
#include "setup.hpp"
#include "type_vec.hpp"
#ifdef GLM_SWIZZLE
Expand Down
12 changes: 6 additions & 6 deletions endless-tunnel/app/src/main/cpp/glm/gtc/matrix_transform.inl
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ GLM_FUNC_QUALIFIER detail::tmat4x4<T, P> rotate(detail::tmat4x4<T, P> const& m,
T a = angle;
#else
#pragma message( \
"GLM: rotate function taking degrees as a parameter is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
"GLM: rotate function taking degrees as a parameter is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
T a = radians(angle);
#endif
T c = cos(a);
Expand Down Expand Up @@ -85,7 +85,7 @@ GLM_FUNC_QUALIFIER detail::tmat4x4<T, P> rotate_slow(
T const a = angle;
#else
#pragma message( \
"GLM: rotate_slow function taking degrees as a parameter is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
"GLM: rotate_slow function taking degrees as a parameter is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
T const a = radians(angle);
#endif
T c = cos(a);
Expand Down Expand Up @@ -188,7 +188,7 @@ GLM_FUNC_QUALIFIER detail::tmat4x4<valType, defaultp> perspective(
valType const rad = fovy;
#else
#pragma message( \
"GLM: perspective function taking degrees as a parameter is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
"GLM: perspective function taking degrees as a parameter is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
valType const rad = glm::radians(fovy);
#endif

Expand All @@ -215,7 +215,7 @@ GLM_FUNC_QUALIFIER detail::tmat4x4<valType, defaultp> perspectiveFov(
valType rad = fov;
#else
#pragma message( \
"GLM: perspectiveFov function taking degrees as a parameter is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
"GLM: perspectiveFov function taking degrees as a parameter is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
valType rad = glm::radians(fov);
#endif
valType h = glm::cos(valType(0.5) * rad) / glm::sin(valType(0.5) * rad);
Expand All @@ -239,7 +239,7 @@ GLM_FUNC_QUALIFIER detail::tmat4x4<T, defaultp> infinitePerspective(T fovy,
T const range = tan(fovy / T(2)) * zNear;
#else
#pragma message( \
"GLM: infinitePerspective function taking degrees as a parameter is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
"GLM: infinitePerspective function taking degrees as a parameter is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
T const range = tan(radians(fovy / T(2))) * zNear;
#endif
T left = -range * aspect;
Expand All @@ -263,7 +263,7 @@ GLM_FUNC_QUALIFIER detail::tmat4x4<T, defaultp> tweakedInfinitePerspective(
T range = tan(fovy / T(2)) * zNear;
#else
#pragma message( \
"GLM: tweakedInfinitePerspective function taking degrees as a parameter is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
"GLM: tweakedInfinitePerspective function taking degrees as a parameter is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
T range = tan(radians(fovy / T(2))) * zNear;
#endif
T left = -range * aspect;
Expand Down
12 changes: 6 additions & 6 deletions endless-tunnel/app/src/main/cpp/glm/gtc/quaternion.inl
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ GLM_FUNC_QUALIFIER detail::tquat<T, P> rotate(detail::tquat<T, P> const& q,
T const AngleRad(angle);
#else
#pragma message( \
"GLM: rotate function taking degrees as a parameter is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
"GLM: rotate function taking degrees as a parameter is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
T const AngleRad = radians(angle);
#endif
T const Sin = sin(AngleRad * T(0.5));
Expand All @@ -484,7 +484,7 @@ GLM_FUNC_QUALIFIER T roll(detail::tquat<T, P> const& q) {
q.w * q.w + q.x * q.x - q.y * q.y - q.z * q.z));
#else
#pragma message( \
"GLM: roll function returning degrees is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
"GLM: roll function returning degrees is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
return glm::degrees(atan(T(2) * (q.x * q.y + q.w * q.z),
q.w * q.w + q.x * q.x - q.y * q.y - q.z * q.z));
#endif
Expand All @@ -497,7 +497,7 @@ GLM_FUNC_QUALIFIER T pitch(detail::tquat<T, P> const& q) {
q.w * q.w - q.x * q.x - q.y * q.y + q.z * q.z));
#else
#pragma message( \
"GLM: pitch function returning degrees is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
"GLM: pitch function returning degrees is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
return glm::degrees(atan(T(2) * (q.y * q.z + q.w * q.x),
q.w * q.w - q.x * q.x - q.y * q.y + q.z * q.z));
#endif
Expand All @@ -509,7 +509,7 @@ GLM_FUNC_QUALIFIER T yaw(detail::tquat<T, P> const& q) {
return asin(T(-2) * (q.x * q.z - q.w * q.y));
#else
#pragma message( \
"GLM: yaw function returning degrees is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
"GLM: yaw function returning degrees is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
return glm::degrees(asin(T(-2) * (q.x * q.z - q.w * q.y)));
#endif
}
Expand Down Expand Up @@ -621,7 +621,7 @@ GLM_FUNC_QUALIFIER T angle(detail::tquat<T, P> const& x) {
return acos(x.w) * T(2);
#else
#pragma message( \
"GLM: angle function returning degrees is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
"GLM: angle function returning degrees is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
return glm::degrees(acos(x.w) * T(2));
#endif
}
Expand All @@ -643,7 +643,7 @@ GLM_FUNC_QUALIFIER detail::tquat<T, P> angleAxis(T const& angle,
T const a(angle);
#else
#pragma message( \
"GLM: angleAxis function taking degrees as a parameter is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
"GLM: angleAxis function taking degrees as a parameter is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
T const a(glm::radians(angle));
#endif
T s = glm::sin(a * T(0.5));
Expand Down
2 changes: 1 addition & 1 deletion endless-tunnel/app/src/main/cpp/glm/gtx/constants.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

#if (defined(GLM_MESSAGES))
#pragma message( \
"GLM: GLM_GTX_constants extension is deprecated, include GLM_GTC_constants (glm/gtc/constants.hpp) instead")
"GLM: GLM_GTX_constants extension is deprecated, include GLM_GTC_constants (glm/gtc/constants.hpp) instead")
#endif

#endif // GLM_GTX_constants
2 changes: 1 addition & 1 deletion endless-tunnel/app/src/main/cpp/glm/gtx/epsilon.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#if (defined(GLM_MESSAGES))
#pragma message( \
"GLM: GLM_GTX_epsilon extension is deprecated, include GLM_GTC_epsilon (glm/gtc/epsilon) instead")
"GLM: GLM_GTX_epsilon extension is deprecated, include GLM_GTC_epsilon (glm/gtc/epsilon) instead")
#endif

// Promoted:
Expand Down
2 changes: 1 addition & 1 deletion endless-tunnel/app/src/main/cpp/glm/gtx/int_10_10_10_2.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

#if (defined(GLM_MESSAGES))
#pragma message( \
"GLM: GLM_GTX_int_10_10_10_2 extension is deprecated, include GLM_GTC_packing (glm/gtc/packing.hpp) instead")
"GLM: GLM_GTX_int_10_10_10_2 extension is deprecated, include GLM_GTC_packing (glm/gtc/packing.hpp) instead")
#endif

namespace glm {
Expand Down
2 changes: 1 addition & 1 deletion endless-tunnel/app/src/main/cpp/glm/gtx/noise.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#if (defined(GLM_MESSAGES))
#pragma message( \
"GLM: GLM_GTX_random extension is deprecated, include GLM_GTC_random (glm/gtc/noise.hpp) instead")
"GLM: GLM_GTX_random extension is deprecated, include GLM_GTC_random (glm/gtc/noise.hpp) instead")
#endif

// Promoted:
Expand Down
4 changes: 2 additions & 2 deletions endless-tunnel/app/src/main/cpp/glm/gtx/polar_coordinates.inl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ GLM_FUNC_QUALIFIER detail::tvec3<T, P> polar(
xz_dist); // xz distance
#else
#pragma message( \
"GLM: polar function returning degrees is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
"GLM: polar function returning degrees is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
return detail::tvec3<T, P>(degrees(atan(xz_dist, tmp.y)), // latitude
degrees(atan(tmp.x, tmp.z)), // longitude
xz_dist); // xz distance
Expand All @@ -36,7 +36,7 @@ GLM_FUNC_QUALIFIER detail::tvec3<T, P> euclidean(
T const longitude(polar.y);
#else
#pragma message( \
"GLM: euclidean function taking degrees as parameters is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
"GLM: euclidean function taking degrees as parameters is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
T const latitude(radians(polar.x));
T const longitude(radians(polar.y));
#endif
Expand Down
2 changes: 1 addition & 1 deletion endless-tunnel/app/src/main/cpp/glm/gtx/random.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#if (defined(GLM_MESSAGES))
#pragma message( \
"GLM: GLM_GTX_random extension is deprecated, include GLM_GTC_random instead")
"GLM: GLM_GTX_random extension is deprecated, include GLM_GTC_random instead")
#endif

// Promoted:
Expand Down
2 changes: 1 addition & 1 deletion endless-tunnel/app/src/main/cpp/glm/gtx/reciprocal.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@

#if (defined(GLM_MESSAGES))
#pragma message( \
"GLM: GLM_GTX_reciprocal extension is deprecated, include GLM_GTC_reciprocal instead")
"GLM: GLM_GTX_reciprocal extension is deprecated, include GLM_GTC_reciprocal instead")
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ GLM_FUNC_QUALIFIER detail::tmat4x4<T, P> rotateNormalizedAxis(
T a = angle;
#else
#pragma message( \
"GLM: rotateNormalizedAxis function taking degrees as parameters is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
"GLM: rotateNormalizedAxis function taking degrees as parameters is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
T a = radians(angle);
#endif
T c = cos(a);
Expand Down Expand Up @@ -76,7 +76,7 @@ GLM_FUNC_QUALIFIER detail::tquat<T, P> rotateNormalizedAxis(
T const AngleRad(angle);
#else
#pragma message( \
"GLM: rotateNormalizedAxis function taking degrees as parameters is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
"GLM: rotateNormalizedAxis function taking degrees as parameters is deprecated. #define GLM_FORCE_RADIANS before including GLM headers to remove this message.")
T const AngleRad = radians(angle);
#endif
T const Sin = sin(AngleRad * T(0.5));
Expand Down
Loading

0 comments on commit f50ef3c

Please sign in to comment.