Merge branch 'master' into fast-intersection-queries

Author: robertosfield

.github/workflows/ci-android.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        android-platform: [24, latest]
+        android-platform: [29, latest]
         android-abi: [armeabi-v7a, arm64-v8a]
         build-shared: [ON]
 

CMakeLists.txt

@@ -1,7 +1,7 @@
-cmake_minimum_required(VERSION 3.7)
+cmake_minimum_required(VERSION 3.10)
 
 project(vsg
-    VERSION 1.1.12
+    VERSION 1.1.13
     DESCRIPTION "VulkanSceneGraph library"
     LANGUAGES CXX
 )
@@ -44,18 +44,10 @@ set(VSG_MAX_INSTRUMENTATION_LEVEL 1 CACHE STRING "Set the instrumentation level
 option(VSG_SUPPORTS_ShaderCompiler "Optional shader compiler support" ON)
 if (VSG_SUPPORTS_ShaderCompiler)
 
-    # Try looking for glslang 15 first.
-    set(GLSLANG_MIN_VERSION "15" CACHE STRING "glslang 14 is the earliest version that we think installs itself properly on all platforms. Other platforms may be able to use an earlier version")
-    find_package(glslang ${GLSLANG_MIN_VERSION} CONFIG QUIET)
-
-    if (NOT glslang_FOUND)
-        # fallback to trying glslang 14.
-        set(GLSLANG_MIN_VERSION "14")
-        find_package(glslang ${GLSLANG_MIN_VERSION} CONFIG)
-    endif()
+    find_package(glslang CONFIG QUIET)
 
     if (glslang_FOUND)
-        set(FIND_DEPENDENCY_glslang "find_package(glslang ${GLSLANG_MIN_VERSION} CONFIG REQUIRED)")
+        set(FIND_DEPENDENCY_glslang "find_package(glslang CONFIG REQUIRED)")
     else()
         message(WARNING "glslang not found. ShaderCompile support disabled.")
         set(VSG_SUPPORTS_ShaderCompiler 0)
@@ -98,7 +90,7 @@ if (VSG_SUPPORTS_Windowing)
     endif()
 endif()
 
-option(VSG_USE_dynamic_cast "Use dynamic_cast in vsg::Object::cast<T>(), 0 for off, 1 for enabled." OFF)
+option(VSG_USE_dynamic_cast "Use dynamic_cast in vsg::Object::cast<T>(), default is OFF and uses VSG native casting which provides 2-3x faster than using dynamic_cast<>." OFF)
 
 # this line needs to be after the call to setup_build_vars()
 configure_file("${VSG_SOURCE_DIR}/src/vsg/core/Version.h.in" "${VSG_VERSION_HEADER}")

INSTALL.md

@@ -20,7 +20,7 @@
 
 * C++17 compliant compiler i.e. g++ 7.3 or later, Clang 6.0 or later, Visual Studio S2017 or later.
 * [Vulkan](https://vulkan.lunarg.com/) 1.1 or later.  You can use Vulkan (libs and headers) installed from repositories or VulkanSDK.
-* [CMake](https://www.cmake.org) 3.7 or later.
+* [CMake](https://www.cmake.org) 3.10 or later.
 
 ---
 
@@ -170,22 +170,19 @@ To assist with setting up software to work with the VSG when you install the lib
 
 	find_package(vsg)
 
-To select C++17 compilation you'll need:
-
-	set_property(TARGET mytargetname PROPERTY CXX_STANDARD 17)
-
 To link your lib/application to required dependencies you'll need:
 
 	target_link_libraries(mytargetname vsg::vsg)
 
 This will tell CMake to set up all the appropriate include paths, libs and any definitions (such as the VSG_SHARED_LIBRARY #define that is required under Windows with shared library builds to select the correct declspec().)
 
+This will also tell CMake that your minimum C++ standard is 17.
+
 For example, a bare minimum CMakeLists.txt file to compile a single file application would be:
 
-	cmake_minimum_required(VERSION 3.7)
+	cmake_minimum_required(VERSION 3.10)
 	find_package(vsg REQUIRED)
 	add_executable(myapp "myapp.cpp")
-	set_property(TARGET myapp PROPERTY CXX_STANDARD 17)
 	target_link_libraries(myapp vsg::vsg)
 
 ### Using VSG provided cmake macros within your own projects
@@ -194,7 +191,7 @@ The build system provides macros that create specific cmake targets to use in yo
 
 For example, a bare minimum CMakeLists.txt file adding the mentioned cmake targets would be:
 
-	cmake_minimum_required(VERSION 3.7)
+	cmake_minimum_required(VERSION 3.10)
 	find_package(vsg REQUIRED)
 
 	vsg_setup_dir_vars()
@@ -218,7 +215,6 @@ For example, a bare minimum CMakeLists.txt file adding the mentioned cmake targe
 	vsg_add_target_uninstall()
 
 	add_executable(myapp "myapp.cpp")
-	set_property(TARGET myapp PROPERTY CXX_STANDARD 17)
 	target_link_libraries(myapp vsg::vsg)
 
 ### Using VSG provided cmake macro to generate cmake support files

include/vsg/app/View.h

@@ -77,6 +77,9 @@ namespace vsg
         /// and when it is visited the visitor.traversalMask is &'ed with the mask to give the traversalMask to use in the subgraph.
         Mask mask = MASK_ALL;
 
+        /// LODScale scales
+        double LODScale = 1.0;
+
         /// bins
         std::vector<ref_ptr<Bin>> bins;
 

include/vsg/app/Window.h

@@ -122,9 +122,11 @@ namespace vsg
             ref_ptr<ImageView> imageView;
             ref_ptr<Framebuffer> framebuffer;
             ref_ptr<Semaphore> imageAvailableSemaphore;
+            ref_ptr<Semaphore> renderFinishedSemaphore;
         };
 
         using Frames = std::vector<Frame>;
+        using Semaphores = std::vector<ref_ptr<Semaphore>>;
 
         Frame& frame(size_t i) { return _frames[i]; }
         Frames& frames() { return _frames; }
@@ -173,10 +175,11 @@ namespace vsg
         ref_ptr<Image> _multisampleDepthImage;
         ref_ptr<ImageView> _multisampleDepthImageView;
 
-        ref_ptr<Semaphore> _availableSemaphore;
-
         Frames _frames;
         std::vector<size_t> _indices;
+
+        Semaphores _availableSemaphores;
+        size_t _availableSemaphoreIndex = 0;
     };
     VSG_type_name(vsg::Window);
 

include/vsg/app/WindowTraits.h

@@ -70,7 +70,7 @@ namespace vsg
         VkImageUsageFlags depthImageUsage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
 
         VkQueueFlags queueFlags = VK_QUEUE_GRAPHICS_BIT;
-        std::vector<float> queuePiorities{1.0, 0.0};
+        std::vector<float> queuePriorities{1.0, 0.0};
         VkPipelineStageFlagBits imageAvailableSemaphoreWaitFlag = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
 
         // hints to which extension to enable during Instance/Device setup

include/vsg/core/Array.h

@@ -32,7 +32,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 namespace vsg
 {
     template<typename T>
-    class VSG_DECLSPEC Array : public Data
+    class VSG_TEMPLATE_DECLSPEC Array : public Data
     {
     public:
         using value_type = T;

include/vsg/core/Array2D.h

@@ -30,7 +30,7 @@ namespace vsg
 {
 
     template<typename T>
-    class VSG_DECLSPEC Array2D : public Data
+    class VSG_TEMPLATE_DECLSPEC Array2D : public Data
     {
     public:
         using value_type = T;

include/vsg/core/Array3D.h

@@ -30,7 +30,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 namespace vsg
 {
     template<typename T>
-    class VSG_DECLSPEC Array3D : public Data
+    class VSG_TEMPLATE_DECLSPEC Array3D : public Data
     {
     public:
         using value_type = T;

include/vsg/core/Export.h

@@ -16,18 +16,21 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #    pragma warning(disable : 4251)
 #endif
 
-#if defined(WIN32)
+#if defined(_WIN32)
 #    if defined(vsg_EXPORTS)
 #        define VSG_DECLSPEC __declspec(dllexport)
 #    elif defined(VSG_SHARED_LIBRARY)
 #        define VSG_DECLSPEC __declspec(dllimport)
 #    else
 #        define VSG_DECLSPEC
 #    endif
+#    define VSG_TEMPLATE_DECLSPEC
 #else
 #    if defined(VSG_SHARED_LIBRARY) || defined(VSG_EXPORTS)
 #        define VSG_DECLSPEC __attribute__((visibility("default")))
+#        define VSG_TEMPLATE_DECLSPEC __attribute__((visibility("default")))
 #    else
 #        define VSG_DECLSPEC
+#        define VSG_TEMPLATE_DECLSPEC
 #    endif
 #endif