| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011, Google Inc. All rights reserved. | 2 * Copyright (C) 2011, Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are met: | 5 * modification, are permitted provided that the following conditions are met: |
| 6 * | 6 * |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | 21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY |
| 22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH | 22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH |
| 23 * DAMAGE. | 23 * DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "modules/gamepad/Gamepad.h" | 27 #include "modules/gamepad/Gamepad.h" |
| 28 | 28 |
| 29 namespace WebCore { | 29 namespace WebCore { |
| 30 | 30 |
| 31 Gamepad::Gamepad() | 31 Gamepad::Gamepad() : GamepadBase() |
| 32 : m_index(0) | |
| 33 , m_timestamp(0) | |
| 34 { | 32 { |
| 35 ScriptWrappable::init(this); | 33 ScriptWrappable::init(this); |
| 36 } | 34 } |
| 37 | 35 |
| 38 void Gamepad::axes(unsigned count, float* data) | 36 void Gamepad::buttons(unsigned count, const blink::WebGamepadButton* data) |
| 39 { | 37 { |
| 40 m_axes.resize(count); | 38 if (m_buttons.size() != count) { |
| 41 if (count) | 39 m_buttons.resize(count); |
| 42 std::copy(data, data + count, m_axes.begin()); | 40 for (unsigned i = 0; i < count; ++i) |
| 41 m_buttons[i] = GamepadButton::create(); |
| 42 } |
| 43 for (unsigned i = 0; i < count; ++i) { |
| 44 m_buttons[i]->value(data[i].value); |
| 45 m_buttons[i]->pressed(data[i].pressed); |
| 46 } |
| 43 } | 47 } |
| 44 | 48 |
| 45 #if defined(ENABLE_NEW_GAMEPAD_API) | |
| 46 void Gamepad::buttons(unsigned count, blink::WebGamepadButton* data) | |
| 47 { | |
| 48 m_buttons.resize(count); | |
| 49 for (unsigned i = 0; i < count; ++i) | |
| 50 m_buttons[i] = data[i].value; | |
| 51 } | |
| 52 #else | |
| 53 void Gamepad::buttons(unsigned count, float* data) | |
| 54 { | |
| 55 m_buttons.resize(count); | |
| 56 if (count) | |
| 57 std::copy(data, data + count, m_buttons.begin()); | |
| 58 } | |
| 59 #endif | |
| 60 | |
| 61 Gamepad::~Gamepad() | 49 Gamepad::~Gamepad() |
| 62 { | 50 { |
| 63 } | 51 } |
| 64 | 52 |
| 65 void Gamepad::trace(Visitor* visitor) | |
| 66 { | |
| 67 } | |
| 68 | |
| 69 } // namespace WebCore | 53 } // namespace WebCore |
| OLD | NEW |