Merge branch 'master' into MultiLayerTileDatabase

src/vsg/CMakeLists.txt

@@ -268,7 +268,7 @@ set(LIBRARIES PUBLIC
 )
 
 if (${VSG_SUPPORTS_ShaderCompiler})
-    list(APPEND LIBRARIES PRIVATE glslang::glslang glslang::glslang-default-resource-limits glslang::SPIRV)
+    list(INSERT LIBRARIES 0 PRIVATE glslang::glslang glslang::glslang-default-resource-limits glslang::SPIRV)
 endif()
 
 # Check for std::atomic

src/vsg/io/VSG.cpp

@@ -184,7 +184,7 @@ bool VSG::write(const vsg::Object* object, const vsg::Path& filename, ref_ptr<co
     }
     else if (ext == ".vsga" || ext == ".vsgt")
     {
-        std::ofstream fout(filename);
+        std::ofstream fout(filename, std::ios::out | std::ios::binary);
         writeHeader(fout, FormatInfo{ASCII, version});
 
         vsg::AsciiOutput output(fout, options);

src/vsg/utils/PolytopeIntersector.cpp

@@ -229,6 +229,8 @@ PolytopeIntersector::PolytopeIntersector(const Camera& camera, double xMin, doub
         eyespace.push_back(pl * projectionMatrix);
     }
 
+    _polytopeStack.push_back(eyespace);
+
     vsg::Polytope worldspace;
     for (auto& pl : eyespace)
     {

src/vsg/utils/ShaderCompiler.cpp

@@ -282,6 +282,7 @@ bool ShaderCompiler::compile(ShaderStages& shaders, const std::vector<std::strin
                 }
             }
 
+            vsg_shader->module->code.clear();
             glslang::GlslangToSpv(*(program->getIntermediate((EShLanguage)eshl_stage)), vsg_shader->module->code, &logger, &spvOptions);
         }
     }