Formatting fixes

PhotonVision · Nov 24, 2023 · 7123f30 · 7123f30
1 parent 4826b18
commit 7123f30
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/photon-targeting/src/main/native/cpp/photon/targeting/MultiTargetPNPResult.cpp b/photon-targeting/src/main/native/cpp/photon/targeting/MultiTargetPNPResult.cpp
@@ -22,10 +22,10 @@
 namespace photon {
 
 bool MultiTargetPNPResult::operator==(const MultiTargetPNPResult& other) const {
-  return other.best == best &&
-         other.bestReprojErr == bestReprojErr && other.alt == alt &&
-         other.altReprojErr == altReprojErr && other.ambiguity == ambiguity
-         && other.fiducialIdsUsed == fiducialIdsUsed;
+  return other.best == best && other.bestReprojErr == bestReprojErr &&
+         other.alt == alt && other.altReprojErr == altReprojErr &&
+         other.ambiguity == ambiguity &&
+         other.fiducialIdsUsed == fiducialIdsUsed;
 }
 }  // namespace photon
 

diff --git a/photon-targeting/src/main/native/cpp/photon/targeting/PhotonPipelineResult.cpp b/photon-targeting/src/main/native/cpp/photon/targeting/PhotonPipelineResult.cpp
@@ -45,12 +45,14 @@ wpi::Protobuf<photon::PhotonPipelineResult>::Unpack(
     targets.emplace_back(wpi::UnpackProtobuf<photon::PhotonTrackedTarget>(t));
   }
 
-  if(m->has_multi_target_result()) {
+  if (m->has_multi_target_result()) {
     return photon::PhotonPipelineResult{
         units::millisecond_t{m->latency_ms()}, targets,
-        wpi::UnpackProtobuf<photon::MultiTargetPNPResult>(m->multi_target_result())};
+        wpi::UnpackProtobuf<photon::MultiTargetPNPResult>(
+            m->multi_target_result())};
   } else {
-    return photon::PhotonPipelineResult{units::millisecond_t{m->latency_ms()}, targets};
+    return photon::PhotonPipelineResult{units::millisecond_t{m->latency_ms()},
+                                        targets};
   }
 }
 
@@ -65,7 +67,8 @@ void wpi::Protobuf<photon::PhotonPipelineResult>::Pack(
     wpi::PackProtobuf(m->add_targets(), t);
   }
 
-  if(value.multitagResult.has_value()) {
-    wpi::PackProtobuf(m->mutable_multi_target_result(), value.multitagResult.value());
+  if (value.multitagResult.has_value()) {
+    wpi::PackProtobuf(m->mutable_multi_target_result(),
+                      value.multitagResult.value());
   }
 }
diff --git a/photon-targeting/src/main/native/include/photon/targeting/PhotonPipelineResult.h b/photon-targeting/src/main/native/include/photon/targeting/PhotonPipelineResult.h
@@ -17,9 +17,9 @@
 
 #pragma once
 
+#include <optional>
 #include <span>
 #include <string>
-#include <optional>
 
 #include <frc/Errors.h>
 #include <units/time.h>
@@ -104,9 +104,12 @@ class PhotonPipelineResult {
   units::second_t GetTimestamp() const { return timestamp; }
 
   /**
-   * Return the MultiTarget Result. Empty if disabled or unable to create result.
+   * Return the MultiTarget Result. Empty if disabled or unable to create
+   * result.
    */
-  std::optional<MultiTargetPNPResult> MultiTagResult() { return multitagResult; }
+  std::optional<MultiTargetPNPResult> MultiTagResult() {
+    return multitagResult;
+  }
 
   /**
    * Sets the timestamp in seconds