jgrogan/stuff-from-scratch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enable gcc wall and werror.

Browse source
This commit is contained in:
James Grogan 2023-01-23 11:06:30 +00:00
parent 990cde402b
commit 3fad113178
64 changed files with 347 additions and 314 deletions
Download patch file Download diff file Expand all files Collapse all files

188
src/rendering/visual_elements/svg/SvgNode.cpp
View file

@ -7,139 +7,139 @@
#include "SvgShapeElements.h"
SvgNode::SvgNode(const Transform& transform)
: MaterialNode(transform)
: MaterialNode(transform)
{
}
void SvgNode::setContent(std::unique_ptr<SvgDocument> doc)
{
mContent = std::move(doc);
mContentDirty = true;
mContent = std::move(doc);
mContentDirty = true;
mChildren.clear();
mGeometryNodes.clear();
mChildren.clear();
mGeometryNodes.clear();
}
unsigned SvgNode::getContentWidth() const
{
return mContentWidth;
return mContentWidth;
}
unsigned SvgNode::getContentHeight() const
{
return mContentHeight;
return mContentHeight;
}
void SvgNode::createOrUpdateGeometry(SceneInfo* sceneInfo)
{
if (!mContent->getRoot())
{
return;
}
if (!mContent->getRoot())
{
return;
}
auto viewbox = mContent->getViewBox();
//auto viewbox = mContent->getViewBox();
for (const auto& svg_element : mContent->getRoot()->getChildren())
{
std::unique_ptr<GeometryNode> geom_node;
for (const auto& svg_element : mContent->getRoot()->getChildren())
{
std::unique_ptr<GeometryNode> geom_node;
if (svg_element->getTagName() == "circle")
{
onCircle(svg_element.get(), geom_node);
}
else if (svg_element->getTagName() == "path")
{
onPath(svg_element.get(), geom_node);
}
if (svg_element->getTagName() == "circle")
{
onCircle(svg_element.get(), geom_node);
}
else if (svg_element->getTagName() == "path")
{
onPath(svg_element.get(), geom_node);
}
AbstractVisualNode* raw_node{ nullptr };
if (geom_node)
{
raw_node = geom_node.get();
mGeometryNodes.push_back(std::move(geom_node));
}
AbstractVisualNode* raw_node{ nullptr };
if (geom_node)
{
raw_node = geom_node.get();
mGeometryNodes.push_back(std::move(geom_node));
}
if (raw_node)
{
addChild(raw_node);
}
}
if (raw_node)
{
addChild(raw_node);
}
}
}
void SvgNode::update(SceneInfo* sceneInfo)
{
if (mContent && mContentDirty)
{
createOrUpdateGeometry(sceneInfo);
mContentDirty = false;
}
if (mContent && mContentDirty)
{
createOrUpdateGeometry(sceneInfo);
mContentDirty = false;
}
if (mMaterialIsDirty)
{
if (mHasFillColor)
{
for (const auto& geom_node : mGeometryNodes)
{
geom_node->setFillColor(mFillColor);
}
}
else
{
for (const auto& geom_node : mGeometryNodes)
{
geom_node->setHasFillColor(false);
}
}
if (mMaterialIsDirty)
{
if (mHasFillColor)
{
for (const auto& geom_node : mGeometryNodes)
{
geom_node->setFillColor(mFillColor);
}
}
else
{
for (const auto& geom_node : mGeometryNodes)
{
geom_node->setHasFillColor(false);
}
}
if (mHasStrokeColor)
{
for (const auto& geom_node : mGeometryNodes)
{
geom_node->setStrokeColor(mStrokeColor);
}
}
else
{
for (const auto& geom_node : mGeometryNodes)
{
geom_node->setHasStrokeColor(false);
}
}
mMaterialIsDirty = false;
}
if (mHasStrokeColor)
{
for (const auto& geom_node : mGeometryNodes)
{
geom_node->setStrokeColor(mStrokeColor);
}
}
else
{
for (const auto& geom_node : mGeometryNodes)
{
geom_node->setHasStrokeColor(false);
}
}
mMaterialIsDirty = false;
}
}
void SvgNode::onCircle(XmlElement* element, std::unique_ptr<GeometryNode>& node)
{
auto svg_circle = dynamic_cast<SvgCircle*>(element);
auto loc = svg_circle->getLocation();
auto radius = svg_circle->getRadius();
auto minor_radius = radius;
auto svg_circle = dynamic_cast<SvgCircle*>(element);
auto loc = svg_circle->getLocation();
auto radius = svg_circle->getRadius();
auto minor_radius = radius;
if (svg_circle->getType() == SvgCircle::Type::ELLIPSE)
{
minor_radius = svg_circle->getMinorRadius();
}
if (svg_circle->getType() == SvgCircle::Type::ELLIPSE)
{
minor_radius = svg_circle->getMinorRadius();
}
if (element->hasAttribute("transform"))
{
const auto transform = svg_circle->getTransform();
loc.move(transform.getLocation().getX(), transform.getLocation().getY());
radius *= transform.getScaleX();
minor_radius *= transform.getScaleY();
}
if (element->hasAttribute("transform"))
{
const auto transform = svg_circle->getTransform();
loc.move(transform.getLocation().getX(), transform.getLocation().getY());
radius *= transform.getScaleX();
minor_radius *= transform.getScaleY();
}
auto circle_node = std::make_unique<CircleNode>(loc, radius);
circle_node->setMinorRadius(minor_radius);
node = std::move(circle_node);
auto circle_node = std::make_unique<CircleNode>(loc, radius);
circle_node->setMinorRadius(minor_radius);
node = std::move(circle_node);
}
void SvgNode::onPath(XmlElement* element, std::unique_ptr<GeometryNode>& node)
{
auto svg_path = dynamic_cast<SvgPath*>(element);
auto svg_path = dynamic_cast<SvgPath*>(element);
Point loc;
auto path_node = std::make_unique<PathNode>(loc, svg_path->getPath());
node = std::move(path_node);
}
Point loc;
auto path_node = std::make_unique<PathNode>(loc, svg_path->getPath());
node = std::move(path_node);
}