Multiple flight plans #3400
Merged
Multiple flight plans #3400
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pleroy
reviewed
Jul 23, 2022
| flight_plans_.emplace(it, std::get<serialization::FlightPlan>(original)); | ||
| } else if (std::holds_alternative<not_null<std::unique_ptr<FlightPlan>>>( | ||
| original)) { | ||
| std::get<not_null<std::unique_ptr<FlightPlan>>>(original)->WriteToMessage( |
There was a problem hiding this comment.
This code is somewhat worrisome as it assumes that the serialized form can be freely copied. A comment would be welcome.
There was a problem hiding this comment.
Added a comment; the one we should adjust would probably not be this one anyway.
ksp_plugin/vessel.hpp
Outdated
| serialization::FlightPlan> flight_plan_; | ||
| std::vector<std::variant<not_null<std::unique_ptr<FlightPlan>>, | ||
| serialization::FlightPlan>> flight_plans_; | ||
| int selected_flight_plan_ = -1; |
There was a problem hiding this comment.
Could we make this an optional? It would be safer, just say no to magic values.
There was a problem hiding this comment.
As discussed, this would probably not help readability.
pleroy
reviewed
Jul 23, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Towards #3382.
This change extends the existing API of
Vessel: in the absence of calls to the new functionsSelectFlightPlanandDuplicateFlightPlan, or to the pre-existingCreateFlightPlanon a vessel with a flight plan, semantics are preserved.A vessel may now have up to 10 flight plans (labeled
AthroughJin English); they are deserialized lazily independently from each other. Additional flight plans are created either by pressing+to add a new blank flight plan, or by duplicating an existing flight plan.For now, it is not possible to simultaneously display two flight plans; nor can flight plans be named or reordered.