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

Start dx path support.

Browse source
This commit is contained in:
jmsgrogan 2023-01-20 17:30:05 +00:00
parent f8a2ce3c59
commit a46477cdcf
5 changed files with 91 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/circuits/test/TestElectronicCircuit.cpp
View file

@ -9,7 +9,7 @@
TEST_CASE(TestElectronicCircuit, "circuits")
{
TestRenderer renderer(100, 100);
TestRenderer renderer(800, 800);
auto circuit = std::make_unique<ElectronicCircuit>();
@ -68,4 +68,6 @@ TEST_CASE(TestElectronicCircuit, "circuits")
renderer.getScene()->addNode(circuit_node.get());
renderer.writeSvg(TestUtils::getTestOutputDir(__FILE__) / "circuit.svg");
renderer.write(TestUtils::getTestOutputDir(__FILE__) / "circuit.png");
}

10
src/base/geometry/path/Arc.cpp
View file

@ -34,9 +34,15 @@ std::string Arc::toPostScriptString(std::size_t precision) const
{
sstr.precision(precision);
}
sstr << (mPostscriptPositioning == PostscriptPositioning::RELATIVE_TO) ? "a" : "A";
if (mPostscriptPositioning == PostscriptPositioning::RELATIVE_TO)
{
sstr << "a";
}
else
{
sstr << "A";
}
sstr << mRx << " " << mRy << " " << mRotation << " " << large << " " << sweep << " ";
if (mPostscriptPositioning == PostscriptPositioning::RELATIVE_TO)
{
sstr << PointParser::toStringRelative(mEndPoint, mStartPoint, 2, " ", precision);

18
src/base/geometry/path/PathPostScriptConverter.cpp
View file

@ -11,6 +11,8 @@
#include "QuadraticBezierCurve.h"
#include "CubicBezierCurve.h"
#include "PointParser.h"
void PathPostScriptConverter::fromPostScript(GeometryPath* targetPath, const std::string& postScriptPath)
{
mCurrentPoint = Point();
@ -266,7 +268,7 @@ PathElementPtr PathPostScriptConverter::onQuadraticBezier()
double control_x = mPointBuffer[0];
double control_y = mPointBuffer[1];
double end_x = mPointBuffer[2];
bool end_y = mPointBuffer[3];
double end_y = mPointBuffer[3];
if (mPositionState == PositionState::RELATIVE)
{
const auto control_point = Point(mCurrentPoint.getX() + control_x, mCurrentPoint.getY() + control_y);
@ -286,14 +288,14 @@ PathElementPtr PathPostScriptConverter::onQuadraticBezier()
PathElementPtr PathPostScriptConverter::onCubicBezier()
{
PathElementPtr element;
if (mPointBuffer.size() == 4)
if (mPointBuffer.size() == 6)
{
double control0_x = mPointBuffer[0];
double control0_y = mPointBuffer[1];
double control1_x = mPointBuffer[0];
double control1_y = mPointBuffer[1];
double end_x = mPointBuffer[2];
bool end_y = mPointBuffer[3];
double control1_x = mPointBuffer[2];
double control1_y = mPointBuffer[3];
double end_x = mPointBuffer[4];
double end_y = mPointBuffer[5];
if (mPositionState == PositionState::RELATIVE)
{
const auto control_point0 = Point(mCurrentPoint.getX() + control0_x, mCurrentPoint.getY() + control0_y);
@ -318,11 +320,11 @@ std::string PathPostScriptConverter::toPostScript(const GeometryPath* targetPath
for (const auto& feature : targetPath->getFeatures())
{
auto start_loc = feature->getLocation();
path += "M " + std::to_string(start_loc.getX()) + " " + std::to_string(start_loc.getY());
path += "M" + PointParser::toString(start_loc, 2, " ", mPrecision);
for (const auto& path_element : feature->getElements())
{
path += " " + path_element->toPostScriptString(mPrecision);
path += path_element->toPostScriptString(mPrecision);
}
path += "Z ";
}

63
src/rendering/graphics/directx/DirectX2dPainter.cpp
View file

@ -11,6 +11,11 @@
#include "Line.h"
#include "Path.h"
#include "Curve.h"
#include "Arc.h"
#include "QuadraticBezierCurve.h"
#include "CubicBezierCurve.h"
#include "FileLogger.h"
#include "SceneModel.h"
@ -152,18 +157,27 @@ void DirectX2dPainter::paintPath(SceneModel* model)
{
if (element->getType() == AbstractGeometricItem::Type::LINE)
{
for (const auto& point : dynamic_cast<Line*>(element.get())->getPoints().getPoints())
{
MLOG_INFO("Adding line entry at: " << point.getX() << " " << point.getY());
path_sink->AddLine(toD2dPoint(point));
}
MLOG_INFO("Finished line");
onLine(element.get(), path_sink.Get());
}
else if (element->getType() == AbstractGeometricItem::Type::LINE_SEGMENT)
{
const auto loc = element->getEndPoint();
MLOG_INFO("Adding segment entry at: " << loc.getX() << " " << loc.getY());
path_sink->AddLine(toD2dPoint(loc));
onLineSegment(element.get(), path_sink.Get());
}
else if (element->getType() == AbstractGeometricItem::Type::CURVE)
{
auto curve = dynamic_cast<Curve*>(element.get());
if (curve->getCurveType() == Curve::CurveType::ARC)
{
onArc(curve, path_sink.Get());
}
else if (curve->getCurveType() == Curve::CurveType::CUBIC_BEZIER)
{
onCubicBezier(curve, path_sink.Get());
}
else if (curve->getCurveType() == Curve::CurveType::QUADRATIC_BEZIER)
{
onQuadraticBezier(curve, path_sink.Get());
}
}
}
path_sink->EndFigure(D2D1_FIGURE_END_CLOSED);
@ -183,6 +197,37 @@ void DirectX2dPainter::paintPath(SceneModel* model)
}
}
void DirectX2dPainter::onArc(Curve* element, ID2D1GeometrySink* sink)
{
}
void DirectX2dPainter::onQuadraticBezier(Curve* element, ID2D1GeometrySink* sink)
{
}
void DirectX2dPainter::onCubicBezier(Curve* element, ID2D1GeometrySink* sink)
{
}
void DirectX2dPainter::onLine(PathElement* element, ID2D1GeometrySink* sink)
{
for (const auto& point : dynamic_cast<Line*>(element)->getPoints().getPoints())
{
MLOG_INFO("Adding line entry at: " << point.getX() << " " << point.getY());
sink->AddLine(toD2dPoint(point));
}
MLOG_INFO("Finished line");
}
void DirectX2dPainter::onLineSegment(PathElement* element, ID2D1GeometrySink* sink)
{
const auto loc = element->getEndPoint();
MLOG_INFO("Adding segment entry at: " << loc.getX() << " " << loc.getY());
sink->AddLine(toD2dPoint(loc));
}
void DirectX2dPainter::setD2dInterface(DirectX2dInterface* d2dIterface)
{

18
src/rendering/graphics/directx/DirectX2dPainter.h
View file

@ -8,7 +8,11 @@ class SceneModel;
class Point;
class DirectX2dInterface;
class PathElement;
class Curve;
struct ID2D1SolidColorBrush;
struct ID2D1GeometrySink;
namespace D2D1
{
@ -30,9 +34,15 @@ public:
void setD2dInterface(DirectX2dInterface* d2dIterface);
private:
static D2D1::ColorF toD2dColor(const Color& color);
void onLine(PathElement* element, ID2D1GeometrySink* sink);
static D2D_POINT_2F toD2dPoint(const Point& point);
void onLineSegment(PathElement* element, ID2D1GeometrySink* sink);
void onArc(Curve* element, ID2D1GeometrySink* sink);
void onQuadraticBezier(Curve* element, ID2D1GeometrySink* sink);
void onCubicBezier(Curve* element, ID2D1GeometrySink* sink);
void paintRect(SceneModel* model);
@ -40,6 +50,10 @@ private:
void paintPath(SceneModel* model);
static D2D1::ColorF toD2dColor(const Color& color);
static D2D_POINT_2F toD2dPoint(const Point& point);
Microsoft::WRL::ComPtr<ID2D1SolidColorBrush> mSolidBrush;
DirectX2dInterface* mD2dInterface{ nullptr };