Camera refactoring (#315)

* Camera Refactoring part 1 (Mac OS X)

* fixed camera*** -> Camera***

* Fixed build for cameras Zed/RealSense/RealSense2

* increased version to 0.17.7

* fixed build for cameras K4W2 and FlyCapture2
This commit is contained in:
matlabbe
2018-10-01 19:33:56 -04:00
committed by GitHub
parent eb38b9cfab
commit 0059a4bc1b
116 changed files with 7716 additions and 6799 deletions

View File

@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <rtabmap/utilite/UThread.h>
#include "MapBuilder.h"
#include <pcl/visualization/cloud_viewer.h>
#include <rtabmap/core/OdometryF2M.h>
#include <rtabmap/core/Odometry.h>
#include <QApplication>
#include <stdio.h>
@@ -103,7 +103,7 @@ int main(int argc, char * argv[])
if(camera.init(calibrationDir, calibrationName))
{
OdometryF2M odom;
Odometry * odom = Odometry::create();
Rtabmap rtabmap;
rtabmap.init();
@@ -121,7 +121,7 @@ int main(int argc, char * argv[])
if(cameraIteration++ % odomUpdate == 0)
{
OdometryInfo info;
Transform pose = odom.process(data, &info);
Transform pose = odom->process(data, &info);
if(odometryIteration++ % mapUpdate == 0)
{
@@ -148,6 +148,7 @@ int main(int argc, char * argv[])
data = camera.takeImage();
}
delete odom;
if(mapBuilder.isVisible())
{