remove projectiontype

Signed-off-by: Francis Williams <francis@fwilliams.info>

Author: fwilliams

src/fvdb/GaussianSplat3d.cpp

@@ -47,13 +47,6 @@ usesOpenCVDistortion(const CameraModel cameraModel) {
            cameraModel == CameraModel::OPENCV_THIN_PRISM_12;
 }
 
-fvdb::detail::ops::ProjectionType
-projectionTypeForCameraModel(const CameraModel cameraModel) {
-    return cameraModel == CameraModel::ORTHOGRAPHIC
-               ? fvdb::detail::ops::ProjectionType::ORTHOGRAPHIC
-               : fvdb::detail::ops::ProjectionType::PERSPECTIVE;
-}
-
 ProjectionMethod
 resolveProjectionMethod(const CameraModel cameraModel, const ProjectionMethod projectionMethod) {
     if (projectionMethod == ProjectionMethod::AUTO) {
@@ -346,9 +339,10 @@ GaussianSplat3d::loadStateDict(const std::unordered_map<std::string, torch::Tens
 GaussianSplat3d::ProjectedGaussianSplats
 GaussianSplat3d::projectGaussiansImpl(const torch::Tensor &worldToCameraMatrices,
                                       const torch::Tensor &projectionMatrices,
-                                      const RenderSettings &settings) {
+                                      const RenderSettings &settings,
+                                      const CameraModel cameraModel) {
     FVDB_FUNC_RANGE();
-    const bool ortho = settings.projectionType == fvdb::detail::ops::ProjectionType::ORTHOGRAPHIC;
+    const bool ortho = cameraModel == CameraModel::ORTHOGRAPHIC;
     const int C      = worldToCameraMatrices.size(0); // number of cameras
     const int N      = mMeans.size(0);                // number of gaussians
 
@@ -361,10 +355,8 @@ GaussianSplat3d::projectGaussiansImpl(const torch::Tensor &worldToCameraMatrices
     TORCH_CHECK(projectionMatrices.is_contiguous(), "projectionMatrices must be contiguous");
 
     ProjectedGaussianSplats ret;
-    ret.mRenderSettings = settings;
-    ret.mCameraModel    = settings.projectionType == fvdb::detail::ops::ProjectionType::ORTHOGRAPHIC
-                              ? CameraModel::ORTHOGRAPHIC
-                              : CameraModel::PINHOLE;
+    ret.mRenderSettings   = settings;
+    ret.mCameraModel      = cameraModel;
     ret.mProjectionMethod = ProjectionMethod::ANALYTIC;
 
     // Track gradients for the 2D means in the backward pass if you're optimizing
@@ -475,11 +467,10 @@ GaussianSplat3d::projectGaussiansForCameraImpl(
         resolveProjectionMethod(cameraModel, projectionMethod);
 
     RenderSettings settingsForProjection = settings;
-    settingsForProjection.projectionType = projectionTypeForCameraModel(cameraModel);
 
     if (resolvedProjectionMethod == ProjectionMethod::ANALYTIC) {
         auto ret =
-            projectGaussiansImpl(worldToCameraMatrices, projectionMatrices, settingsForProjection);
+            projectGaussiansImpl(worldToCameraMatrices, projectionMatrices, settingsForProjection, cameraModel);
         ret.mCameraModel      = cameraModel;
         ret.mProjectionMethod = resolvedProjectionMethod;
         return ret;
@@ -658,9 +649,10 @@ GaussianSplat3d::SparseProjectedGaussianSplats
 GaussianSplat3d::sparseProjectGaussiansImpl(const JaggedTensor &pixelsToRender,
                                             const torch::Tensor &worldToCameraMatrices,
                                             const torch::Tensor &projectionMatrices,
-                                            const RenderSettings &settings) {
+                                            const RenderSettings &settings,
+                                            const CameraModel cameraModel) {
     FVDB_FUNC_RANGE();
-    const bool ortho = settings.projectionType == fvdb::detail::ops::ProjectionType::ORTHOGRAPHIC;
+    const bool ortho = cameraModel == CameraModel::ORTHOGRAPHIC;
     const int C      = worldToCameraMatrices.size(0); // number of cameras
     const int N      = mMeans.size(0);                // number of gaussians
 
@@ -680,7 +672,9 @@ GaussianSplat3d::sparseProjectGaussiansImpl(const JaggedTensor &pixelsToRender,
                 " cameras. ");
 
     SparseProjectedGaussianSplats ret;
-    ret.mRenderSettings = settings;
+    ret.mRenderSettings   = settings;
+    ret.mCameraModel      = cameraModel;
+    ret.mProjectionMethod = ProjectionMethod::ANALYTIC;
 
     // Deduplicate pixel coordinates. computeSparseInfo requires unique pixels because its
     // tile bitmask has one bit per pixel position. We scatter results back after rendering.
@@ -814,11 +808,10 @@ GaussianSplat3d::sparseProjectGaussiansForCameraImpl(
         resolveProjectionMethod(cameraModel, projectionMethod);
 
     RenderSettings settingsForProjection = settings;
-    settingsForProjection.projectionType = projectionTypeForCameraModel(cameraModel);
 
     if (resolvedProjectionMethod == ProjectionMethod::ANALYTIC) {
         auto ret = sparseProjectGaussiansImpl(
-            pixelsToRender, worldToCameraMatrices, projectionMatrices, settingsForProjection);
+            pixelsToRender, worldToCameraMatrices, projectionMatrices, settingsForProjection, cameraModel);
         ret.mCameraModel      = cameraModel;
         ret.mProjectionMethod = resolvedProjectionMethod;
         return ret;

src/fvdb/GaussianSplat3d.h

@@ -1443,7 +1443,8 @@ class GaussianSplat3d {
 
     ProjectedGaussianSplats projectGaussiansImpl(const torch::Tensor &worldToCameraMatrices,
                                                  const torch::Tensor &projectionMatrices,
-                                                 const fvdb::detail::ops::RenderSettings &settings);
+                                                 const fvdb::detail::ops::RenderSettings &settings,
+                                                 const CameraModel cameraModel);
 
     ProjectedGaussianSplats
     projectGaussiansForCameraImpl(const torch::Tensor &worldToCameraMatrices,
@@ -1463,7 +1464,8 @@ class GaussianSplat3d {
     sparseProjectGaussiansImpl(const JaggedTensor &pixelsToRender,
                                const torch::Tensor &worldToCameraMatrices,
                                const torch::Tensor &projectionMatrices,
-                               const fvdb::detail::ops::RenderSettings &settings);
+                               const fvdb::detail::ops::RenderSettings &settings,
+                               const CameraModel cameraModel);
 
     SparseProjectedGaussianSplats
     sparseProjectGaussiansForCameraImpl(const JaggedTensor &pixelsToRender,

src/fvdb/detail/ops/gsplat/GaussianRenderSettings.h

@@ -4,12 +4,13 @@
 #ifndef FVDB_DETAIL_OPS_GSPLAT_GAUSSIANRENDERSETTINGS_H
 #define FVDB_DETAIL_OPS_GSPLAT_GAUSSIANRENDERSETTINGS_H
 
+#include <fvdb/detail/ops/gsplat/GaussianCameras.cuh>
+
 #include <cstdint>
 
 namespace fvdb {
 namespace detail {
 namespace ops {
-enum ProjectionType { PERSPECTIVE, ORTHOGRAPHIC };
 
 struct RenderWindow2D {
     std::uint32_t width   = 0;
@@ -42,18 +43,17 @@ struct RenderSettings {
 
     std::uint32_t imageWidth;
     std::uint32_t imageHeight;
-    std::uint32_t imageOriginW    = 0;
-    std::uint32_t imageOriginH    = 0;
-    ProjectionType projectionType = ProjectionType::PERSPECTIVE;
-    RenderMode renderMode         = RenderMode::RGB;
-    float nearPlane               = 0.01;
-    float farPlane                = 1e10;
-    std::uint32_t tileSize        = 16;
-    float radiusClip              = 0.0;
-    float eps2d                   = 0.3;
-    bool antialias                = false;
-    int shDegreeToUse             = -1;
-    int numDepthSamples           = -1;
+    std::uint32_t imageOriginW = 0;
+    std::uint32_t imageOriginH = 0;
+    RenderMode renderMode      = RenderMode::RGB;
+    float nearPlane            = 0.01;
+    float farPlane             = 1e10;
+    std::uint32_t tileSize     = 16;
+    float radiusClip           = 0.0;
+    float eps2d                = 0.3;
+    bool antialias             = false;
+    int shDegreeToUse          = -1;
+    int numDepthSamples        = -1;
 };
 } // namespace ops
 } // namespace detail