Skip to content

Initial implementation of ReplacementVisitor #1726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AnyOldName3 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Initial implementation of ReplacementVisitor #1726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/vsg/all.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
#include <vsg/core/MipmapLayout.h>
#include <vsg/core/Object.h>
#include <vsg/core/Objects.h>
#include <vsg/core/ReplacementVisitor.h>
#include <vsg/core/ScratchMemory.h>
#include <vsg/core/Value.h>
#include <vsg/core/Version.h>
Expand Down
4 changes: 4 additions & 0 deletions include/vsg/animation/Animation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@ namespace vsg
}
void traverse(Visitor& visitor) override { t_traverse(*this, visitor); }
void traverse(ConstVisitor& visitor) const override { t_traverse(*this, visitor); }
void traverse(ReplacementVisitor& visitor) override
{
for (auto& sampler : samplers) visitor.tryReplacePointer(sampler);
}

void read(Input& input) override;
void write(Output& output) const override;
Expand Down
5 changes: 5 additions & 0 deletions include/vsg/animation/AnimationGroup.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ namespace vsg
{
for (auto& child : children) child->accept(visitor);
}
void traverse(ReplacementVisitor& visitor) override
{
for (auto& animation : animations) visitor.tryReplacePointer(animation);
for (auto& child : children) visitor.tryReplacePointer(child);
}

void read(Input& input) override;
void write(Output& output) const override;
Expand Down
4 changes: 4 additions & 0 deletions include/vsg/animation/Joint.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ namespace vsg
void traverse(Visitor& visitor) override { t_traverse(*this, visitor); }
void traverse(ConstVisitor& visitor) const override { t_traverse(*this, visitor); }
void traverse(RecordTraversal& visitor) const override { t_traverse(*this, visitor); }
void traverse(ReplacementVisitor& visitor) override
{
for (auto& child : children) visitor.tryReplacePointer(child);
}

void read(Input& input) override;
void write(Output& output) const override;
Expand Down
4 changes: 4 additions & 0 deletions include/vsg/commands/Commands.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ namespace vsg
void traverse(Visitor& visitor) override { t_traverse(*this, visitor); }
void traverse(ConstVisitor& visitor) const override { t_traverse(*this, visitor); }
void traverse(RecordTraversal& visitor) const override { t_traverse(*this, visitor); }
void traverse(ReplacementVisitor& visitor) override
{
for (auto& child : children) visitor.tryReplacePointer(child);
}

int compare(const Object& rhs) const override;

Expand Down
1 change: 1 addition & 0 deletions include/vsg/core/Array.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ namespace vsg
// implementation provided by Visitor.h
void accept(Visitor& visitor) override;
void accept(ConstVisitor& visitor) const override;
std::optional<ref_ptr<Object>> accept(ReplacementVisitor& visitor) override;

void read(Input& input) override
{
Expand Down
1 change: 1 addition & 0 deletions include/vsg/core/Array2D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ namespace vsg
// implementation provided by Visitor.h
void accept(Visitor& visitor) override;
void accept(ConstVisitor& visitor) const override;
std::optional<ref_ptr<Object>> accept(ReplacementVisitor& visitor) override;

void read(Input& input) override
{
Expand Down
1 change: 1 addition & 0 deletions include/vsg/core/Array3D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ namespace vsg
// implementation provided by Visitor.h
void accept(Visitor& visitor) override;
void accept(ConstVisitor& visitor) const override;
std::optional<ref_ptr<Object>> accept(ReplacementVisitor& visitor) override;

void read(Input& input) override
{
Expand Down
7 changes: 7 additions & 0 deletions include/vsg/core/External.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@ namespace vsg
void traverse(Visitor& visitor) override { t_traverse(*this, visitor); }
void traverse(ConstVisitor& visitor) const override { t_traverse(*this, visitor); }
void traverse(RecordTraversal&) const override {}
void traverse(ReplacementVisitor& visitor) override
{
for (auto& [path, object] : entries)
{
if (object) visitor.tryReplacePointer(object);
}
}

void read(Input& input) override;
void write(Output& output) const override;
Expand Down
2 changes: 2 additions & 0 deletions include/vsg/core/Inherit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI

#include <vsg/app/RecordTraversal.h>
#include <vsg/core/ConstVisitor.h>
#include <vsg/core/ReplacementVisitor.h>
#include <vsg/core/Visitor.h>
#include <vsg/core/ref_ptr.h>
#include <vsg/core/type_name.h>
Expand Down Expand Up @@ -69,6 +70,7 @@ namespace vsg

void accept(Visitor& visitor) override { visitor.apply(static_cast<Subclass&>(*this)); }
void accept(ConstVisitor& visitor) const override { visitor.apply(static_cast<const Subclass&>(*this)); }
std::optional<ref_ptr<Object>> accept(ReplacementVisitor& visitor) override { return visitor.apply(static_cast<Subclass&>(*this)); }
void accept(RecordTraversal& visitor) const override { visitor.apply(static_cast<const Subclass&>(*this)); }
};

Expand Down
5 changes: 5 additions & 0 deletions include/vsg/core/Object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI

#include <atomic>
#include <map>
#include <optional>
#include <string>
#include <typeindex>
#include <vector>
Expand All @@ -29,6 +30,7 @@ namespace vsg
class Auxiliary;
class Visitor;
class ConstVisitor;
class ReplacementVisitor;
class RecordTraversal;
class Input;
class Output;
Expand Down Expand Up @@ -112,6 +114,9 @@ namespace vsg
virtual void accept(ConstVisitor& visitor) const;
virtual void traverse(ConstVisitor&) const {}

virtual std::optional<ref_ptr<Object>> accept(ReplacementVisitor& visitor);
virtual void traverse(ReplacementVisitor&) {};

virtual void accept(RecordTraversal& visitor) const;
virtual void traverse(RecordTraversal&) const {}

Expand Down
4 changes: 4 additions & 0 deletions include/vsg/core/Objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ namespace vsg
void traverse(Visitor& visitor) override { t_traverse(*this, visitor); }
void traverse(ConstVisitor& visitor) const override { t_traverse(*this, visitor); }
void traverse(RecordTraversal& visitor) const override { t_traverse(*this, visitor); }
void traverse(ReplacementVisitor& visitor) override
{
for (auto& child : children) visitor.tryReplacePointer(child);
}

void read(Input& input) override;
void write(Output& output) const override;
Expand Down
Loading
Loading