From 6a1df3dfbae98a05e74c646cc216fbc19ffdb6d6 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sun, 7 Jan 2024 13:04:31 +0000 Subject: Template Ray on position type --- ui/builders/freeExtend.cpp | 6 ++++-- ui/builders/freeExtend.h | 6 ++++-- ui/builders/join.cpp | 5 +++-- ui/builders/join.h | 6 ++++-- ui/builders/straight.cpp | 6 ++++-- ui/builders/straight.h | 6 ++++-- 6 files changed, 23 insertions(+), 12 deletions(-) (limited to 'ui/builders') diff --git a/ui/builders/freeExtend.cpp b/ui/builders/freeExtend.cpp index 1520421..47356c3 100644 --- a/ui/builders/freeExtend.cpp +++ b/ui/builders/freeExtend.cpp @@ -11,7 +11,8 @@ BuilderFreeExtend::hint() const } void -BuilderFreeExtend::move(Network * network, const GeoData * geoData, const SDL_MouseMotionEvent &, const Ray & ray) +BuilderFreeExtend::move( + Network * network, const GeoData * geoData, const SDL_MouseMotionEvent &, const Ray & ray) { if (p1) { if (const auto p = network->intersectRayNodes(ray)) { @@ -30,7 +31,8 @@ BuilderFreeExtend::move(Network * network, const GeoData * geoData, const SDL_Mo } void -BuilderFreeExtend::click(Network * network, const GeoData * geoData, const SDL_MouseButtonEvent & e, const Ray & ray) +BuilderFreeExtend::click( + Network * network, const GeoData * geoData, const SDL_MouseButtonEvent & e, const Ray & ray) { switch (e.button) { case SDL_BUTTON_LEFT: diff --git a/ui/builders/freeExtend.h b/ui/builders/freeExtend.h index b276426..127fdc6 100644 --- a/ui/builders/freeExtend.h +++ b/ui/builders/freeExtend.h @@ -6,8 +6,10 @@ class GeoData; class BuilderFreeExtend : public EditNetwork::Builder { std::string hint() const override; - void click(Network * network, const GeoData * geoData, const SDL_MouseButtonEvent & e, const Ray & ray) override; - void move(Network * network, const GeoData * geoData, const SDL_MouseMotionEvent & e, const Ray & ray) override; + void click(Network * network, const GeoData * geoData, const SDL_MouseButtonEvent & e, + const Ray & ray) override; + void move(Network * network, const GeoData * geoData, const SDL_MouseMotionEvent & e, + const Ray & ray) override; std::optional p1; }; diff --git a/ui/builders/join.cpp b/ui/builders/join.cpp index caa635f..7474c5b 100644 --- a/ui/builders/join.cpp +++ b/ui/builders/join.cpp @@ -11,7 +11,7 @@ BuilderJoin::hint() const } void -BuilderJoin::move(Network * network, const GeoData *, const SDL_MouseMotionEvent &, const Ray & ray) +BuilderJoin::move(Network * network, const GeoData *, const SDL_MouseMotionEvent &, const Ray & ray) { if (p1) { if (const auto p = network->intersectRayNodes(ray)) { @@ -24,7 +24,8 @@ BuilderJoin::move(Network * network, const GeoData *, const SDL_MouseMotionEvent } void -BuilderJoin::click(Network * network, const GeoData *, const SDL_MouseButtonEvent & e, const Ray & ray) +BuilderJoin::click( + Network * network, const GeoData *, const SDL_MouseButtonEvent & e, const Ray & ray) { switch (e.button) { case SDL_BUTTON_LEFT: diff --git a/ui/builders/join.h b/ui/builders/join.h index bb0bd4c..dd57895 100644 --- a/ui/builders/join.h +++ b/ui/builders/join.h @@ -6,8 +6,10 @@ class GeoData; class BuilderJoin : public EditNetwork::Builder { std::string hint() const override; - void click(Network * network, const GeoData * geoData, const SDL_MouseButtonEvent & e, const Ray & ray) override; - void move(Network * network, const GeoData * geoData, const SDL_MouseMotionEvent & e, const Ray & ray) override; + void click(Network * network, const GeoData * geoData, const SDL_MouseButtonEvent & e, + const Ray & ray) override; + void move(Network * network, const GeoData * geoData, const SDL_MouseMotionEvent & e, + const Ray & ray) override; void create(Network * network, const Node::Ptr & p1, const Node::Ptr & p2) const; diff --git a/ui/builders/straight.cpp b/ui/builders/straight.cpp index 9b262bb..866705a 100644 --- a/ui/builders/straight.cpp +++ b/ui/builders/straight.cpp @@ -11,7 +11,8 @@ BuilderStraight::hint() const } void -BuilderStraight::move(Network * network, const GeoData * geoData, const SDL_MouseMotionEvent &, const Ray & ray) +BuilderStraight::move( + Network * network, const GeoData * geoData, const SDL_MouseMotionEvent &, const Ray & ray) { if (p1) { if (const auto p = geoData->intersectRay(ray)) { @@ -24,7 +25,8 @@ BuilderStraight::move(Network * network, const GeoData * geoData, const SDL_Mous } void -BuilderStraight::click(Network * network, const GeoData * geoData, const SDL_MouseButtonEvent & e, const Ray & ray) +BuilderStraight::click( + Network * network, const GeoData * geoData, const SDL_MouseButtonEvent & e, const Ray & ray) { switch (e.button) { case SDL_BUTTON_LEFT: diff --git a/ui/builders/straight.h b/ui/builders/straight.h index cf99a1d..63f9a40 100644 --- a/ui/builders/straight.h +++ b/ui/builders/straight.h @@ -6,8 +6,10 @@ class GeoData; class BuilderStraight : public EditNetwork::Builder { std::string hint() const override; - void click(Network * network, const GeoData * geoData, const SDL_MouseButtonEvent & e, const Ray & ray) override; - void move(Network * network, const GeoData * geoData, const SDL_MouseMotionEvent & e, const Ray & ray) override; + void click(Network * network, const GeoData * geoData, const SDL_MouseButtonEvent & e, + const Ray & ray) override; + void move(Network * network, const GeoData * geoData, const SDL_MouseMotionEvent & e, + const Ray & ray) override; void create(Network * network, Position3D p1, Position3D p2) const; -- cgit v1.2.3