Changeset 1439 for trunk/src/platformTweet

Timestamp:

Jun 4, 2012, 7:18:45 PM (11 years ago)

Author:

sam

Message:

nacl: preliminary gamepad support in the NaCl backend.

Location:

trunk/src/platform/nacl

Files:

• nacl_instance.cpp (modified) (4 diffs)
• nacl_instance.h (modified) (2 diffs)

trunk/src/platform/nacl/nacl_instance.cpp

@@ -52 +52 @@
 static double const DELTA_MS = 1000.0 / 60.0;
 
-void TickCallback(void* data, int32_t result)
+void NaClInstance::TickCallback(void* data, int32_t result)
 {
     NaClInstance *instance = (NaClInstance *)data;
@@ -60 +60 @@
     pp::Module::Get()->core()->CallOnMainThread(
             DELTA_MS, pp::CompletionCallback(&TickCallback, data), PP_OK);
+
+    /* Propagate gamepad information */
+    PP_GamepadsSampleData all_pads_data;
+    instance->m_pad_interface->Sample(instance->pp_instance(), &all_pads_data);
+
+    for (int i = 0; i < all_pads_data.length; i++)
+    {
+        PP_GamepadSampleData const& pad_data = all_pads_data.items[i];
+
+        if (i >= instance->m_sticks.Count())
+        {
+            Stick *stick = Input::CreateStick();
+            instance->m_sticks.Push(stick);
+        }
+
+        instance->m_sticks[i]->SetAxisCount(pad_data.axes_length);
+        for (int j = 0; j < pad_data.axes_length; j++)
+            instance->m_sticks[i]->SetAxis(j, pad_data.axes[j]);
+
+        instance->m_sticks[i]->SetButtonCount(pad_data.buttons_length);
+        for (int j = 0; j < pad_data.buttons_length; j++)
+            instance->m_sticks[i]->SetButton(j, pad_data.buttons[j] > 0.5f);
+    }
 }
 
@@ -66 +89 @@
                         const char* argv[])
 {
-    // My timer callback
-    pp::Module::Get()->core()->CallOnMainThread(
-            DELTA_MS, pp::CompletionCallback(&TickCallback, this), PP_OK);
+    Ticker::Setup(60.0f);
 
     /* Call the user's main() function. FIXME: run it in a thread */
@@ -76 +97 @@
     lol_nacl_main(argc, const_cast<char **>(argv), (char **)env);
 
+    // My timer callback
+    pp::Module::Get()->core()->CallOnMainThread(
+            DELTA_MS, pp::CompletionCallback(&TickCallback, this), PP_OK);
+
+    /* The gamepad interface */
+    m_pad_interface = static_cast<PPB_Gamepad const *>(
+            pp::Module::Get()->GetBrowserInterface(PPB_GAMEPAD_INTERFACE));
+
     return true;
+}
+
+void NaClInstance::RunMain(uint32_t argc,
+                           const char* /* argn */[],
+                           const char* argv[])
+{
+
 }
 

trunk/src/platform/nacl/nacl_instance.h

@@ -6 +6 @@
 #define EXAMPLES_TUMBLER_TUMBLER_H_
 
-#include <pthread.h>
-#include <map>
-#include <vector>
-
 #include <ppapi/cpp/instance.h>
+#include <ppapi/c/ppb_gamepad.h>
 
 #include "platform/nacl/opengl_context.h"
 #include "platform/nacl/opengl_context_ptrs.h"
+
+#include "input/input.h"
 
 namespace lol {
@@ -48 +47 @@
 
 private:
+    static void TickCallback(void* data, int32_t result);
+
     static void CallIntMainWrappers(int argc, char const* argn[]);
     static void CallVoidMainWrappers(int argc, char const* argn[]);
+
+    static void RunMain(uint32_t argc, const char* argn[], const char* argv[]);
+
+    /* Gamepad support */
+    PPB_Gamepad const *m_pad_interface;
+    Array<Stick *> m_sticks;
 };