i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-09-02 09:30:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

android: ui update. fixed arcore java driver not stopping in background

Browse Source
This commit is contained in:
matlabbe
2020-06-29 20:41:59 -04:00
parent b7ada1992e
commit 4857d43146
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/android/jni/tango-gl/gesture_camera.cpp
View File

@@ -199,8 +199,8 @@ void GestureCamera::SetCameraType(CameraType camera_index) {
SetRotation(glm::quat(1.0f, 0.0f, 0.0f, 0.0f)); SetRotation(glm::quat(1.0f, 0.0f, 0.0f, 0.0f));
cam_cur_dist_ = kThirdPersonFollow?kThirdPersonFollowCameraDist:kThirdPersonCameraDist; cam_cur_dist_ = kThirdPersonFollow?kThirdPersonFollowCameraDist:kThirdPersonCameraDist;
anchor_offset_ = glm::vec3(0.0f,0.0f,0.0f); anchor_offset_ = glm::vec3(0.0f,0.0f,0.0f);
cam_cur_angle_.x = -M_PI / 6.0f; cam_cur_angle_.x = -M_PI / 12.0f;
cam_cur_angle_.y = kThirdPersonFollow?0:M_PI / 4.0f; cam_cur_angle_.y = kThirdPersonFollow?0:M_PI / 2.0f;
cam_cur_target_rot_ = glm::quat(1,0,0,0); cam_cur_target_rot_ = glm::quat(1,0,0,0);
StartCameraToCurrentTransform(); StartCameraToCurrentTransform();
break; break;

1
app/android/res/layout/activity_rtabmap.xml
View File

@@ -163,6 +163,7 @@
android:layout_height="100dp" android:layout_height="100dp"
android:layout_alignLeft="@+id/button_library" android:layout_alignLeft="@+id/button_library"
android:layout_below="@+id/button_library" android:layout_below="@+id/button_library"
android:layout_marginTop="20dp"
android:text="@string/new_scan" /> android:text="@string/new_scan" />
</RelativeLayout> </RelativeLayout>

9
app/android/src/com/introlab/rtabmap/RTABMapActivity.java
View File

@@ -2314,6 +2314,15 @@ public class RTABMapActivity extends FragmentActivity implements OnClickListener
updateState(State.STATE_IDLE); updateState(State.STATE_IDLE);
if(mArCoreCamera != null)
{
synchronized (this) {
mRenderer.setCamera(null);
mArCoreCamera.close();
mArCoreCamera = null;
}
}
Thread stopThread = new Thread(new Runnable() { Thread stopThread = new Thread(new Runnable() {
public void run() { public void run() {
if(!DISABLE_LOG) Log.i(TAG, String.format("setPausedMapping()")); if(!DISABLE_LOG) Log.i(TAG, String.format("setPausedMapping()"));