Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(794)

Side by Side Diff: ppapi/shared_impl/ppb_gamepad_shared.h

Issue 280713004: Update Gamepad API to match the latest specification (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« build/common.gypi ('K') | « ppapi/c/ppb_gamepad.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef PPAPI_SHARED_IMPL_PPB_GAMEPAD_SHARED_H_ 5 #ifndef PPAPI_SHARED_IMPL_PPB_GAMEPAD_SHARED_H_
6 #define PPAPI_SHARED_IMPL_PPB_GAMEPAD_SHARED_H_ 6 #define PPAPI_SHARED_IMPL_PPB_GAMEPAD_SHARED_H_
7 7
8 #include "base/atomicops.h" 8 #include "base/atomicops.h"
9 #include "base/strings/string16.h" 9 #include "base/strings/string16.h"
10 #include "ppapi/c/ppb_gamepad.h" 10 #include "ppapi/c/ppb_gamepad.h"
11 #include "ppapi/shared_impl/ppapi_shared_export.h" 11 #include "ppapi/shared_impl/ppapi_shared_export.h"
12 12
13 namespace ppapi { 13 namespace ppapi {
14 14
15 // TODO(brettw) when we remove the non-IPC-based gamepad implementation, this 15 // TODO(brettw) when we remove the non-IPC-based gamepad implementation, this
16 // code should all move into the GamepadResource. 16 // code should all move into the GamepadResource.
17 17
18 #pragma pack(push, 1) 18 #pragma pack(push, 1)
19 19
20 struct WebKitGamepadButton { 20 struct WebKitGamepadButton {
21 bool pressed; 21 bool pressed;
22 float value; 22 double value;
23 }; 23 };
24 24
25 // This must match the definition of blink::Gamepad. The GamepadHost unit test 25 // This must match the definition of blink::Gamepad. The GamepadHost unit test
26 // has some compile asserts to validate this. 26 // has some compile asserts to validate this.
27 struct WebKitGamepad { 27 struct WebKitGamepad {
28 static const size_t kIdLengthCap = 128; 28 static const size_t kIdLengthCap = 128;
29 static const size_t kMappingLengthCap = 16; 29 static const size_t kMappingLengthCap = 16;
30 static const size_t kAxesLengthCap = 16; 30 static const size_t kAxesLengthCap = 16;
31 static const size_t kButtonsLengthCap = 32; 31 static const size_t kButtonsLengthCap = 32;
32 32
33 // Is there a gamepad connected at this index? 33 // Is there a gamepad connected at this index?
34 bool connected; 34 bool connected;
35 35
36 // Device identifier (based on manufacturer, model, etc.). 36 // Device identifier (based on manufacturer, model, etc.).
37 base::char16 id[kIdLengthCap]; 37 base::char16 id[kIdLengthCap];
38 38
39 // Monotonically increasing value referring to when the data were last 39 // Monotonically increasing value referring to when the data were last
40 // updated. 40 // updated.
41 unsigned long long timestamp; 41 unsigned long long timestamp;
42 42
43 // Number of valid entries in the axes array. 43 // Number of valid entries in the axes array.
44 unsigned axes_length; 44 unsigned axes_length;
45 45
46 // Normalized values representing axes, in the range [-1..1]. 46 // Normalized values representing axes, in the range [-1..1].
47 float axes[kAxesLengthCap]; 47 double axes[kAxesLengthCap];
48 48
49 // Number of valid entries in the buttons array. 49 // Number of valid entries in the buttons array.
50 unsigned buttons_length; 50 unsigned buttons_length;
51 51
52 // Normalized values representing buttons, in the range [0..1]. 52 // Normalized values representing buttons, in the range [0..1].
53 WebKitGamepadButton buttons[kButtonsLengthCap]; 53 WebKitGamepadButton buttons[kButtonsLengthCap];
54 54
55 // Mapping type (for example "standard") 55 // Mapping type (for example "standard")
56 base::char16 mapping[kMappingLengthCap]; 56 base::char16 mapping[kMappingLengthCap];
57 }; 57 };
(...skipping 20 matching lines...) Expand all
78 78
79 #pragma pack(pop) 79 #pragma pack(pop)
80 80
81 PPAPI_SHARED_EXPORT void ConvertWebKitGamepadData( 81 PPAPI_SHARED_EXPORT void ConvertWebKitGamepadData(
82 const WebKitGamepads& webkit_data, 82 const WebKitGamepads& webkit_data,
83 PP_GamepadsSampleData* output_data); 83 PP_GamepadsSampleData* output_data);
84 84
85 } // namespace ppapi 85 } // namespace ppapi
86 86
87 #endif // PPAPI_SHARED_IMPL_PPB_GAMEPAD_SHARED_H_ 87 #endif // PPAPI_SHARED_IMPL_PPB_GAMEPAD_SHARED_H_
OLDNEW
« build/common.gypi ('K') | « ppapi/c/ppb_gamepad.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698