generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove old camera, rename new camera

Browse Source
This commit is contained in:
ozantonkal
2013-08-05 15:37:08 +02:00
parent f060eee5a5
commit 119d97f1f6
8 changed files with 20 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/viz/include/opencv2/viz/types.hpp
View File

@@ -94,12 +94,12 @@ namespace cv
unsigned int key_state;
};
class CV_EXPORTS Camera2
class CV_EXPORTS Camera
{
public:
Camera2(float f_x, float f_y, float c_x, float c_y, const Size &window_size);
Camera2(const Vec2f &fov, const Size &window_size);
Camera2(const cv::Mat &K, const Size &window_size);
Camera(float f_x, float f_y, float c_x, float c_y, const Size &window_size);
Camera(const Vec2f &fov, const Size &window_size);
Camera(const cv::Mat &K, const Size &window_size);
inline const Vec2d & getClip() const { return clip_; }
inline void setClip(const Vec2d &clip) { clip_ = clip; }

3
modules/viz/include/opencv2/viz/viz3d.hpp
View File

@@ -39,7 +39,8 @@ namespace cv
void updateWidgetPose(const String &id, const Affine3f &pose);
Affine3f getWidgetPose(const String &id) const;
void setCamera(const Camera2 &camera);
void setCamera(const Camera &camera);
Camera getCamera() const;
Affine3f getViewerPose();
void setViewerPose(const Affine3f &pose);