Merge branch 'OGRECave:master' into patch-3

OGRECave · Apr 29, 2024 · 7c94a95 · 7c94a95
2 parents 59a2fdf + 2ca9dc9
commit 7c94a95
Show file tree

Hide file tree

Showing 238 changed files with 8,992 additions and 3,155 deletions.
diff --git a/.github/workflows/linux.build.yml b/.github/workflows/linux.build.yml
@@ -1,4 +1,4 @@
-name: CI
+name: Linux CI
 
 # Controls when the action will run.
 on:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,21 +1,12 @@
-name: CI
+name: Doxygen
 
 # Controls when the action will run.
 on:
   push:
     branches:  'master'
 
-  # Run for all pull requests
-  pull_request:
-    branches: '*'
-    types: [opened]
-
 env:
-  CMAKE_DOXYGEN_INPUT_LIST: "Components Docs/src OgreMain PlugIns RenderSystems"
-  OGRE_SOURCE_DIR: "./"
-  OGRE_BINARY_DIR: "./"
   OGRE_VERSION: "latest"
-  DOXYGEN_HTML_OUTPUT_DIR: "./latest"
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -24,27 +15,13 @@ jobs:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      - uses: actions/checkout@v3
-
-      - name: Generate Doxyfile
-        # Replace CMake's ${ENV_VAR} to Doxygen's $(ENV_VAR) syntax
-        run: cat CMake/Templates/html.cfg.in | sed 's/\${\(.*\)}/$(\1)/' > Doxyfile
-
-      - name: Generate docs with doxygen
-        uses: mattnotmitt/doxygen-action@v1
+      - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
         with:
-          doxyfile-path: './Doxyfile'
+          ref: gh-pages
+          path: gh-pages
 
-      - name: Remove files
-        working-directory: .github/workflows/
-        run: python3 doxygen_remove_files.py
-
-      - name: Publish # Only on master branch
-        if: github.ref == 'refs/heads/master'
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./
-          keep_files: true
+      - name: Build Doxygen
+        working-directory: ./
+        run: ./Scripts/BuildScripts/build_ci_doxygen.sh
diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake
@@ -154,6 +154,11 @@ if(WIN32)
 	macro_log_feature(AMDAGS_FOUND "AMDAGS" "Use AMD GPU Services library to provide D3D vendor extensions" "https://gpuopen.com/gaming-product/amd-gpu-services-ags-library/" FALSE "" "")
 endif()
 
+if(ANDROID)
+	find_package(AndroidSwappy)
+	macro_log_feature(AndroidSwappy_FOUND "Android Swappy" "Frame Pacing Library (Swappy) for Android" "https://developer.android.com/games/sdk/frame-pacing" FALSE "" "")
+endif()
+
 find_package(OpenVR)
 macro_log_feature(OpenVR_FOUND "OpenVR" "OpenVR for Virtual Reality" "https://github.com/ValveSoftware/openvr" FALSE "" "")
 

