diff --git a/RayTracer/shape/Group.cpp b/RayTracer/shape/Group.cpp index 1f9ad75214ba6962f5216023d0ffe0bf7617640a..5a532afba7699ea8aeb09750c8625ea9876e0fbf 100644 --- a/RayTracer/shape/Group.cpp +++ b/RayTracer/shape/Group.cpp @@ -46,8 +46,8 @@ util::AxisAlignedBoundingBox Group::bounds() const { void Group::add(const Group& group) { add(std::make_shared<Group>(group)); } -void Group::add(const SingleGroup& group) { - add(std::make_shared<SingleGroup>(group)); +void Group::add(const ShapeSingleGroup& group) { + add(std::make_shared<ShapeSingleGroup>(group)); } void Group::add(const std::shared_ptr<Shape>& shape) { shapeList.push_back(shape); diff --git a/RayTracer/shape/Group.h b/RayTracer/shape/Group.h index 36e4104aa9922dfc553c4493a61ae80ad05254a3..91d5bbc50f4c8b4fa4f5a837ea8668eee19b3371 100644 --- a/RayTracer/shape/Group.h +++ b/RayTracer/shape/Group.h @@ -5,7 +5,7 @@ #include "../tools/Mat4.h" #include "../tools/Transformation.h" #include "Shape.h" -#include "SingleGroup.h" +#include "ShapeSingleGroup.h" namespace shapes { class Group : public Shape { @@ -16,9 +16,9 @@ class Group : public Shape { std::optional<cam::Hit> intersect(const cam::Ray& r) const override; util::AxisAlignedBoundingBox bounds() const override; void add(const Group& group); - void add(const SingleGroup& group); + void add(const ShapeSingleGroup& group); - protected: + // protected: void add(const std::shared_ptr<shapes::Shape>& shape); private: