Introduce ApplyVisitorReader

Author: AnyOldName3

include/vsg/all.h

@@ -267,6 +267,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #include <vsg/vk/vulkan.h>
 
 // Input/Output header files
+#include <vsg/io/ApplyVisitorReader.h>
 #include <vsg/io/AsciiInput.h>
 #include <vsg/io/AsciiOutput.h>
 #include <vsg/io/BinaryInput.h>

include/vsg/io/ApplyVisitorReader.h

@@ -0,0 +1,48 @@
+#pragma once
+
+/* <editor-fold desc="MIT License">
+
+Copyright(c) 2025 Chris Djali
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+</editor-fold> */
+
+#include <vsg/io/ReaderWriter.h>
+
+namespace vsg
+{
+    /// Class to wrap a ReaderWriter and apply a Visitor to everything it loads
+    class VSG_DECLSPEC ApplyVisitorReader : public Inherit<ReaderWriter, ApplyVisitorReader>
+    {
+    public:
+        ApplyVisitorReader(vsg::ref_ptr<ReaderWriter> in_child, vsg::ref_ptr<Visitor> in_visitor);
+        ApplyVisitorReader(const ApplyVisitorReader& rhs, const CopyOp& copyop = {});
+
+        vsg::ref_ptr<ReaderWriter> child;
+        vsg::ref_ptr<Visitor> visitor;
+
+        void read(Input& input) override;
+        void write(Output& output) const override;
+
+        vsg::ref_ptr<vsg::Object> read(const vsg::Path& filename, vsg::ref_ptr<const vsg::Options> options = {}) const override;
+        vsg::ref_ptr<vsg::Object> read(std::istream& fin, vsg::ref_ptr<const vsg::Options> options = {}) const override;
+        vsg::ref_ptr<vsg::Object> read(const uint8_t* ptr, size_t size, vsg::ref_ptr<const vsg::Options> options = {}) const override;
+
+        bool write(const vsg::Object* object, const vsg::Path& filename, vsg::ref_ptr<const vsg::Options> options = {}) const override;
+        bool write(const vsg::Object* object, std::ostream& fout, vsg::ref_ptr<const vsg::Options> options = {}) const override;
+
+        bool readOptions(vsg::Options& options, vsg::CommandLine& arguments) const override;
+
+        bool getFeatures(Features& features) const override;
+
+    protected:
+        mutable std::mutex _visitorMutex;
+    };
+    VSG_type_name(vsg::ApplyVisitorReader);
+
+} // namespace vsg

src/vsg/CMakeLists.txt

@@ -155,6 +155,7 @@ set(SOURCES
     io/read.cpp
     io/write.cpp
     io/mem_stream.cpp
+    io/ApplyVisitorReader.cpp
 
     text/CpuLayoutTechnique.cpp
     text/GpuLayoutTechnique.cpp

src/vsg/io/ApplyVisitorReader.cpp

@@ -0,0 +1,93 @@
+/* <editor-fold desc="MIT License">
+
+Copyright(c) 2025 Chris Djali
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+</editor-fold> */
+
+#include <vsg/io/ApplyVisitorReader.h>
+
+using namespace vsg;
+
+vsg::ApplyVisitorReader::ApplyVisitorReader(vsg::ref_ptr<ReaderWriter> in_child, vsg::ref_ptr<Visitor> in_visitor) :
+    child(in_child),
+    visitor(in_visitor)
+{
+}
+
+vsg::ApplyVisitorReader::ApplyVisitorReader(const ApplyVisitorReader& rhs, const CopyOp& copyop) :
+    Inherit(rhs),
+    child(copyop(rhs.child)),
+    visitor(copyop(rhs.visitor))
+{
+}
+
+void ApplyVisitorReader::read(Input& input)
+{
+    input.readObject("child", child);
+    input.readObject("visitor", visitor);
+}
+
+void ApplyVisitorReader::write(Output& output) const
+{
+    output.writeObject("child", child);
+    output.writeObject("visitor", visitor);
+}
+
+vsg::ref_ptr<vsg::Object> ApplyVisitorReader::read(const vsg::Path& filename, ref_ptr<const Options> options) const
+{
+    auto object = child->read(filename, options);
+    if (object)
+    {
+        std::scoped_lock<std::mutex> lock(_visitorMutex);
+        object->accept(*visitor);
+    }
+    return object;
+}
+
+vsg::ref_ptr<vsg::Object> ApplyVisitorReader::read(std::istream& fin, ref_ptr<const Options> options) const
+{
+    auto object = child->read(fin, options);
+    if (object)
+    {
+        std::scoped_lock<std::mutex> lock(_visitorMutex);
+        object->accept(*visitor);
+    }
+    return object;
+}
+
+vsg::ref_ptr<vsg::Object> ApplyVisitorReader::read(const uint8_t* ptr, size_t size, vsg::ref_ptr<const vsg::Options> options) const
+{
+    auto object = child->read(ptr, size, options);
+    if (object)
+    {
+        std::scoped_lock<std::mutex> lock(_visitorMutex);
+        object->accept(*visitor);
+    }
+    return object;
+}
+
+bool ApplyVisitorReader::write(const vsg::Object* object, const vsg::Path& filename, ref_ptr<const Options> options) const
+{
+    return child->write(object, filename, options);
+}
+
+bool ApplyVisitorReader::write(const vsg::Object* object, std::ostream& fout, vsg::ref_ptr<const vsg::Options> options) const
+{
+    return child->write(object, fout, options);
+}
+
+bool ApplyVisitorReader::readOptions(vsg::Options& options, vsg::CommandLine& arguments) const
+{
+    return child->readOptions(options, arguments);
+}
+
+bool ApplyVisitorReader::getFeatures(Features& features) const
+{
+    return child->getFeatures(features);
+}