diff --git a/CMake/FeatureSummary.cmake → CMake/OgreFeatureSummary.cmake b/CMake/FeatureSummary.cmake → CMake/OgreFeatureSummary.cmake
diff --git a/CMake/Packages/FindAndroidSwappy.cmake b/CMake/Packages/FindAndroidSwappy.cmake
@@ -0,0 +1,47 @@
+#-------------------------------------------------------------------
+# This file is part of the CMake build system for OGRE-Next
+#     (Object-oriented Graphics Rendering Engine)
+# For the latest info, see http://www.ogre3d.org/
+#
+# The contents of this file are placed in the public domain. Feel
+# free to make use of it in any way you like.
+#-------------------------------------------------------------------
+
+# - Try to find AndroidSwappy
+# Once done, this will define
+#
+#  AndroidSwappy_FOUND - system has AndroidSwappy
+#  AndroidSwappy_INCLUDE_DIRS - the AndroidSwappy include directories
+#  AndroidSwappy_LIBRARIES - link these to use AndroidSwappy
+
+include(FindPkgMacros)
+findpkg_begin(AndroidSwappy)
+
+# Get path, convert backslashes as ${ENV_${var}}
+getenv_path(OGRE_SOURCE)
+getenv_path(OGRE_HOME)
+
+# construct search paths
+set(AndroidSwappy_PREFIX_PATH ${OGRE_SOURCE}/Dependencies ${ENV_OGRE_SOURCE}/Dependencies ${OGRE_HOME} ${ENV_OGRE_HOME})
+
+create_search_paths(AndroidSwappy)
+
+# redo search if prefix path changed
+clear_if_changed(AndroidSwappy_PREFIX_PATH
+  AndroidSwappy_LIBRARY_FWK
+  AndroidSwappy_LIBRARY_REL
+  AndroidSwappy_LIBRARY_DBG
+  AndroidSwappy_INCLUDE_DIR
+)
+
+get_debug_names(AndroidSwappy_LIBRARY_NAMES)
+
+use_pkgconfig(AndroidSwappy_PKGC AndroidSwappy)
+
+findpkg_framework(AndroidSwappy)
+
+find_path(AndroidSwappy_INCLUDE_DIR NAMES swappyVk.h HINTS ${AndroidSwappy_FRAMEWORK_INCLUDES} ${AndroidSwappy_INC_SEARCH_PATH} ${AndroidSwappy_PKGC_INCLUDE_DIRS} PATH_SUFFIXES "swappy" "swappy/swappy")
+find_library(AndroidSwappy_LIBRARY NAMES swappy_static HINTS ${AndroidSwappy_LIB_SEARCH_PATH} ${AndroidSwappy_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" release relwithdebinfo minsizerel debug)
+
+findpkg_finish(AndroidSwappy)
+add_parent_dir(AndroidSwappy_INCLUDE_DIRS AndroidSwappy_INCLUDE_DIR)
diff --git a/CMake/Packages/FindFreeImage.cmake b/CMake/Packages/FindFreeImage.cmake
@@ -31,17 +31,17 @@ clear_if_changed(FreeImage_PREFIX_PATH
   FreeImage_INCLUDE_DIR
 )
 
-set(FreeImage_LIBRARY_NAMES freeimage freeimageLib FreeImage FreeImageLib)
+set(FreeImage_LIBRARY_NAMES FreeImage freeimage freeimageLib FreeImageLib)
 get_debug_names(FreeImage_LIBRARY_NAMES)
 
 use_pkgconfig(FreeImage_PKGC freeimage)
 
 findpkg_framework(FreeImage)
 
-find_path(FreeImage_INCLUDE_DIR NAMES FreeImage.h HINTS ${FreeImage_INC_SEARCH_PATH} ${FreeImage_PKGC_INCLUDE_DIRS})
+find_path(FreeImage_INCLUDE_DIR NAMES FreeImage.h HINTS${FreeImage_INC_SEARCH_PATH} ${FreeImage_PKGC_INCLUDE_DIRS})
 
-find_library(FreeImage_LIBRARY_REL NAMES ${FreeImage_LIBRARY_NAMES} HINTS ${FreeImage_LIB_SEARCH_PATH} ${FreeImage_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
-find_library(FreeImage_LIBRARY_DBG NAMES ${FreeImage_LIBRARY_NAMES_DBG} HINTS ${FreeImage_LIB_SEARCH_PATH} ${FreeImage_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug)
+find_library(FreeImage_LIBRARY_REL NAMES ${FreeImage_LIBRARY_NAMES} HINTS ${OGRE_DEP_SEARCH_PATH} ${FreeImage_LIB_SEARCH_PATH} ${FreeImage_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
+find_library(FreeImage_LIBRARY_DBG NAMES ${FreeImage_LIBRARY_NAMES_DBG} HINTS ${OGRE_DEP_SEARCH_PATH} ${FreeImage_LIB_SEARCH_PATH} ${FreeImage_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug)
 
 make_library_set(FreeImage_LIBRARY)
 

diff --git a/CMake/Packages/FindOGRE.cmake b/CMake/Packages/FindOGRE.cmake
@@ -173,8 +173,9 @@ set(OGRE_PREFIX_WATCH ${OGRE_PREFIX_PATH} ${OGRE_PREFIX_SOURCE} ${OGRE_PREFIX_BU
 clear_if_changed(OGRE_PREFIX_WATCH ${OGRE_RESET_VARS})
 
 if(NOT OGRE_STATIC)
-	# try to locate Ogre via pkg-config
-	use_pkgconfig(OGRE_PKGC "OGRE${OGRE_LIB_SUFFIX}")
+    # try to locate Ogre via pkg-config
+    use_pkgconfig(OGRE_PKGC "OGRE-Next${OGRE_LIB_SUFFIX}")
+    use_pkgconfig(OGRE_PKGC "OGRE${OGRE_LIB_SUFFIX}")
 
 	# Set the framework search path for OS X
     set(OGRE_FRAMEWORK_SEARCH_PATH
@@ -396,7 +397,7 @@ set(OGRE_COMPONENT_SEARCH_PATH_DBG
 macro(ogre_find_component COMPONENT HEADER PATH_HINTS)
   set(OGRE_${COMPONENT}_FIND_QUIETLY ${OGRE_FIND_QUIETLY})
   findpkg_begin(OGRE_${COMPONENT})
-  find_path(OGRE_${COMPONENT}_INCLUDE_DIR NAMES ${HEADER} HINTS ${OGRE_INCLUDE_DIRS} ${OGRE_PREFIX_SOURCE} PATH_SUFFIXES ${PATH_HINTS} ${COMPONENT} OGRE/${COMPONENT} )
+  find_path(OGRE_${COMPONENT}_INCLUDE_DIR NAMES ${HEADER} HINTS ${OGRE_INCLUDE_DIRS} ${OGRE_PREFIX_SOURCE} PATH_SUFFIXES ${PATH_HINTS} ${COMPONENT} OGRE-Next/${COMPONENT} OGRE/${COMPONENT} )
   set(OGRE_${COMPONENT}_LIBRARY_NAMES "OgreNext${COMPONENT}${OGRE_LIB_SUFFIX}" "Ogre${COMPONENT}${OGRE_LIB_SUFFIX}")
   get_debug_names(OGRE_${COMPONENT}_LIBRARY_NAMES)
   find_library(OGRE_${COMPONENT}_LIBRARY_REL NAMES ${OGRE_${COMPONENT}_LIBRARY_NAMES} HINTS ${OGRE_LIBRARY_DIR_REL} ${OGRE_FRAMEWORK_PATH} PATH_SUFFIXES "" "Release" "RelWithDebInfo" "MinSizeRel")

diff --git a/CMake/Templates/OGREStatic.pc.in b/CMake/Templates/OGREStatic.pc.in
@@ -2,12 +2,12 @@ prefix=@OGRE_PREFIX_PATH@
 exec_prefix=${prefix}
 libdir=${prefix}/@OGRE_LIB_DIRECTORY@
 includedir=${prefix}/include
-plugindir=${libdir}/OGRE
+plugindir=${libdir}/@OGRE_NEXT_PREFIX@
 
-Name: OGRE (static lib)
+Name: @OGRE_NEXT_PREFIX@ (static lib)
 Description: Object-Oriented Graphics Rendering Engine
 Version: @OGRE_VERSION@
 URL: http://www.ogre3d.org
 Requires: freetype2, zziplib, x11, xt, xaw7, gl
-Libs: -L${libdir} -L${plugindir} -lOgreMain@OGRE_LIB_SUFFIX@ @OGRE_ADDITIONAL_LIBS@
-Cflags: -I${includedir} -I${includedir}/OGRE @OGRE_CFLAGS@
+Libs: -L${libdir} -L${plugindir} -l@OGRE_NEXT@Main@OGRE_LIB_SUFFIX@ @OGRE_ADDITIONAL_LIBS@
+Cflags: -I${includedir} -I${includedir}/@OGRE_NEXT_PREFIX@ @OGRE_CFLAGS@
diff --git a/CMake/Templates/OgreBuildSettings.h.in b/CMake/Templates/OgreBuildSettings.h.in
@@ -108,4 +108,7 @@
 
 #define OGRE_IDSTRING_ALWAYS_READABLE @OGRE_SET_IDSTRING_ALWAYS_READABLE@
 
+#cmakedefine OGRE_SHADER_THREADING_USE_TLS
+#cmakedefine OGRE_SHADER_THREADING_BACKWARDS_COMPATIBLE_API
+
 #endif
diff --git a/CMake/Templates/OgreVulkanBuildSettings.h.in b/CMake/Templates/OgreVulkanBuildSettings.h.in
@@ -3,6 +3,7 @@
 
 // CMake auto-generated configuration options
 
+#cmakedefine OGRE_VULKAN_USE_SWAPPY
 #cmakedefine OGRE_VULKAN_WINDOW_NULL
 #cmakedefine OGRE_VULKAN_WINDOW_WIN32
 #cmakedefine OGRE_VULKAN_WINDOW_XCB