OrgLion-ML
/
dlib
mirror of https://github.com/davisking/dlib.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Made the camera_transform output the point's distance.

This commit is contained in:
Davis King 2015-06-02 18:06:29 -04:00
parent 1294d6d398
commit acca22a9e2
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlib/geometry/point_transforms.h
View File

@ -853,13 +853,14 @@ namespace dlib
inline dpoint operator() (
const vector<double>& p,
double& scale
double& scale,
double& distance
) const
{
vector<double> temp = p-camera_pos;
temp = proj*temp;
const double distance = temp.z()>0 ? temp.z() : 1e-9;
scale = dist_scale/distance;
distance = temp.z();
scale = dist_scale/(temp.z()>0 ? temp.z() : 1e-9);
temp.x() = temp.x()*scale + width;
temp.y() = temp.y()*scale + width;
return temp;
@ -869,8 +870,8 @@ namespace dlib
const vector<double>& p
) const
{
double scale;
return (*this)(p,scale);
double scale, distance;
return (*this)(p,scale,distance);
}
inline friend void serialize (const camera_transform& item, std::ostream& out)

6
dlib/geometry/point_transforms_abstract.h
View File

@ -644,7 +644,8 @@ namespace dlib
dpoint operator() (
const vector<double>& p,
double& scale
double& scale,
double& distance
) const;
/*!
ensures
@ -654,6 +655,9 @@ namespace dlib
- #scale == a number that tells you how large things are at the point p.
Objects further from the camera appear smaller, in particular, they
appear #scale times their normal size.
- #distance == how far away the point is from the image plane. Objects in
front of the camera will have a positive distance and those behind a
negative distance.
!*/
vector<double> get_camera_pos(