Permalink
Browse files

Bundlevis now accepts control networks, it will also tell you what

images a point was seen in. Still very buggy.
  • Loading branch information...
1 parent 0f17f36 commit e48885db524271b407810e4e014e335e0b20f6b7 Zack Moratto committed Jun 19, 2008
Showing with 334 additions and 78 deletions.
  1. +1 −1 configure.ac
  2. +4 −3 src/BundleAdjustUtils.cc
  3. +282 −57 src/bundlevis.cc
  4. +47 −17 src/bundlevis.h
View
@@ -278,7 +278,7 @@ AX_APP(NURBS, [src], no, [BOOST BOOST_PROGRAM_OPTIONS VW MBA])
AX_APP(CTXIMAGE, [src], no, [BOOST BOOST_PROGRAM_OPTIONS VW VW_CARTOGRAPHY])
AX_APP(RMAX2CAHVOR, [src], no, [BOOST VW VW_CAMERA BOOST_PROGRAM_OPTIONS BOOST_FILESYSTEM])
AX_APP(RMAXADJUST, [src], no, [BOOST BOOST_PROGRAM_OPTIONS BOOST_FILESYSTEM VW VW_CAMERA VW_STEREO VW_INTEREST_POINT LAPACK])
-AX_APP(BUNDLEVIS, [src], no, [BOOST BOOST_PROGRAM_OPTIONS OPENSCENEGRAPH])
+AX_APP(BUNDLEVIS, [src], no, [BOOST BOOST_PROGRAM_OPTIONS OPENSCENEGRAPH VW VW_CAMERA])
##################################################
# final processing
View
@@ -71,11 +71,12 @@ void add_matched_points(ControlNetwork& cnet,
} else if ( pos1 == cnet.size() && pos2 == cnet.size() ) { // Contains neither
// ... create a stereo model for this image pair...
StereoModel sm(*(camera_models[camera_id1]), *(camera_models[camera_id2]));
- if ( sm.convergence_angle(m1.position(), m2.position()) > min_convergence_angle) {
+ // if ( sm.convergence_angle(m1.position(), m2.position()) > min_convergence_angle) {
ControlPoint cpoint(ControlPoint::TiePoint);
double error;
- cpoint.set_position(sm(m1.position(), m2.position(), error));
+
+ cpoint.set_position(sm(m1.position(), m2.position(), error));
// The stereo model returns a null point, in some cases where
// the rays are very close to parallel, or if the point would
@@ -86,7 +87,7 @@ void add_matched_points(ControlNetwork& cnet,
cpoint.add_measure(m2);
cnet.add_control_point(cpoint);
}
- }
+ // }
} else if (pos1 != pos2) { // Contains both, but in seperate control points
ControlPoint& p1 = cnet[pos1];
ControlPoint& p2 = cnet[pos2];
Oops, something went wrong.

0 comments on commit e48885d

Please sign in to comment.