BigC
/
ArchitectureColoredPainting
4
2
Fork 0
Code Issues 6 Pull Requests Projects Releases 5 Wiki Activity

Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting

TaoZhang-Branch
ArgonarioD 2023-03-10 16:07:54 +08:00
parent 65e03ed3ba 520597e288
commit 293c1f3096
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ArchitectureColoredPainting/src/Renderer/Painting/MaterialStyleStroke.cpp
View File

@ -70,6 +70,12 @@ Renderer::MaterialStyleStroke::MaterialStyleStroke(float width, StrokeType strok
{ {
} }
Renderer::MaterialStyleStroke::MaterialStyleStroke(const MaterialStyleStroke& s)
:halfWidth(s.halfWidth), strokeType(s.strokeType), endType(s.endType), materialStroke(std::make_shared<MaterialStroke>(*s.materialStroke))
{
}
MaterialStyleType Renderer::MaterialStyleStroke::type() const MaterialStyleType Renderer::MaterialStyleStroke::type() const
{ {
return MaterialStyleType::kStroke; return MaterialStyleType::kStroke;

1
ArchitectureColoredPainting/src/Renderer/Painting/MaterialStyleStroke.h
View File

@ -45,6 +45,7 @@ namespace Renderer
{ {
public: public:
MaterialStyleStroke(float width, StrokeType strokeType, StrokeEndType endType, std::shared_ptr<MaterialStroke> materialStroke); MaterialStyleStroke(float width, StrokeType strokeType, StrokeEndType endType, std::shared_ptr<MaterialStroke> materialStroke);
MaterialStyleStroke(const MaterialStyleStroke&);
virtual MaterialStyleType type() const override; virtual MaterialStyleType type() const override;
virtual std::vector<GLfloat> encoded() const override; virtual std::vector<GLfloat> encoded() const override;
virtual bool operator==(const MaterialStyle&) const override; virtual bool operator==(const MaterialStyle&) const override;