Chromium Code Reviews| 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 const float ButtonPressedThreshold = 0.1f; | |
|
scottmg
2014/02/18 23:46:31
As noted in the chromium-side review, I think this
| |
| 32 | |
| 31 DEFINE_GC_INFO(Gamepad); | 33 DEFINE_GC_INFO(Gamepad); |
| 32 | 34 |
| 33 Gamepad::Gamepad() | 35 Gamepad::Gamepad() |
| 34 : m_index(0) | 36 : m_index(0) |
| 35 , m_timestamp(0) | 37 , m_timestamp(0) |
| 36 { | 38 { |
| 37 ScriptWrappable::init(this); | 39 ScriptWrappable::init(this); |
| 38 } | 40 } |
| 39 | 41 |
| 40 void Gamepad::axes(unsigned count, float* data) | 42 void Gamepad::axes(unsigned count, float* data) |
| 41 { | 43 { |
| 42 m_axes.resize(count); | 44 m_axes.resize(count); |
| 43 if (count) | 45 if (count) |
| 44 std::copy(data, data + count, m_axes.begin()); | 46 std::copy(data, data + count, m_axes.begin()); |
| 45 } | 47 } |
| 46 | 48 |
| 47 void Gamepad::buttons(unsigned count, float* data) | 49 void Gamepad::buttons(unsigned count, float* data) |
| 48 { | 50 { |
| 49 m_buttons.resize(count); | 51 if (m_buttons.size() != count) { |
| 50 if (count) | 52 m_buttons.resize(count); |
| 51 std::copy(data, data + count, m_buttons.begin()); | 53 for (unsigned i = 0; i < count; ++i) |
| 54 m_buttons[i] = GamepadButton::create(); | |
| 55 } | |
| 56 | |
| 57 for (unsigned i = 0; i < count; ++i) { | |
| 58 m_buttons[i]->value(data[i]); | |
| 59 m_buttons[i]->pressed(data[i] >= ButtonPressedThreshold); | |
| 60 } | |
| 52 } | 61 } |
| 53 | 62 |
| 54 Gamepad::~Gamepad() | 63 Gamepad::~Gamepad() |
| 55 { | 64 { |
| 56 } | 65 } |
| 57 | 66 |
| 58 void Gamepad::trace(Visitor* visitor) | 67 void Gamepad::trace(Visitor* visitor) |
| 59 { | 68 { |
| 60 } | 69 } |
| 61 | 70 |
| 62 } // namespace WebCore | 71 } // namespace WebCore |
| OLD | NEW |