Fix deprecated use of ALooper_PollAll (#139)

Issue: #133 Fix double spawn with multiple controllers Issue #137
KhronosGroup · Oct 1, 2024 · e493c17 · e493c17
1 parent 28e2dd4
commit e493c17
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/Chapter1/main.cpp b/Chapter1/main.cpp
@@ -100,7 +100,7 @@ class OpenXRTutorial {
             int events = 0;
             // The timeout depends on whether the application is active.
             const int timeoutMilliseconds = (!androidAppState.resumed && !m_sessionRunning && androidApp->destroyRequested == 0) ? -1 : 0;
-            if (ALooper_pollAll(timeoutMilliseconds, nullptr, &events, (void **)&source) >= 0) {
+            if (ALooper_pollOnce(timeoutMilliseconds, nullptr, &events, (void**)&source) >= 0) {
                 if (source != nullptr) {
                     source->process(androidApp, source);
                 }

diff --git a/Chapter2/main.cpp b/Chapter2/main.cpp
@@ -401,7 +401,7 @@ class OpenXRTutorial {
             int events = 0;
             // The timeout depends on whether the application is active.
             const int timeoutMilliseconds = (!androidAppState.resumed && !m_sessionRunning && androidApp->destroyRequested == 0) ? -1 : 0;
-            if (ALooper_pollAll(timeoutMilliseconds, nullptr, &events, (void **)&source) >= 0) {
+            if (ALooper_pollOnce(timeoutMilliseconds, nullptr, &events, (void**)&source) >= 0) {
                 if (source != nullptr) {
                     source->process(androidApp, source);
                 }

diff --git a/Chapter3/main.cpp b/Chapter3/main.cpp
@@ -961,7 +961,7 @@ class OpenXRTutorial {
             int events = 0;
             // The timeout depends on whether the application is active.
             const int timeoutMilliseconds = (!androidAppState.resumed && !m_sessionRunning && androidApp->destroyRequested == 0) ? -1 : 0;
-            if (ALooper_pollAll(timeoutMilliseconds, nullptr, &events, (void **)&source) >= 0) {
+            if (ALooper_pollOnce(timeoutMilliseconds, nullptr, &events, (void**)&source) >= 0) {
                 if (source != nullptr) {
                     source->process(androidApp, source);
                 }

diff --git a/Chapter4/main.cpp b/Chapter4/main.cpp
@@ -352,6 +352,7 @@ class OpenXRTutorial {
         // Each Action here has two paths, one for each SubAction path.
         any_ok |= SuggestBindings("/interaction_profiles/khr/simple_controller", {{m_changeColorAction, CreateXrPath("/user/hand/left/input/select/click")},
                                                                                   {m_grabCubeAction, CreateXrPath("/user/hand/right/input/select/click")},
+                                                                                  {m_spawnCubeAction, CreateXrPath("/user/hand/right/input/menu/click")},
                                                                                   {m_palmPoseAction, CreateXrPath("/user/hand/left/input/grip/pose")},
                                                                                   {m_palmPoseAction, CreateXrPath("/user/hand/right/input/grip/pose")},
                                                                                   {m_buzzAction, CreateXrPath("/user/hand/left/output/haptic")},
@@ -894,8 +895,9 @@ class OpenXRTutorial {
                         thisBlock.color = color;
                     }
                 } else {
-                    // not near a block? We can spawn one.
-                    if (m_spawnCubeState.isActive == XR_TRUE && m_spawnCubeState.currentState == XR_FALSE && m_spawnCubeState.changedSinceLastSync == XR_TRUE) {
+                    // right hand not near a block?
+                    // i = 1 means sub action path /user/hand/right
+                    if (i == 1 && m_spawnCubeState.isActive == XR_TRUE && m_spawnCubeState.currentState == XR_FALSE && m_spawnCubeState.changedSinceLastSync == XR_TRUE) {
                         XrQuaternionf q = {0.0f, 0.0f, 0.0f, 1.0f};
                         XrVector3f color = {pseudorandom_distribution(pseudo_random_generator), pseudorandom_distribution(pseudo_random_generator), pseudorandom_distribution(pseudo_random_generator)};
                         m_blocks.push_back({{q, FixPosition(m_handPose[i].position)}, {0.095f, 0.095f, 0.095f}, color});
@@ -1330,7 +1332,7 @@ class OpenXRTutorial {
             int events = 0;
             // The timeout depends on whether the application is active.
             const int timeoutMilliseconds = (!androidAppState.resumed && !m_sessionRunning && androidApp->destroyRequested == 0) ? -1 : 0;
-            if (ALooper_pollAll(timeoutMilliseconds, nullptr, &events, (void **)&source) >= 0) {
+            if (ALooper_pollOnce(timeoutMilliseconds, nullptr, &events, (void**)&source) >= 0) {
                 if (source != nullptr) {
                     source->process(androidApp, source);
                 }

diff --git a/Chapter5/main.cpp b/Chapter5/main.cpp
@@ -1420,7 +1420,7 @@ class OpenXRTutorial {
             int events = 0;
             // The timeout depends on whether the application is active.
             const int timeoutMilliseconds = (!androidAppState.resumed && !m_sessionRunning && androidApp->destroyRequested == 0) ? -1 : 0;
-            if (ALooper_pollAll(timeoutMilliseconds, nullptr, &events, (void **)&source) >= 0) {
+            if (ALooper_pollOnce(timeoutMilliseconds, nullptr, &events, (void**)&source) >= 0) {
                 if (source != nullptr) {
                     source->process(androidApp, source);
                 }

diff --git a/Chapter6_1_Multiview/Chapter6/main.cpp b/Chapter6_1_Multiview/Chapter6/main.cpp
@@ -1323,7 +1323,7 @@ class OpenXRTutorial {
             int events = 0;
             // The timeout depends on whether the application is active.
             const int timeoutMilliseconds = (!androidAppState.resumed && !m_sessionRunning && androidApp->destroyRequested == 0) ? -1 : 0;
-            if (ALooper_pollAll(timeoutMilliseconds, nullptr, &events, (void **)&source) >= 0) {
+            if (ALooper_pollOnce(timeoutMilliseconds, nullptr, &events, (void**)&source) >= 0) {
                 if (source != nullptr) {
                     source->process(androidApp, source);
                 }