Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4b121cefe444
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ddb85384030e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Dec 30, 2019

  1. Ancient history

    eggrobin committed Dec 30, 2019
    Copy the full SHA
    111441f View commit details

Commits on Dec 31, 2019

  1. Merge pull request #2422 from eggrobin/ancient-history

    Ancient history
    eggrobin authored Dec 31, 2019
    Copy the full SHA
    ddb8538 View commit details
Showing with 4 additions and 6 deletions.
  1. +4 −6 ksp_plugin/interface_planetarium.cpp
10 changes: 4 additions & 6 deletions ksp_plugin/interface_planetarium.cpp
Original file line number Diff line number Diff line change
@@ -217,9 +217,9 @@ Iterator* __cdecl principia__PlanetariumPlotPsychohistory(
}

// Returns an iterator for the rendered past trajectory of the celestial with
// the given index; the trajectory goes back as far as the history of the vessel
// with the given GUID, or, if no vessel is provided, up to |max_history_length|
// seconds before the present time.
// the given index; the trajectory goes back |max_history_length| seconds before
// the present time (or to the earliest time available if the relevant |t_min|
// is more recent).
Iterator* __cdecl principia__PlanetariumPlotCelestialTrajectoryForPsychohistory(
Planetarium const* const planetarium,
Plugin const* const plugin,
@@ -243,9 +243,7 @@ Iterator* __cdecl principia__PlanetariumPlotCelestialTrajectoryForPsychohistory(
plugin->GetCelestial(celestial_index).trajectory();
Instant const first_time = std::max(
plugin->CurrentTime() - max_history_length * Second,
vessel_guid == nullptr
? celestial_trajectory.t_min()
: plugin->GetVessel(vessel_guid)->psychohistory().t_min());
celestial_trajectory.t_min());
auto const rp2_lines =
planetarium->PlotMethod2(celestial_trajectory,
first_time,