diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-02-24 00:27:49 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-02-24 00:27:49 +0000 |
| commit | 744e6ad2fb88671800e39db33d08b2cd451c8338 (patch) | |
| tree | 563da22ef0240131fe0540e9ccc3fed5d10fc9a2 /ui | |
| parent | Simplify vector addition/subtraction with differnt types (diff) | |
| parent | First cut of terrain deformation (diff) | |
| download | ilt-744e6ad2fb88671800e39db33d08b2cd451c8338.tar.bz2 ilt-744e6ad2fb88671800e39db33d08b2cd451c8338.tar.xz ilt-744e6ad2fb88671800e39db33d08b2cd451c8338.zip | |
Psycho-rebased branch deform-terrain on top of main
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/builders/freeExtend.cpp | 6 | ||||
| -rw-r--r-- | ui/builders/straight.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ui/builders/freeExtend.cpp b/ui/builders/freeExtend.cpp index 47356c3..db127e6 100644 --- a/ui/builders/freeExtend.cpp +++ b/ui/builders/freeExtend.cpp @@ -19,7 +19,7 @@ BuilderFreeExtend::move( candidateLinks.objects = network->candidateJoins(*p1, p->pos); } else if (const auto p = geoData->intersectRay(ray)) { - candidateLinks.objects = network->candidateExtend(*p1, *p); + candidateLinks.objects = network->candidateExtend(*p1, p->first); } else { candidateLinks.removeAll(); @@ -42,8 +42,8 @@ BuilderFreeExtend::click( p1 = p->pos; } else if (const auto p = geoData->intersectRay(ray)) { - network->addExtend(*p1, *p); - p1 = *p; + network->addExtend(*p1, p->first); + p1 = p->first; } } else { diff --git a/ui/builders/straight.cpp b/ui/builders/straight.cpp index 0c4a3e2..43f5ec8 100644 --- a/ui/builders/straight.cpp +++ b/ui/builders/straight.cpp @@ -16,7 +16,7 @@ BuilderStraight::move( { if (p1) { if (const auto p = geoData->intersectRay(ray)) { - candidateLinks.objects = network->candidateStraight(*p1, *p); + candidateLinks.objects = network->candidateStraight(*p1, p->first); } else { candidateLinks.removeAll(); @@ -32,12 +32,12 @@ BuilderStraight::click( case SDL_BUTTON_LEFT: if (const auto p = geoData->intersectRay(ray)) { if (p1) { - create(network, *p1, *p); + create(network, *p1, p->first); candidateLinks.removeAll(); p1.reset(); } else { - p1 = p; + p1 = p->first; } } return; |