summaryrefslogtreecommitdiffstats
path: root/Samples/CommonSrc/Platform/Win32_Gamepad.cpp
diff options
context:
space:
mode:
authorBrad Davis <[email protected]>2014-07-24 16:47:31 -0700
committerBrad Davis <[email protected]>2014-07-24 16:47:31 -0700
commit0f49ce8fc6aa54224e4c0d6fda8c4527ad39cce1 (patch)
treeda07ebc6a7f75185bda857dd5f1c34710b416a93 /Samples/CommonSrc/Platform/Win32_Gamepad.cpp
parentca79271759ff7eecd22ec5c4db438370fe51d687 (diff)
0.4 Win-Beta0.4.0
Diffstat (limited to 'Samples/CommonSrc/Platform/Win32_Gamepad.cpp')
-rw-r--r--Samples/CommonSrc/Platform/Win32_Gamepad.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Samples/CommonSrc/Platform/Win32_Gamepad.cpp b/Samples/CommonSrc/Platform/Win32_Gamepad.cpp
index ce7af63..5186773 100644
--- a/Samples/CommonSrc/Platform/Win32_Gamepad.cpp
+++ b/Samples/CommonSrc/Platform/Win32_Gamepad.cpp
@@ -23,7 +23,7 @@ limitations under the License.
#include "Win32_Gamepad.h"
-namespace OVR { namespace Platform { namespace Win32 {
+namespace OVR { namespace OvrPlatform { namespace Win32 {
GamepadManager::GamepadManager()
{
@@ -61,12 +61,12 @@ static inline float GamepadTrigger(BYTE in)
return float(in-30) / 225;
}
-UInt32 GamepadManager::GetGamepadCount()
+uint32_t GamepadManager::GetGamepadCount()
{
return 1;
}
-bool GamepadManager::GetGamepadState(UInt32 index, GamepadState* pState)
+bool GamepadManager::GetGamepadState(uint32_t index, GamepadState* pState)
{
// For now we just support one gamepad.
OVR_UNUSED(index);
@@ -98,4 +98,4 @@ bool GamepadManager::GetGamepadState(UInt32 index, GamepadState* pState)
return false;
}
-}}} // OVR::Platform::Win32
+}}} // OVR::OvrPlatform::Win32