Changeset 2904


Ignore:
Timestamp:
Sep 12, 2013, 6:40:22 PM (6 years ago)
Author:
touky
Message:

nacl : deactivated input to get build back.

Location:
trunk/src/platform/nacl
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/platform/nacl/nacl-instance.cpp

    r2816 r2904  
    6060
    6161    /* Propagate gamepad information */
     62    InputDeviceInternal* stick = new InputDeviceInternal(String::Printf("Joystick%d", i+1).C());
     63    for (int j = 0; j < 4; ++j)
     64        stick->AddAxis(String::Printf("Axis%d", j+1).C());
     65    for (int j = 0; j < 16; ++j)
     66        stick->AddKey(String::Printf("Button%d", j+1).C());
     67
     68    m_data->m_joysticks.Push(i, stick);
     69
     70    /* 12/09/2013 : Deactivated to get build back.
    6271    PP_GamepadsSampleData all_pads_data;
    6372    instance->m_pad_interface->Sample(instance->pp_instance(), &all_pads_data);
     
    8190            instance->m_sticks[i]->SetButton(j, pad_data.buttons[j] > 0.5f);
    8291    }
     92    */
    8393}
    8494
     
    159169bool NaClInstance::HandleInputEvent(const pp::InputEvent& event)
    160170{
     171    ///---------------------------------
     172    /* 12/09/2013 : Deactivated to get build back.
    161173    switch (event.GetType())
    162174    {
     
    173185        break;
    174186    }
     187    */
    175188    return true;
    176189}
  • trunk/src/platform/nacl/nacl-instance.h

    r2816 r2904  
    5555    /* Gamepad support */
    5656    PPB_Gamepad const *m_pad_interface;
    57     Array<Stick *> m_sticks;
     57    //12/09/2013 : Should use new system. Array<Stick *> m_sticks;
     58    Array<InputDevice*> m_sticks;
    5859
    5960    /* Communication with the application object */
Note: See TracChangeset for help on using the changeset viewer.