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

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: Apply comments 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
« no previous file with comments | « no previous file | ppapi/shared_impl/ppb_gamepad_shared.cc » ('j') | 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 #include "third_party/WebKit/public/platform/WebGamepads.h"
12 13
13 namespace ppapi { 14 namespace ppapi {
14 15
15 // TODO(brettw) when we remove the non-IPC-based gamepad implementation, this 16 // TODO(brettw) when we remove the non-IPC-based gamepad implementation, this
16 // code should all move into the GamepadResource. 17 // code should all move into the GamepadResource.
17 18
18 #pragma pack(push, 1) 19 #pragma pack(push, 1)
19 20
21 #if defined(ENABLE_NEW_GAMEPAD_API)
22 typedef double buttonValueType;
23 typedef double axisValueType;
24 #else
25 typedef float buttonValueType;
26 typedef float axisValueType;
27 #endif
28
20 struct WebKitGamepadButton { 29 struct WebKitGamepadButton {
21 bool pressed; 30 bool pressed;
22 float value; 31 buttonValueType value;
23 }; 32 };
24 33
25 // This must match the definition of blink::Gamepad. The GamepadHost unit test 34 // This must match the definition of blink::Gamepad. The GamepadHost unit test
26 // has some compile asserts to validate this. 35 // has some compile asserts to validate this.
27 struct WebKitGamepad { 36 struct WebKitGamepad {
28 static const size_t kIdLengthCap = 128; 37 static const size_t kIdLengthCap = 128;
29 static const size_t kMappingLengthCap = 16; 38 static const size_t kMappingLengthCap = 16;
30 static const size_t kAxesLengthCap = 16; 39 static const size_t kAxesLengthCap = 16;
31 static const size_t kButtonsLengthCap = 32; 40 static const size_t kButtonsLengthCap = 32;
32 41
33 // Is there a gamepad connected at this index? 42 // Is there a gamepad connected at this index?
34 bool connected; 43 bool connected;
35 44
36 // Device identifier (based on manufacturer, model, etc.). 45 // Device identifier (based on manufacturer, model, etc.).
37 base::char16 id[kIdLengthCap]; 46 base::char16 id[kIdLengthCap];
38 47
39 // Monotonically increasing value referring to when the data were last 48 // Monotonically increasing value referring to when the data were last
40 // updated. 49 // updated.
41 unsigned long long timestamp; 50 unsigned long long timestamp;
42 51
43 // Number of valid entries in the axes array. 52 // Number of valid entries in the axes array.
44 unsigned axes_length; 53 unsigned axes_length;
45 54
46 // Normalized values representing axes, in the range [-1..1]. 55 // Normalized values representing axes, in the range [-1..1].
47 float axes[kAxesLengthCap]; 56 axisValueType axes[kAxesLengthCap];
48 57
49 // Number of valid entries in the buttons array. 58 // Number of valid entries in the buttons array.
50 unsigned buttons_length; 59 unsigned buttons_length;
51 60
52 // Normalized values representing buttons, in the range [0..1]. 61 // Normalized values representing buttons, in the range [0..1].
53 WebKitGamepadButton buttons[kButtonsLengthCap]; 62 WebKitGamepadButton buttons[kButtonsLengthCap];
54 63
55 // Mapping type (for example "standard") 64 // Mapping type (for example "standard")
56 base::char16 mapping[kMappingLengthCap]; 65 base::char16 mapping[kMappingLengthCap];
57 }; 66 };
(...skipping 20 matching lines...) Expand all
78 87
79 #pragma pack(pop) 88 #pragma pack(pop)
80 89
81 PPAPI_SHARED_EXPORT void ConvertWebKitGamepadData( 90 PPAPI_SHARED_EXPORT void ConvertWebKitGamepadData(
82 const WebKitGamepads& webkit_data, 91 const WebKitGamepads& webkit_data,
83 PP_GamepadsSampleData* output_data); 92 PP_GamepadsSampleData* output_data);
84 93
85 } // namespace ppapi 94 } // namespace ppapi
86 95
87 #endif // PPAPI_SHARED_IMPL_PPB_GAMEPAD_SHARED_H_ 96 #endif // PPAPI_SHARED_IMPL_PPB_GAMEPAD_SHARED_H_
OLDNEW
« no previous file with comments | « no previous file | ppapi/shared_impl/ppb_gamepad_shared.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698