mirror of
https://github.com/introlab/rtabmap.git
synced 2026-09-12 14:30:19 +08:00
Tango refactoring (#534)
* Created general CameraMobile interface. Tango is now optional. Camera is disabled on visualizaion (battery saving). * Working android app on non-tango android phones (tested on x86_64 android emulator). * fixed typo * android: updated tango not available msg * android: fixed build with latest android sdk/ndk * Added ARCore limited support for pose and rgb streams. * Added AREngine support. Don't assert if depth size is not a modulo of rgb size. * Added ARCore shared camera support * android: fixed read/write runtime permissions for >=api23. arcore ndk: added feature point cloud. Fixed file sharing persmissions (>=api24 issue) * ARCore NDK: mapping with feature point cloud * android: Added post build strip command to reduce native library size * android: fixed some compilation issues * android: put back gtsam as default optimizer, manifest min api is dynamic based on cmake parameters * AREngine: min api 24 * android: Fixed build without AREngine * android: fixed not available libraries for API<24 * android: fixed build with old cmake versions * android: set arcore min api to 23 * android: fixed arengine error on start when not built with native arengine support * android: fixed tango camera permission for api>=23 * Added bionic android docker files * Fixed wrong 3D words projection when depth size is not an exact multiple of rgb size. DbViewer: fixed images size not correctly shown in label of the calibration. ImageView: fixed depth scale when depth size is not a multiple of rgb size * CameraMobile: added exact display rotation for local transform * DbViewer: fixed gravity link shown in constraint view, show full local transform matrix in camera calibration label * Android: fixed localization mode in visualization, fixed some tansitions between some UI states * Android: Hide stop button when HUD is hidden. Updated About years.
This commit is contained in:
+31
-14
@@ -79,7 +79,8 @@ Scene::Scene() :
|
||||
graphVisible_(true),
|
||||
gridVisible_(true),
|
||||
traceVisible_(true),
|
||||
color_camera_to_display_rotation_(ROTATION_0),
|
||||
frustumVisible_(true),
|
||||
color_camera_to_display_rotation_(rtabmap::ROTATION_0),
|
||||
currentPose_(0),
|
||||
graph_shader_program_(0),
|
||||
blending_(true),
|
||||
@@ -108,6 +109,7 @@ Scene::Scene() :
|
||||
Scene::~Scene() {
|
||||
DeleteResources();
|
||||
delete gesture_camera_;
|
||||
delete currentPose_;
|
||||
}
|
||||
|
||||
//Should only be called in OpenGL thread!
|
||||
@@ -126,7 +128,6 @@ void Scene::InitGLContent()
|
||||
trace_ = new tango_gl::Trace();
|
||||
grid_ = new tango_gl::Grid();
|
||||
box_ = new BoundingBoxDrawable();
|
||||
currentPose_ = new rtabmap::Transform();
|
||||
|
||||
|
||||
axis_->SetScale(glm::vec3(0.5f,0.5f,0.5f));
|
||||
@@ -158,7 +159,6 @@ void Scene::DeleteResources() {
|
||||
delete frustum_;
|
||||
delete trace_;
|
||||
delete grid_;
|
||||
delete currentPose_;
|
||||
delete box_;
|
||||
}
|
||||
|
||||
@@ -367,6 +367,10 @@ bool intersectFrustumAABB(
|
||||
int Scene::Render() {
|
||||
UASSERT(gesture_camera_ != 0);
|
||||
|
||||
if(currentPose_ == 0)
|
||||
{
|
||||
currentPose_ = new rtabmap::Transform(0,0,0,0,0,-M_PI/2.0f);
|
||||
}
|
||||
glm::vec3 position(currentPose_->x(), currentPose_->y(), currentPose_->z());
|
||||
Eigen::Quaternionf quat = currentPose_->getQuaternionf();
|
||||
glm::quat rotation(quat.w(), quat.x(), quat.y(), quat.z());
|
||||
@@ -493,7 +497,7 @@ int Scene::Render() {
|
||||
|
||||
if(!currentPose_->isNull())
|
||||
{
|
||||
if (gesture_camera_->GetCameraType() != tango_gl::GestureCamera::kFirstPerson)
|
||||
if (frustumVisible_ && gesture_camera_->GetCameraType() != tango_gl::GestureCamera::kFirstPerson)
|
||||
{
|
||||
frustum_->SetPosition(position);
|
||||
frustum_->SetRotation(rotation);
|
||||
@@ -502,8 +506,13 @@ int Scene::Render() {
|
||||
frustum_->SetScale(kFrustumScale);
|
||||
frustum_->Render(projectionMatrix, viewMatrix);
|
||||
|
||||
axis_->SetPosition(position);
|
||||
axis_->SetRotation(rotation);
|
||||
rtabmap::Transform cameraFrame = *currentPose_*rtabmap::optical_T_opengl*rtabmap::CameraMobile::opticalRotationInv;
|
||||
glm::vec3 positionCamera(cameraFrame.x(), cameraFrame.y(), cameraFrame.z());
|
||||
Eigen::Quaternionf quatCamera = cameraFrame.getQuaternionf();
|
||||
glm::quat rotationCamera(quatCamera.w(), quatCamera.x(), quatCamera.y(), quatCamera.z());
|
||||
|
||||
axis_->SetPosition(positionCamera);
|
||||
axis_->SetRotation(rotationCamera);
|
||||
axis_->Render(projectionMatrix, viewMatrix);
|
||||
}
|
||||
|
||||
@@ -512,11 +521,11 @@ int Scene::Render() {
|
||||
{
|
||||
trace_->Render(projectionMatrix, viewMatrix);
|
||||
}
|
||||
}
|
||||
|
||||
if(gridVisible_)
|
||||
{
|
||||
grid_->Render(projectionMatrix, viewMatrix);
|
||||
}
|
||||
if(gridVisible_)
|
||||
{
|
||||
grid_->Render(projectionMatrix, viewMatrix);
|
||||
}
|
||||
|
||||
if(graphVisible_ && graph_)
|
||||
@@ -571,8 +580,11 @@ void Scene::SetCameraType(tango_gl::GestureCamera::CameraType camera_type) {
|
||||
|
||||
void Scene::SetCameraPose(const rtabmap::Transform & pose)
|
||||
{
|
||||
UASSERT(currentPose_ != 0);
|
||||
UASSERT(!pose.isNull());
|
||||
if(currentPose_ ==0)
|
||||
{
|
||||
currentPose_ = new rtabmap::Transform(0,0,0,0,0,-M_PI/2.0f);
|
||||
}
|
||||
*currentPose_ = pose;
|
||||
}
|
||||
|
||||
@@ -600,7 +612,7 @@ rtabmap::Transform Scene::GetOpenGLCameraPose(float * fov) const
|
||||
{
|
||||
*fov = gesture_camera_->getFOV();
|
||||
}
|
||||
return glmToTransform(gesture_camera_->GetTransformationMatrix());
|
||||
return rtabmap::glmToTransform(gesture_camera_->GetTransformationMatrix());
|
||||
}
|
||||
|
||||
void Scene::OnTouchEvent(int touch_count,
|
||||
@@ -658,6 +670,11 @@ void Scene::setTraceVisible(bool visible)
|
||||
traceVisible_ = visible;
|
||||
}
|
||||
|
||||
void Scene::setFrustumVisible(bool visible)
|
||||
{
|
||||
frustumVisible_ = visible;
|
||||
}
|
||||
|
||||
//Should only be called in OpenGL thread!
|
||||
void Scene::addMarker(
|
||||
int id,
|
||||
@@ -728,7 +745,7 @@ void Scene::addCloud(
|
||||
|
||||
void Scene::addMesh(
|
||||
int id,
|
||||
const Mesh & mesh,
|
||||
const rtabmap::Mesh & mesh,
|
||||
const rtabmap::Transform & pose,
|
||||
bool createWireframe)
|
||||
{
|
||||
@@ -847,7 +864,7 @@ void Scene::updateCloudPolygons(int id, const std::vector<pcl::Vertices> & polyg
|
||||
}
|
||||
}
|
||||
|
||||
void Scene::updateMesh(int id, const Mesh & mesh)
|
||||
void Scene::updateMesh(int id, const rtabmap::Mesh & mesh)
|
||||
{
|
||||
std::map<int, PointCloudDrawable*>::iterator iter=pointClouds_.find(id);
|
||||
if(iter != pointClouds_.end())
|
||||
|
||||
Reference in New Issue
Block a user