commit 381b398bb0f120b4fb2f0dc019b9b5b978b5f1c0
parent dd2ca0cd2d1b83e0b5c920ab26b9c37125c229b3
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Thu, 5 Jan 2023 11:58:55 +0100
Merge branch 'release_0.1'
Diffstat:
15 files changed, 105 insertions(+), 49 deletions(-)
diff --git a/README.md b/README.md
@@ -15,9 +15,15 @@ the install directories of its dependencies. The resulting project can be
edited, built, tested and installed as any CMake project. Refer to the
[CMake](https://cmake.org/documentation) for further informations on CMake.
+## Release notes
+
+### Version 0.1
+
+Add the `scam_perspective_get_solid_angle` function.
+
## License
-Copyright (C) 2021 [|Meso|Star>](https://www.meso-star.com)
+Copyright (C) 2021-2023 [|Méso|Star>](https://www.meso-star.com)
(<contact@meso-star.com>). Star-Camera is free software
released under the GPL v3+ license: GNU GPL version 3 or later. You are welcome
to redistribute it under certain conditions; refer to the COPYING file for
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 |Meso|Star> (contact@meso-star.com)
+# Copyright (C) 2021-2023 |Méso|Star> (contact@meso-star.com)
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -37,7 +37,7 @@ include_directories(${RSys_INCLUDE_DIR})
# Configure and define targets
################################################################################
set(VERSION_MAJOR 0)
-set(VERSION_MINOR 0)
+set(VERSION_MINOR 1)
set(VERSION_PATCH 0)
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
diff --git a/src/scam.c b/src/scam.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2021-2023 |Méso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/scam.h b/src/scam.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2021-2023 |Méso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -82,7 +82,7 @@ struct scam_perspective_args {
double aspect_ratio; /* Image plane aspect ratio (width / height) */
double lens_radius; /* Radius of 0 <=> pinhole */
- /* Vertical field of view in radians. Used when lens_radius == 0 */
+ /* Vertical field of view in radians. It indirectly defined the focal length*/
double field_of_view;
/* Distance to focus on. Used when lens_radius != 0. Note that the focal
@@ -161,6 +161,11 @@ scam_field_of_view_to_focal_length
const double field_of_view,
double* focal_length);
+SCAM_API res_T
+scam_perspective_get_solid_angle
+ (const struct scam* camera,
+ double* solid_angle); /* In sr */
+
END_DECLS
#endif /* SCAM_H */
diff --git a/src/scam_c.h b/src/scam_c.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2021-2023 |Méso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -27,6 +27,7 @@ struct perspective {
double position[3]; /* Lens position */
+ double solid_angle; /* In sr */
double rcp_tan_half_fov; /* 1 / tan(vertical_fov / 2) */
double aspect_ratio; /* width / height */
double lens_radius; /* 0 <=> pinhole camera */
@@ -36,6 +37,7 @@ struct perspective {
{1,0,0, 0,1,0, 0,0,1}, /* Screen to world transformation */ \
{1,0,0, 0,1,0, 0,0,1}, /* Camera to world transformation */ \
{0,0,0}, /* Lens position */ \
+ 0.60111772988434627069, /* horizontal_fov * 2*sin(vertical_fov/2) */ \
1.0, /* 1/tan(vertical_fov/2) */ \
1.0, /* Aspect ratio */ \
0.0, /* Lens radius */ \
diff --git a/src/scam_log.c b/src/scam_log.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2021-2023 |Méso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/scam_log.h b/src/scam_log.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2021-2023 |Méso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/scam_orthographic.c b/src/scam_orthographic.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2021-2023 |Méso|Star> (contact@meso-star.com)
*
* Tyhis program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/scam_perspective.c b/src/scam_perspective.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2021-2023 |Méso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -26,48 +26,55 @@
* Helper functions
******************************************************************************/
static res_T
-setup_perspective(struct scam* cam, const struct scam_perspective_args* args)
+check_perspective_args
+ (struct scam* cam,
+ const struct scam_perspective_args* args)
{
- double x[3], y[3], z[3];
- int pinhole = 0;
- res_T res = RES_OK;
- ASSERT(cam && args && cam->type == SCAM_PERSPECTIVE);
-
- cam->param.persp = PERSPECTIVE_DEFAULT;
- pinhole = args->lens_radius == 0;
+ if(!args) return RES_BAD_ARG;
+ /* Invalid aspect ratio */
if(args->aspect_ratio <= 0) {
- log_err(cam,
- "perspective camera: invalid aspect ratio: %g\n",
+ log_err(cam,"perspective camera: invalid aspect ratio: %g\n",
args->aspect_ratio);
- res = RES_BAD_ARG;
- goto error;
+ return RES_BAD_ARG;
}
+ /* Invalid lens radius */
if(args->lens_radius < 0) {
- log_err(cam,
- "perspective camera: invalid negative lens radius: %g\n",
+ log_err(cam,"perspective camera: invalid negative lens radius: %g\n",
args->lens_radius);
- res = RES_BAD_ARG;
- goto error;
+ return RES_BAD_ARG;
}
- if(!pinhole && args->focal_distance < 0) {
- log_err(cam,
- "perspective camera: invalid negative focal distance: %g\n",
+ /* Invalid focal distance */
+ if(args->lens_radius > 0 && args->focal_distance < 0) {
+ log_err(cam, "perspective camera: invalid negative focal distance: %g\n",
args->focal_distance);
- res = RES_BAD_ARG;
- goto error;
+ return RES_BAD_ARG;
}
+ /* Invalid field of view */
if(args->field_of_view <= 0 || args->field_of_view >= PI) {
- log_err(cam,
- "perspective camera: invalid vertical field of view: %g\n",
+ log_err(cam, "perspective camera: invalid vertical field of view: %g\n",
args->field_of_view);
- res = RES_BAD_ARG;
- goto error;
+ return RES_BAD_ARG;
}
+ return RES_OK;
+}
+
+static res_T
+setup_perspective(struct scam* cam, const struct scam_perspective_args* args)
+{
+ double hfov; /* Horizotal field of view */
+ double half_vfov; /* (Vertical vield of view) / 2 */
+ double tan_half_vfov;
+ double x[3], y[3], z[3];
+ res_T res = RES_OK;
+ ASSERT(cam && args && cam->type == SCAM_PERSPECTIVE);
+
+ cam->param.persp = PERSPECTIVE_DEFAULT;
+
if(d3_normalize(z, d3_sub(z, args->target, args->position)) <= 0
|| d3_normalize(x, d3_cross(x, z, args->up)) <= 0
|| d3_normalize(y, d3_cross(y, z, x)) <= 0) {
@@ -81,7 +88,10 @@ setup_perspective(struct scam* cam, const struct scam_perspective_args* args)
goto error;
}
- cam->param.persp.rcp_tan_half_fov = 1.0/tan(args->field_of_view*0.5);
+ half_vfov = args->field_of_view*0.5;
+ tan_half_vfov = tan(half_vfov);
+
+ cam->param.persp.rcp_tan_half_fov = 1.0/tan_half_vfov;
cam->param.persp.aspect_ratio = args->aspect_ratio;
cam->param.persp.lens_radius = args->lens_radius;
cam->param.persp.focal_distance = args->focal_distance;
@@ -96,6 +106,10 @@ setup_perspective(struct scam* cam, const struct scam_perspective_args* args)
d3_set(cam->param.persp.camera2world+3, y);
d3_set(cam->param.persp.camera2world+6, z);
+ /* Compute the solid angle of the camera */
+ hfov = 2*atan(args->aspect_ratio * tan_half_vfov);
+ cam->param.persp.solid_angle = hfov * 2*sin(half_vfov);
+
exit:
return res;
error:
@@ -215,9 +229,10 @@ scam_create_perspective
res = RES_BAD_ARG;
goto error;
}
-
res = camera_create(logger, allocator, verbose, SCAM_PERSPECTIVE, &cam);
if(res != RES_OK) goto error;
+ res = check_perspective_args(cam, args);
+ if(res != RES_OK) goto error;
res = setup_perspective(cam, args);
if(res != RES_OK) goto error;
@@ -233,6 +248,16 @@ error:
}
res_T
+scam_perspective_get_solid_angle(const struct scam* camera, double* solid_angle)
+{
+ if(!camera || camera->type != SCAM_PERSPECTIVE || !solid_angle)
+ return RES_BAD_ARG;
+
+ *solid_angle = camera->param.persp.solid_angle;
+ return RES_OK;
+}
+
+res_T
scam_focal_length_to_field_of_view
(const double lens_radius,
const double focal_length,
diff --git a/src/test_scam_cbox.c b/src/test_scam_cbox.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2021-2023 |Méso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/test_scam_cbox.h b/src/test_scam_cbox.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2021-2023 |Méso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -106,11 +106,11 @@ const double cbox_cols[] = {
#undef RED
#undef GREEN
-const unsigned cbox_nvtxs = sizeof(cbox_vtxs) / sizeof(float[3]);
-const unsigned cbox_ntris = sizeof(cbox_tris) / sizeof(unsigned[3]);
+const unsigned cbox_nvtxs = sizeof(cbox_vtxs) / (sizeof(float)*3);
+const unsigned cbox_ntris = sizeof(cbox_tris) / (sizeof(unsigned)*3);
STATIC_ASSERT
- ( sizeof(cbox_tris)/sizeof(unsigned[3])
- == sizeof(cbox_cols)/sizeof(double[3]), Unexpected_data_layout);
+ ( sizeof(cbox_tris)/(sizeof(unsigned)*3)
+ == sizeof(cbox_cols)/(sizeof(double)*3), Unexpected_data_layout);
/*******************************************************************************
* Functions
diff --git a/src/test_scam_orthographic.c b/src/test_scam_orthographic.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2021-2023 |Méso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -40,6 +40,7 @@ main(int argc, char** argv)
double axis_x[3];
double axis_y[3];
double axis_z[3];
+ double solid_angle;
size_t i;
enum scam_type type = SCAM_NONE;
(void)argc, (void)argv;
@@ -92,6 +93,7 @@ main(int argc, char** argv)
args.aspect_ratio = 16.0/9.0;
CHK(scam_create_orthographic(NULL, NULL, 1, &args, &cam) == RES_OK);
+ CHK(scam_perspective_get_solid_angle(cam, &solid_angle) == RES_BAD_ARG);
/* Precompute camera parameters */
d3_normalize(axis_z, d3_sub(axis_z, args.target, args.position));
diff --git a/src/test_scam_perspective_pinhole.c b/src/test_scam_perspective_pinhole.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2021-2023 |Méso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -48,6 +48,8 @@ main(int argc, char** argv)
double sin_hori_hfov; /* Sinus of the horizontal half field of view */
double sin_vert_hfov; /* Sinos of the vertical half field of view */
double img_depth;
+ double solid_angle;
+ double ref;
size_t i = 0;
enum scam_type type = SCAM_NONE;
(void)argc, (void)argv;
@@ -112,9 +114,23 @@ main(int argc, char** argv)
args.up[1] = rand_canonical();
args.up[2] = rand_canonical();
args.field_of_view = PI/2.0;
- args.aspect_ratio = 4.0/3.0;
+ args.aspect_ratio = 1.0;
CHK(scam_create_perspective(NULL, NULL, 1, &args, &cam) == RES_OK);
+ CHK(scam_perspective_get_solid_angle(NULL, &solid_angle) == RES_BAD_ARG);
+ CHK(scam_perspective_get_solid_angle(cam, NULL) == RES_BAD_ARG);
+ CHK(scam_perspective_get_solid_angle(cam, &solid_angle) == RES_OK);
+
+ ref = args.field_of_view * 2*sin(args.field_of_view/2);
+ CHK(eq_eps(solid_angle, ref, 1.e-6));
+ CHK(scam_ref_put(cam) == RES_OK);
+
+ args.aspect_ratio = 4.0/3.0;
+ CHK(scam_create_perspective(NULL, NULL, 1, &args, &cam) == RES_OK);
+
+ CHK(scam_perspective_get_solid_angle(cam, &solid_angle) == RES_OK);
+ ref = 2.6227869472431911;
+ CHK(eq_eps(solid_angle, ref, 1.e-6));
/* Precompute some view frustum constants */
d3_normalize(axis_z, d3_sub(axis_z, args.target, args.position));
diff --git a/src/test_scam_perspective_thin_lens.c b/src/test_scam_perspective_thin_lens.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2021-2023 |Méso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/test_scam_utils.h b/src/test_scam_utils.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2021-2023 |Méso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
