Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
24b88728
Commit
24b88728
authored
Mar 21, 2015
by
Davis King
Browse files
Fixed fov parameter range for camera_transform.
parent
17a5b3ae
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
3 deletions
+10
-3
dlib/geometry/point_transforms.h
dlib/geometry/point_transforms.h
+8
-1
dlib/geometry/point_transforms_abstract.h
dlib/geometry/point_transforms_abstract.h
+2
-2
No files found.
dlib/geometry/point_transforms.h
View file @
24b88728
...
...
@@ -796,7 +796,7 @@ namespace dlib
*
this
=
camera_transform
(
vector
<
double
>
(
1
,
1
,
1
),
vector
<
double
>
(
0
,
0
,
0
),
vector
<
double
>
(
0
,
0
,
1
),
18
0
,
9
0
,
1
);
}
...
...
@@ -808,6 +808,13 @@ namespace dlib
const
unsigned
long
num_pixels_
)
{
// make sure requires clause is not broken
DLIB_CASSERT
(
0
<
camera_field_of_view_
&&
camera_field_of_view_
<
180
,
"
\t
camera_transform::camera_transform()"
<<
"
\n\t
Invalid inputs were given to this function."
<<
"
\n\t
camera_field_of_view_: "
<<
camera_field_of_view_
);
camera_pos
=
camera_pos_
;
camera_looking_at
=
camera_looking_at_
;
camera_up_direction
=
camera_up_direction_
;
...
...
dlib/geometry/point_transforms_abstract.h
View file @
24b88728
...
...
@@ -600,7 +600,7 @@ namespace dlib
- #get_camera_pos() == vector<double>(1,1,1)
- #get_camera_looking_at() == vector<double>(0,0,0)
- #get_camera_up_direction() == vector<double>(0,0,1)
- #get_camera_field_of_view() ==
180
- #get_camera_field_of_view() ==
90
- #get_num_pixels() == 1
!*/
...
...
@@ -613,7 +613,7 @@ namespace dlib
);
/*!
requires
- 0 < camera_field_of_view <
36
0
- 0 < camera_field_of_view <
18
0
ensures
- #get_camera_pos() == camera_pos
- #get_camera_looking_at() == camera_looking_at
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment