diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-01-07 18:02:56 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-01-07 18:02:56 +0000 |
| commit | 509c955aac687a6e8daa80906d593cb24f83c64d (patch) | |
| tree | 0b551c1a26a2c08973e9dcf298f9da286687fc20 /ui/builders | |
| parent | Merge branch 'template-types' (diff) | |
| parent | Simplify find_arcs_radius (diff) | |
| download | ilt-509c955aac687a6e8daa80906d593cb24f83c64d.tar.bz2 ilt-509c955aac687a6e8daa80906d593cb24f83c64d.tar.xz ilt-509c955aac687a6e8daa80906d593cb24f83c64d.zip | |
Merge branch 'global-network'
Diffstat (limited to 'ui/builders')
| -rw-r--r-- | ui/builders/freeExtend.h | 2 | ||||
| -rw-r--r-- | ui/builders/straight.cpp | 2 | ||||
| -rw-r--r-- | ui/builders/straight.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ui/builders/freeExtend.h b/ui/builders/freeExtend.h index 127fdc6..0d5f327 100644 --- a/ui/builders/freeExtend.h +++ b/ui/builders/freeExtend.h @@ -11,5 +11,5 @@ class BuilderFreeExtend : public EditNetwork::Builder { void move(Network * network, const GeoData * geoData, const SDL_MouseMotionEvent & e, const Ray<GlobalPosition3D> & ray) override; - std::optional<Position3D> p1; + std::optional<GlobalPosition3D> p1; }; diff --git a/ui/builders/straight.cpp b/ui/builders/straight.cpp index 866705a..0c4a3e2 100644 --- a/ui/builders/straight.cpp +++ b/ui/builders/straight.cpp @@ -49,7 +49,7 @@ BuilderStraight::click( } void -BuilderStraight::create(Network * network, Position3D p1, Position3D p2) const +BuilderStraight::create(Network * network, GlobalPosition3D p1, GlobalPosition3D p2) const { network->addStraight(p1, p2); } diff --git a/ui/builders/straight.h b/ui/builders/straight.h index 63f9a40..28eb66e 100644 --- a/ui/builders/straight.h +++ b/ui/builders/straight.h @@ -11,7 +11,7 @@ class BuilderStraight : public EditNetwork::Builder { void move(Network * network, const GeoData * geoData, const SDL_MouseMotionEvent & e, const Ray<GlobalPosition3D> & ray) override; - void create(Network * network, Position3D p1, Position3D p2) const; + void create(Network * network, GlobalPosition3D p1, GlobalPosition3D p2) const; - std::optional<Position3D> p1; + std::optional<GlobalPosition3D> p1; }; |