Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
fengzch-das
OIS
Commits
24236447
Commit
24236447
authored
Sep 17, 2015
by
TheOnlyJoey
Browse files
Merge pull request #5 from hymerman/tidying
General tidy-up
parents
c546989f
ed6e1ba6
Changes
121
Show whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
2135 additions
and
2142 deletions
+2135
-2142
includes/mac/MacJoyStick.h
includes/mac/MacJoyStick.h
+76
-76
includes/mac/MacKeyboard.h
includes/mac/MacKeyboard.h
+102
-102
includes/mac/MacMouse.h
includes/mac/MacMouse.h
+51
-51
includes/mac/MacPrereqs.h
includes/mac/MacPrereqs.h
+57
-57
includes/win32/Win32ForceFeedback.h
includes/win32/Win32ForceFeedback.h
+108
-108
includes/win32/Win32InputManager.h
includes/win32/Win32InputManager.h
+113
-113
includes/win32/Win32JoyStick.h
includes/win32/Win32JoyStick.h
+88
-88
includes/win32/Win32KeyBoard.h
includes/win32/Win32KeyBoard.h
+87
-87
includes/win32/Win32Mouse.h
includes/win32/Win32Mouse.h
+59
-59
includes/win32/Win32Prereqs.h
includes/win32/Win32Prereqs.h
+71
-71
src/OISEffect.cpp
src/OISEffect.cpp
+119
-128
src/OISException.cpp
src/OISException.cpp
+32
-32
src/OISForceFeedback.cpp
src/OISForceFeedback.cpp
+74
-74
src/OISInputManager.cpp
src/OISInputManager.cpp
+292
-290
src/OISJoyStick.cpp
src/OISJoyStick.cpp
+73
-73
src/OISKeyboard.cpp
src/OISKeyboard.cpp
+45
-45
src/OISObject.cpp
src/OISObject.cpp
+23
-23
src/SDL/SDLInputManager.cpp
src/SDL/SDLInputManager.cpp
+114
-114
src/SDL/SDLKeyboard.cpp
src/SDL/SDLKeyboard.cpp
+377
-377
src/SDL/SDLMouse.cpp
src/SDL/SDLMouse.cpp
+174
-174
No files found.
includes/mac/MacJoyStick.h
View file @
24236447
includes/mac/MacKeyboard.h
View file @
24236447
includes/mac/MacMouse.h
View file @
24236447
includes/mac/MacPrereqs.h
View file @
24236447
includes/win32/Win32ForceFeedback.h
View file @
24236447
includes/win32/Win32InputManager.h
View file @
24236447
includes/win32/Win32JoyStick.h
View file @
24236447
includes/win32/Win32KeyBoard.h
View file @
24236447
...
@@ -60,7 +60,7 @@ namespace OIS
...
@@ -60,7 +60,7 @@ namespace OIS
virtual
void
capture
();
virtual
void
capture
();
/** @copydoc Object::queryInterface */
/** @copydoc Object::queryInterface */
virtual
Interface
*
queryInterface
(
Interface
::
IType
type
)
{
return
0
;}
virtual
Interface
*
queryInterface
(
Interface
::
IType
type
)
{
OIS_UNUSED
(
type
);
return
0
;
}
/** @copydoc Object::_initialize */
/** @copydoc Object::_initialize */
virtual
void
_initialize
();
virtual
void
_initialize
();
...
...
includes/win32/Win32Mouse.h
View file @
24236447
...
@@ -41,7 +41,7 @@ namespace OIS
...
@@ -41,7 +41,7 @@ namespace OIS
virtual
void
capture
();
virtual
void
capture
();
/** @copydoc Object::queryInterface */
/** @copydoc Object::queryInterface */
virtual
Interface
*
queryInterface
(
Interface
::
IType
type
)
{
return
0
;}
virtual
Interface
*
queryInterface
(
Interface
::
IType
type
)
{
OIS_UNUSED
(
type
);
return
0
;}
/** @copydoc Object::_initialize */
/** @copydoc Object::_initialize */
virtual
void
_initialize
();
virtual
void
_initialize
();
...
...
includes/win32/Win32Prereqs.h
View file @
24236447
src/OISEffect.cpp
View file @
24236447
...
@@ -64,15 +64,6 @@ const char* Effect::getDirectionName(Effect::EDirection eValue)
...
@@ -64,15 +64,6 @@ const char* Effect::getDirectionName(Effect::EDirection eValue)
return
(
eValue
>=
0
&&
eValue
<
_DirectionsNumber
)
?
pszEDirectionString
[
eValue
]
:
"<Bad direction>"
;
return
(
eValue
>=
0
&&
eValue
<
_DirectionsNumber
)
?
pszEDirectionString
[
eValue
]
:
"<Bad direction>"
;
}
}
//------------------------------------------------------------------------------//
Effect
::
Effect
()
:
force
(
UnknownForce
),
type
(
Unknown
),
effect
(
0
),
axes
(
1
)
{
}
//------------------------------------------------------------------------------//
//------------------------------------------------------------------------------//
Effect
::
Effect
(
EForce
ef
,
EType
et
)
:
Effect
::
Effect
(
EForce
ef
,
EType
et
)
:
force
(
ef
),
force
(
ef
),
...
...
src/OISException.cpp
View file @
24236447
src/OISForceFeedback.cpp
View file @
24236447
src/OISInputManager.cpp
View file @
24236447
...
@@ -266,6 +266,8 @@ void InputManager::removeFactoryCreator( FactoryCreator* factory )
...
@@ -266,6 +266,8 @@ void InputManager::removeFactoryCreator( FactoryCreator* factory )
//----------------------------------------------------------------------------//
//----------------------------------------------------------------------------//
void
InputManager
::
enableAddOnFactory
(
AddOnFactories
factory
)
void
InputManager
::
enableAddOnFactory
(
AddOnFactories
factory
)
{
{
OIS_UNUSED
(
factory
);
#if defined OIS_LIRC_SUPPORT
#if defined OIS_LIRC_SUPPORT
if
(
factory
==
AddOn_LIRC
||
factory
==
AddOn_All
)
if
(
factory
==
AddOn_LIRC
||
factory
==
AddOn_All
)
{
{
...
...
src/OISJoyStick.cpp
View file @
24236447
src/OISKeyboard.cpp
View file @
24236447
src/OISObject.cpp
View file @
24236447
src/SDL/SDLInputManager.cpp
View file @
24236447
src/SDL/SDLKeyboard.cpp
View file @
24236447
src/SDL/SDLMouse.cpp
View file @
24236447
Prev
1
2
3
4
5
6
7
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment