VulkanSceneGraph-1.0.2 released

[vsg-dev]

Only a week since 1.0.1 was released, but as we had a report of race condition I felt it important to get a fix rolled out quickly:

https://github.com/vsg-dev/VulkanSceneGraph/releases/tag/VulkanSceneGraph-1.0.2

There are a few other fixes and improvements, these are:

1. Fix of race condition in vsg::CompileManager
2. Fix handling of full screen on macOS
3. Added vsg::fileType(cosnt Path&) and vsg::getDirectoryContents(const Path&)

[vsg-dev]

Changes between 1.0.1 and 1.0.2:

$ git diff VulkanSceneGraph-1.0.1 VulkanSceneGraph-1.0.2
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c306ad45..8994854a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.7)
 
 project(vsg
-    VERSION 1.0.1
+    VERSION 1.0.2
     DESCRIPTION "VulkanSceneGraph library"
     LANGUAGES CXX
 )
diff --git a/include/vsg/io/FileSystem.h b/include/vsg/io/FileSystem.h
index ca81aa20..5c4851fa 100644
--- a/include/vsg/io/FileSystem.h
+++ b/include/vsg/io/FileSystem.h
@@ -42,6 +42,9 @@ namespace vsg
         return paths;
     }
 
+    /// return file type, see include/vsg/io/Path.h for FileType enum,
+    extern VSG_DECLSPEC FileType fileType(const Path& path);
+
     /// return true if a specified file/path exist on system.
     extern VSG_DECLSPEC bool fileExists(const Path& path);
 
@@ -73,6 +76,9 @@ namespace vsg
     /// make a directory, return true if path already exists or full path has been created successfully, return false on failure.
     extern VSG_DECLSPEC bool makeDirectory(const Path& path);
 
+    /// get the contents of a directory, return {} if directory name is not a directory
+    extern VSG_DECLSPEC Paths getDirectoryContents(const Path& directoryName);
+
     /// returns the path/filename of the currently executed program.
     extern VSG_DECLSPEC Path executableFilePath();
 
diff --git a/include/vsg/io/Path.h b/include/vsg/io/Path.h
index 64ce6640..dcc6e0ac 100644
--- a/include/vsg/io/Path.h
+++ b/include/vsg/io/Path.h
@@ -19,6 +19,13 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 namespace vsg
 {
 
+    enum FileType
+    {
+        FILE_NOT_FOUND = 0,
+        REGULAR_FILE,
+        DIRECTORY
+    };
+
     /// Class for managing paths/filename with full support for wide and single wide path strings.
     /// Similar in role and features to std::filesystem::path, but is able to work on older compilers.
     class VSG_DECLSPEC Path
@@ -168,9 +175,14 @@ namespace vsg
         Path& replace(size_type pos, size_type n, const char* str);
         Path& replace(size_type pos, size_type n, const wchar_t* str);
 
+        FileType type() const;
+
     protected:
         string_type _string;
     };
+    VSG_type_name(vsg::Path);
+
+    using Paths = std::vector<Path>;
 
     /// directly join two paths without a path separator
     inline Path operator+(const Path& lhs, const Path& rhs)
diff --git a/include/vsg/state/GraphicsPipeline.h b/include/vsg/state/GraphicsPipeline.h
index f15e0156..20a91a8f 100644
--- a/include/vsg/state/GraphicsPipeline.h
+++ b/include/vsg/state/GraphicsPipeline.h
@@ -39,7 +39,7 @@ namespace vsg
 
     using GraphicsPipelineStates = std::vector<ref_ptr<GraphicsPipelineState>>;
     extern VSG_DECLSPEC void mergeGraphicsPipelineStates(GraphicsPipelineStates& dest_PipelineStates, ref_ptr<GraphicsPipelineState> src_PipelineState);
-    extern VSG_DECLSPEC void mergeGraphicsPipelineStates(GraphicsPipelineStates& dest_PipelineStates, GraphicsPipelineStates& src_PipelineStates);
+    extern VSG_DECLSPEC void mergeGraphicsPipelineStates(GraphicsPipelineStates& dest_PipelineStates, const GraphicsPipelineStates& src_PipelineStates);
 
     /// GraphicsPipeline encapsulates graphics VkPipeline and the VkGraphicsPipelineCreateInfo settings used to set it up.
     class VSG_DECLSPEC GraphicsPipeline : public Inherit<Object, GraphicsPipeline>
diff --git a/include/vsg/utils/CommandLine.h b/include/vsg/utils/CommandLine.h
index 02ed3e5a..f67e914c 100644
--- a/include/vsg/utils/CommandLine.h
+++ b/include/vsg/utils/CommandLine.h
@@ -218,14 +218,14 @@ namespace vsg
         const char* str = _argv[i];
         if (!str) return false;
 
