Free Motion Capture for Everyone πβ¨
TypeScript
next step - bongo bonkers visualization :D
jonmatthisf605dc592ff2
diff --git a/freemocap/pipelines/calibration_pipeline/least_squares_optimizer.py b/freemocap/pipelines/calibration_pipeline/least_squares_optimizer.pyindex 9c4767dd..807f85b4 100644--- a/freemocap/pipelines/calibration_pipeline/least_squares_optimizer.py+++ b/freemocap/pipelines/calibration_pipeline/least_squares_optimizer.py@@ -91,7 +91,7 @@ class SparseBundleOptimizer(BaseModel):jac="3-point", # TODO- could prob use `callable` and calc the jacobian dynamicallyf_scale=50.0, # TODO - Not sure where this number comes fromx_scale="jac",- loss="soft_l1",#"linear", # TODO - try `soft_l1` or `cauchy`+ loss="cauchy",#"linear", # TODO - try `soft_l1` or `cauchy`# ftol=1e-4,method="trf",verbose=2,diff --git a/freemocap/pipelines/calibration_pipeline/multi_camera_calibrator.py b/freemocap/pipelines/calibration_pipeline/multi_camera_calibrator.pyindex 5234df0f..0f17d09c 100644--- a/freemocap/pipelines/calibration_pipeline/multi_camera_calibrator.py+++ b/freemocap/pipelines/calibration_pipeline/multi_camera_calibrator.py@@ -31,7 +31,7 @@ class MultiCameraCalibrator(BaseModel):single_camera_calibrators: dict[CameraId, SingleCameraCalibrator] | None = Nonemulti_camera_calibration_estimate: MultiCameraCalibrationEstimate | None = None- spare_bundle_optimizer: SparseBundleOptimizer | None = None+ sparse_bundle_optimizer: SparseBundleOptimizer | None = Noneminimum_views_to_reconstruct: int | None = 20@property@@ -116,7 +116,7 @@ class MultiCameraCalibrator(BaseModel):transform_to_principal_camera_by_camera = self._calculate_camera_to_principal_camera_transforms(camera_pair_secondary_camera_transform_estimates)- self.spare_bundle_optimizer = SparseBundleOptimizer.create(principal_camera_id=self.principal_camera_id,+ self.sparse_bundle_optimizer = SparseBundleOptimizer.create(principal_camera_id=self.principal_camera_id,camera_extrinsics_by_camera_id={camera_id: transform.extrinsics_matrixfor camera_id, transform in transform_to_principal_camera_by_camera.items()},@@ -126,8 +126,15 @@ class MultiCameraCalibrator(BaseModel):camera_id, calibrator inself.single_camera_calibrators.items()})- optimization_result = self.spare_bundle_optimizer.optimize()- return self.multi_camera_calibration_estimate+ optimization_result = self.sparse_bundle_optimizer.optimize()+ camera_transforms = {}+ for camera_index, camera_id in enumerate(self.single_camera_calibrators.keys()):+ # split the 1d vector by camera based on `self.number_of_parameters_per_camera`+ starting_index = camera_index * self.sparse_bundle_optimizer.number_of_parameters_per_camera+ ending_index = (camera_index + 1) * self.number_of_parameters_per_camera+ camera_transforms[camera_id] = TransformationMatrix.from_extrinsics(+ extrinsics_matrix=np.array(optimization_result[starting_index:ending_index]).reshape(3, 4),+ reference_frame=f"camera-{self.principal_camera_id}")def _calculate_camera_to_principal_camera_transforms(self, camera_pair_secondary_camera_transform_estimates) -> \dict[CameraId, TransformationMatrix]: