mockingbirdnest · Mar 21, 2017 · Mar 21, 2017 · Mar 21, 2017 · Mar 21, 2017 · Mar 21, 2017
Showing with 41 additions and 7 deletions.

+3 −0 ksp_plugin/plugin.cpp

+11 −0 ksp_plugin/vessel.cpp

+6 −1 ksp_plugin/vessel.hpp

+21 −6 ksp_plugin_adapter/ksp_plugin_adapter.cs
diff --git a/ksp_plugin/plugin.cpp b/ksp_plugin/plugin.cpp
@@ -389,6 +389,9 @@ void Plugin::InsertOrKeepVessel(GUID const& vessel_guid,
                                                     ephemeris_.get(),
                                                     prediction_parameters_));
   not_null<Vessel*> const vessel = it->second.get();
+  if (vessel->name() != vessel_name) {
+    vessel->set_name(vessel_name);
+  }
   kept_vessels_.emplace(vessel);
   vessel->set_parent(parent);
   if (loaded) {

diff --git a/ksp_plugin/vessel.cpp b/ksp_plugin/vessel.cpp
@@ -46,6 +46,7 @@ Vessel::Vessel(GUID const& guid,
       prediction_(make_not_null_unique<DiscreteTrajectory<Barycentric>>()) {}
 
 Vessel::~Vessel() {
+  LOG(INFO) << "Destroying vessel " << ShortDebugString();
   // The parts must remove themselves from their pile-ups *before* any of them
   // starts to destroy, otherwise |clear_pile_up| might access destroyed parts.
   for (auto const& pair : parts_) {
@@ -58,6 +59,16 @@ GUID const& Vessel::guid() const {
   return guid_;
 }
 
+std::string const& Vessel::name() const {
+  return name_;
+}
+
+void Vessel::set_name(std::string const& new_name) {
+  LOG(INFO) << "Vessel " << ShortDebugString() << " is now known as "
+            << new_name;
+  name_ = new_name;
+}
+
 not_null<MasslessBody const*> Vessel::body() const {
   return &body_;
 }

diff --git a/ksp_plugin/vessel.hpp b/ksp_plugin/vessel.hpp
@@ -59,6 +59,11 @@ class Vessel {
   // Returns the GUID passed at construction.
   virtual GUID const& guid() const;
 
+  // Returns the name.
+  virtual std::string const& name() const;
+  // Changes the name.
+  virtual void set_name(std::string const& new_name);
+
   // Returns the body for this vessel.
   virtual not_null<MasslessBody const*> body() const;
 
@@ -166,7 +171,7 @@ class Vessel {
   DiscreteTrajectory<Barycentric>::Iterator last_authoritative() const;
 
   GUID const guid_;
-  std::string const name_;
+  std::string name_;
 
   MasslessBody const body_;
   Ephemeris<Barycentric>::AdaptiveStepParameters

diff --git a/ksp_plugin_adapter/ksp_plugin_adapter.cs b/ksp_plugin_adapter/ksp_plugin_adapter.cs
@@ -423,8 +423,6 @@ public override void OnLoad(ConfigNode node) {
       String[] serializations = node.GetValues(principia_key);
       Log.Info("Serialization has " + serializations.Length + " chunks");
       foreach (String serialization in serializations) {
-        Log.Info("serialization is " + serialization.Length +
-                 " characters long");
         Interface.DeserializePlugin(serialization,
                                     serialization.Length,
                                     ref deserializer,
@@ -834,8 +832,8 @@ private System.Collections.IEnumerator
      // transforms of loaded vessels & their parts.
      if (has_active_vessel_in_space() && !FlightGlobals.ActiveVessel.packed &&
          plugin_.HasVessel(FlightGlobals.ActiveVessel.id.ToString())) {
-       // TODO(egg): move this to the C++, this is just to check that I
-       // understand the issue.
+       Vector3d q_correction_at_root_part = Vector3d.zero;
+       Vector3d v_correction_at_root_part = Vector3d.zero;
        foreach (Vessel vessel in FlightGlobals.VesselsLoaded) {
          // TODO(egg): if I understand anything, there should probably be a
          // special treatment for loaded packed vessels.  I don't understand
@@ -848,13 +846,28 @@ private System.Collections.IEnumerator
              continue;
            }
            QP part_actual_degrees_of_freedom =
-               plugin_.GetPartActualDegreesOfFreedom(part.flightID, FlightGlobals.ActiveVessel.rootPart.flightID);
+               plugin_.GetPartActualDegreesOfFreedom(
+                   part.flightID,
+                   FlightGlobals.ActiveVessel.rootPart.flightID);
+           if (part == FlightGlobals.ActiveVessel.rootPart) {
+             q_correction_at_root_part =
+                 (Vector3d)part_actual_degrees_of_freedom.q - part.rb.position;
+             v_correction_at_root_part =
+                 (Vector3d)part_actual_degrees_of_freedom.p - part.rb.velocity;
+           }
+
            // TODO(egg): use the centre of mass.  Here it's a bit tedious, some
            // transform nonsense must probably be done.
            part.rb.position = (Vector3d)part_actual_degrees_of_freedom.q;
            part.rb.velocity = (Vector3d)part_actual_degrees_of_freedom.p;
          }
        }
+       foreach (physicalObject physical_object in
+                FlightGlobals.physicalObjects.Where(o => o != null &&
+                                                    o.rb != null)) {
+         physical_object.rb.position += q_correction_at_root_part;
+         physical_object.rb.velocity += v_correction_at_root_part;
+       }
        QP main_body_dof = plugin_.CelestialWorldDegreesOfFreedom(
            FlightGlobals.ActiveVessel.mainBody.flightGlobalsIndex,
            FlightGlobals.ActiveVessel.rootPart.flightID);
@@ -948,7 +961,7 @@ private void ReportVesselsAndParts() {
           foreach (Part part in vessel.parts.Where((part) => part.rb != null)) {
             plugin_.InsertOrKeepLoadedPart(
                 part.flightID,
-                part.partName,
+                part.name,
                 part.physicsMass,
                 vessel.id.ToString(),
                 vessel.mainBody.flightGlobalsIndex,
@@ -965,6 +978,8 @@ private void ReportVesselsAndParts() {
         } else if (inserted) {
           foreach (ProtoPartSnapshot part in
                    vessel.protoVessel.protoPartSnapshots) {
+            // TODO(egg): perhaps we can live with the asteroids if we detect
+            // them here and reassign their flightID.
             plugin_.InsertUnloadedPart(
                 part.flightID,
                 part.partName,