-        if (std::strcmp(str, "true")==0 || std::strcmp(str, "True")==0 || std::strcmp(str, "TRUE")==0 || std::strcmp(str, "1")==0)
+        if (std::strcmp(str, "true") == 0 || std::strcmp(str, "True") == 0 || std::strcmp(str, "TRUE") == 0 || std::strcmp(str, "1") == 0)
         {
             v = true;
             ++i;
             return true;
         }
 
-        if (std::strcmp(str, "false")==0 || std::strcmp(str, "False")==0 || std::strcmp(str, "FALSE")==0 || std::strcmp(str, "0")==0)
+        if (std::strcmp(str, "false") == 0 || std::strcmp(str, "False") == 0 || std::strcmp(str, "FALSE") == 0 || std::strcmp(str, "0") == 0)
         {
             v = false;
             ++i;
diff --git a/src/vsg/app/CompileManager.cpp b/src/vsg/app/CompileManager.cpp
index 4275bc8a..606d8fba 100644
--- a/src/vsg/app/CompileManager.cpp
+++ b/src/vsg/app/CompileManager.cpp
@@ -126,48 +126,53 @@ CompileResult CompileManager::compile(ref_ptr<Object> object, ContextSelectionFu
     // if no CompileTraversals are available abort compile
     if (!compileTraversal) return result;
 
-    std::list<ref_ptr<Context>> contexts;
-    if (contextSelection)
-    {
+    auto run_compile_traversal = [&]() -> void {
         for (auto& context : compileTraversal->contexts)
         {
-            if (contextSelection(*context)) contexts.push_back(context);
+            ref_ptr<View> view = context->view;
+            if (view && !binStack.empty())
+            {
+                if (auto itr = result.views.find(view.get()); itr == result.views.end())
+                {
+                    result.views[view] = binStack.top();
+                }
+            }
+
+            context->reserve(requirements);
         }
-    }
-    else
-    {
-        contexts = compileTraversal->contexts;
-    }
 
-    compileTraversal->contexts.swap(contexts);
+        object->accept(*compileTraversal);
+
+        //debug("Finished compile traversal ", object);
 
-    for (auto& context : compileTraversal->contexts)
+        compileTraversal->record(); // records and submits to queue
+        compileTraversal->waitForCompletion();
+
+        debug("Finished waiting for compile ", object);
+    };
+
+    if (contextSelection)
     {
-        ref_ptr<View> view = context->view;
-        if (view && !binStack.empty())
+        std::list<ref_ptr<Context>> contexts;
+
+        for (auto& context : compileTraversal->contexts)
         {
-            if (auto itr = result.views.find(view.get()); itr == result.views.end())
-            {
-                result.views[view] = binStack.top();
-            }
+            if (contextSelection(*context)) contexts.push_back(context);
         }
 
-        context->reserve(requirements);
-    }
-
-    object->accept(*compileTraversal);
+        compileTraversal->contexts.swap(contexts);
 
-    //debug("Finished compile traversal ", object);
+        run_compile_traversal();
 
-    compileTraversal->record(); // records and submits to queue
-    compileTraversal->waitForCompletion();
-
-    debug("Finished waiting for compile ", object);
+        compileTraversal->contexts.swap(contexts);
+    }
+    else
+    {
+        run_compile_traversal();
+    }
 
     compileTraversals->add(compileTraversal);
 
-    compileTraversal->contexts.swap(contexts);
-
     result.result = VK_SUCCESS;
     return result;
 }
diff --git a/src/vsg/io/FileSystem.cpp b/src/vsg/io/FileSystem.cpp
index 29d837bd..0a55369f 100644
--- a/src/vsg/io/FileSystem.cpp
+++ b/src/vsg/io/FileSystem.cpp
@@ -103,6 +103,34 @@ Paths vsg::getEnvPaths(const char* env_var)
     return filepaths;
 }
 
+#if !defined(S_ISDIR)
+#    if defined(_S_IFDIR) && !defined(__S_IFDIR)
+#        define __S_IFDIR _S_IFDIR
+#    endif
+#    define S_ISDIR(mode) (mode & __S_IFDIR)
+#endif
+
+FileType vsg::fileType(const Path& path)
+{
+#if defined(_MSC_VER)
+    struct __stat64 stbuf;
+    if (_wstat64(path.c_str(), &stbuf) != 0) return FILE_NOT_FOUND;
+#elif defined(__APPLE__)
+    struct stat stbuf;
+    if (stat(path.c_str(), &stbuf) != 0) return FILE_NOT_FOUND;
+#else
+    struct stat64 stbuf;
+    if (stat64(path.c_str(), &stbuf) != 0) return FILE_NOT_FOUND;
+#endif
+
+    if ((stbuf.st_mode & S_IFDIR) != 0)
+        return DIRECTORY;
+    else if ((stbuf.st_mode & S_IFREG) != 0)
+        return REGULAR_FILE;
+    else
+        return FILE_NOT_FOUND;
+}
+
 bool vsg::fileExists(const Path& path)
 {
 #if defined(_MSC_VER)
@@ -348,3 +376,44 @@ FILE* vsg::fopen(const Path& path, const char* mode)
     return ::fopen(path.c_str(), mode);
 #endif
 }
