diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/builders/freeExtend.h | 2 | ||||
| -rw-r--r-- | ui/builders/straight.cpp | 2 | ||||
| -rw-r--r-- | ui/builders/straight.h | 4 | ||||
| -rw-r--r-- | ui/editNetwork.h | 2 |
4 files changed, 5 insertions, 5 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; }; diff --git a/ui/editNetwork.h b/ui/editNetwork.h index c8a2f13..23dcf43 100644 --- a/ui/editNetwork.h +++ b/ui/editNetwork.h @@ -21,7 +21,7 @@ public: void render(const SceneShader &) const override; void render(const UIShader & shader, const UIComponent::Position & pos) const override; - using NetworkClickPos = std::variant<Position3D, Node::Ptr>; + using NetworkClickPos = std::variant<GlobalPosition3D, Node::Ptr>; class Builder { public: |