Changeset 1587Tweet

Timestamp:

Jul 6, 2012, 2:14:29 PM (9 years ago)

Author:

sam

Message:

ps3: add pad support for the PS3, without plug/unplug detection for now.

Location:

trunk/src/platform/ps3

Files:

• ps3input.cpp (modified) (5 diffs)
• ps3input.h (modified) (1 diff)

trunk/src/platform/ps3/ps3input.cpp

@@ -40 +40 @@
 
 #if defined __CELLOS_LV2__
+    Array<int, Stick *> m_joysticks;
+
     vec2 mousepos;
     ivec3 mousebuttons;
@@ -54 +56 @@
 
 Ps3Input::Ps3Input()
-  : data(new Ps3InputData())
+  : m_data(new Ps3InputData())
 {
 #if defined __CELLOS_LV2__
@@ -67 +69 @@
     ret = cellSysutilGetSystemParamInt(
                         CELL_SYSUTIL_SYSTEMPARAM_ID_ENTER_BUTTON_ASSIGN, &tmp);
-    data->circle_validates =
+    m_data->circle_validates =
             (ret == CELL_OK && tmp == CELL_SYSUTIL_ENTER_BUTTON_ASSIGN_CIRCLE);
 
     for (int i = 0; i < NUM_PADS; i++)
         for (int j = 0; j < 4; j++)
-            cellPadFilterIIRInit(&data->filter_sos[i][j],
+            cellPadFilterIIRInit(&m_data->filter_sos[i][j],
                                  CELL_PADFILTER_IIR_CUTOFF_2ND_LPF_BT_010);
 
-    data->mousepos = vec2(320.0f, 240.0f);
-    data->mousebuttons = ivec3(0, 0, 0);
+    /* Try to detect connected pads. We should do this each frame. */
+    CellPadInfo2 pad_info2;
+    ret = cellPadGetInfo2(&pad_info2);
+    if (ret == CELL_PAD_OK)
+    {
+        for (int i = 0; i < NUM_PADS; i++)
+        {
+            if (!(pad_info2.port_status[i] & CELL_PAD_STATUS_CONNECTED))
+                continue;
+
+            Stick *stick = Input::CreateStick();
+            stick->SetAxisCount(4);
+            stick->SetButtonCount(16);
+            m_data->m_joysticks.Push(i, stick);
+        }
+    }
+
+    m_data->mousepos = vec2(320.0f, 240.0f);
+    m_data->mousebuttons = ivec3(0, 0, 0);
 
     m_gamegroup = GAMEGROUP_BEFORE;
@@ -92 +111 @@
         return;
 
-    for (int i = 0; i < NUM_PADS; i++)
+    for (int i = 0; i < m_data->m_joysticks.Count(); i++)
     {
-        if (!(pad_info2.port_status[i] & CELL_PAD_STATUS_CONNECTED))
+        int j = m_data->m_joysticks[i].m1;
+
+        if (!(pad_info2.port_status[j] & CELL_PAD_STATUS_CONNECTED))
             continue;
 
+        /* Propagate all buttons */
+        uint16_t bitmap1 = m_data->pad_data[j].button[CELL_PAD_BTN_OFFSET_DIGITAL1];
+        for (int k = 0; k < 8; k++)
+            m_data->m_joysticks[i].m2->SetButton(k, bitmap1 & (1 << k));
+        uint16_t bitmap2 = m_data->pad_data[j].button[CELL_PAD_BTN_OFFSET_DIGITAL2];
+        for (int k = 0; k < 8; k++)
+            m_data->m_joysticks[i].m2->SetButton(8 + k, bitmap2 & (1 << k));
+
         /* Get Pad status. If the data hasn't changed since the last call,
-         * data->pad[i].len will be 0 but we carry on anyway. */
-        ret = cellPadGetData(i, &data->pad_data[i]);
+         * data->pad[j].len will be 0 but we carry on anyway. */
+        ret = cellPadGetData(j, &m_data->pad_data[j]);
         if (ret != CELL_PAD_OK)
             continue;
 
-        /* Right stick moves the mouse */
         if (!(pad_info2.system_info & CELL_PAD_INFO_INTERCEPTED))
         {
-            int x = data->pad_data[i].button[CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X];
-            int y = data->pad_data[i].button[CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X + 1];
+            int x = m_data->pad_data[j].button[CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X];
+            int y = m_data->pad_data[j].button[CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X + 1];
+            int x2 = m_data->pad_data[j].button[CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X];
+            int y2 = m_data->pad_data[j].button[CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X + 1];
+
+            /* Propagate all axes */
+            m_data->m_joysticks[i].m2->SetAxis(0, (x - 127) / 127.0f);
+            m_data->m_joysticks[i].m2->SetAxis(1, (y - 127) / 127.0f);
+            m_data->m_joysticks[i].m2->SetAxis(2, (x2 - 127) / 127.0f);
+            m_data->m_joysticks[i].m2->SetAxis(3, (y2 - 127) / 127.0f);
+
+            /* Right stick moves the mouse FIXME: deprecated */
             vec2 delta(4.f * (abs(x - 127) < 16 ? 0 : x - 127),
                        -4.f * (abs(y - 127) < 16 ? 0 : y - 127));
-            data->mousepos += delta * seconds;
-            Input::SetMousePos((ivec2)data->mousepos);
+            m_data->mousepos += delta * seconds;
+            Input::SetMousePos((ivec2)m_data->mousepos);
         }
 
-        /* L1 or R1 for mouse button */
-        int but = (data->pad_data[i].button[CELL_PAD_BTN_OFFSET_DIGITAL2]
+        /* L1 or R1 for mouse button FIXME: deprecated */
+        int but = (m_data->pad_data[j].button[CELL_PAD_BTN_OFFSET_DIGITAL2]
                                                           & CELL_PAD_CTRL_L1)
-               || (data->pad_data[i].button[CELL_PAD_BTN_OFFSET_DIGITAL2]
+               || (m_data->pad_data[j].button[CELL_PAD_BTN_OFFSET_DIGITAL2]
                                                           & CELL_PAD_CTRL_R1);
-        if (but && !data->mousebuttons.x)
+        if (but && !m_data->mousebuttons.x)
             Input::SetMouseButton(0);
-        else if (!but && data->mousebuttons.x)
+        else if (!but && m_data->mousebuttons.x)
             Input::UnsetMouseButton(0);
 
-        data->mousebuttons.x = but;
-
-        /* Only handle the first pad we meet */
-        break;
+        m_data->mousebuttons.x = but;
     }
 #endif
@@ -134 +169 @@
 Ps3Input::~Ps3Input()
 {
-    delete data;
+#if defined __CELLOS_LV2__
+    for (int i = 0; i < m_data->m_joysticks.Count(); ++i)
+    {
+        Input::DestroyStick(m_data->m_joysticks[0].m2);
+    }
+#endif
+    delete m_data;
 }
 

trunk/src/platform/ps3/ps3input.h

@@ -34 +34 @@
 
 private:
-    Ps3InputData *data;
+    Ps3InputData *m_data;
 };