+
+#if defined(_MSC_VER)
+// Microsoft API for reading directories
+Paths vsg::getDirectoryContents(const Path& directoryName)
+{
+    LPDWORD strLength = 0;
+    PWSTR linkName = nullptr;
+
+    auto handle = FindFirstFileNameW(directoryName.c_str(), 0, strLength, linkName);
+    if (handle == INVALID_HANDLE_VALUE) return {};
+
+    Paths paths;
+    do
+    {
+        paths.push_back(linkName);
+    } while (FindNextFileNameW(handle, strLength, linkName));
+
+    FindClose(handle);
+
+    return paths;
+}
+#else
+// posix API for reading directories
+#    include <dirent.h>
+Paths vsg::getDirectoryContents(const Path& directoryName)
+{
+    auto handle = opendir(directoryName.c_str());
+    if (handle == 0) return {};
+
+    Paths paths;
+    dirent* rc = nullptr;
+    while ((rc = readdir(handle)) != nullptr)
+    {
+        paths.push_back(rc->d_name);
+    }
+
+    closedir(handle);
+
+    return paths;
+}
+#endif
diff --git a/src/vsg/io/Path.cpp b/src/vsg/io/Path.cpp
index de866466..9af15d42 100644
--- a/src/vsg/io/Path.cpp
+++ b/src/vsg/io/Path.cpp
@@ -131,3 +131,8 @@ Path& Path::append(const Path& right)
 
     return *this;
 }
+
+FileType Path::type() const
+{
+    return vsg::fileType(*this);
+}
diff --git a/src/vsg/platform/macos/MacOS_Window.mm b/src/vsg/platform/macos/MacOS_Window.mm
index 001d7ffb..cc18bf0e 100644
--- a/src/vsg/platform/macos/MacOS_Window.mm
+++ b/src/vsg/platform/macos/MacOS_Window.mm
@@ -800,7 +800,7 @@ MacOS_Window::MacOS_Window(vsg::ref_ptr<vsg::WindowTraits> traits) :
     
     // create view
     _view = [[vsg_MacOS_NSView alloc] initWithVsgWindow:this];
-    [_view setWantsBestResolutionOpenGLSurface:_traits->hdpi];
+    // [_view setWantsBestResolutionOpenGLSurface:_traits->hdpi];
     [_view setAutoresizingMask: (NSViewWidthSizable | NSViewHeightSizable) ];
     [_view setWantsLayer:YES];
 
@@ -809,6 +809,13 @@ MacOS_Window::MacOS_Window(vsg::ref_ptr<vsg::WindowTraits> traits) :
     _window.initialFirstResponder = _view;
     [_window makeFirstResponder:_view];
 
+    if (traits->fullscreen)
+    {
+        NSRect screenFrame = [[NSScreen mainScreen] frame];
+        [_window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
+        [_window toggleFullScreen:NSApp.delegate];
+    }
+
     auto devicePixelScale = _traits->hdpi ? [_window backingScaleFactor] : 1.0f;
     [_metalLayer setContentsScale:devicePixelScale];
 
diff --git a/src/vsg/state/GraphicsPipeline.cpp b/src/vsg/state/GraphicsPipeline.cpp
index b1258dd7..6de94c65 100644
--- a/src/vsg/state/GraphicsPipeline.cpp
+++ b/src/vsg/state/GraphicsPipeline.cpp
@@ -27,7 +27,7 @@ using namespace vsg;
 void vsg::mergeGraphicsPipelineStates(GraphicsPipelineStates& dest_PipelineStates, ref_ptr<GraphicsPipelineState> src_PipelineState)
 {
     // replace any entries in the dest_PipelineStates that have the same type as src_PipelineState
-    for(auto& original_pipelineState : dest_PipelineStates)
+    for (auto& original_pipelineState : dest_PipelineStates)
     {
         if (original_pipelineState->type_info() == src_PipelineState->type_info())
         {
@@ -38,9 +38,9 @@ void vsg::mergeGraphicsPipelineStates(GraphicsPipelineStates& dest_PipelineState
     dest_PipelineStates.push_back(src_PipelineState);
 }
 
-void vsg::mergeGraphicsPipelineStates(GraphicsPipelineStates& dest_PipelineStates, GraphicsPipelineStates& src_PipelineStates)
+void vsg::mergeGraphicsPipelineStates(GraphicsPipelineStates& dest_PipelineStates, const GraphicsPipelineStates& src_PipelineStates)
 {
-    for(auto& src_PipelineState : src_PipelineStates)
+    for (auto& src_PipelineState : src_PipelineStates)
     {
         mergeGraphicsPipelineStates(dest_PipelineStates, src_PipelineState);
     }