Skip to content

GitLab

Commit 01314637 authored by Ben Hymers's avatar Ben Hymers
Browse files

Removed all trailing whitespace

parent b408932f
Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 135 deletions
includes/OISInterface.h
View file @ 01314637
...@@ -6,16 +6,16 @@ Copyright (c) 2005-2007 Phillip Castaneda (pjcast -- www.wreckedgames.com) ...@@ -6,16 +6,16 @@ Copyright (c) 2005-2007 Phillip Castaneda (pjcast -- www.wreckedgames.com)
This software is provided 'as-is', without any express or implied warranty. In no event will This software is provided 'as-is', without any express or implied warranty. In no event will
the authors be held liable for any damages arising from the use of this software. the authors be held liable for any damages arising from the use of this software.
Permission is granted to anyone to use this software for any purpose, including commercial Permission is granted to anyone to use this software for any purpose, including commercial
applications, and to alter it and redistribute it freely, subject to the following applications, and to alter it and redistribute it freely, subject to the following
restrictions: restrictions:
1. The origin of this software must not be misrepresented; you must not claim that 1. The origin of this software must not be misrepresented; you must not claim that
you wrote the original software. If you use this software in a product, you wrote the original software. If you use this software in a product,
an acknowledgment in the product documentation would be appreciated but is an acknowledgment in the product documentation would be appreciated but is
not required. not required.
2. Altered source versions must be plainly marked as such, and must not be 2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software. misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
......
includes/OISJoyStick.h
View file @ 01314637
...@@ -139,7 +139,7 @@ namespace OIS ...@@ -139,7 +139,7 @@ namespace OIS
virtual ~JoyStickListener() {} virtual ~JoyStickListener() {}
/** @remarks Joystick button down event */ /** @remarks Joystick button down event */
virtual bool buttonPressed( const JoyStickEvent &arg, int button ) = 0; virtual bool buttonPressed( const JoyStickEvent &arg, int button ) = 0;
/** @remarks Joystick button up event */ /** @remarks Joystick button up event */
virtual bool buttonReleased( const JoyStickEvent &arg, int button ) = 0; virtual bool buttonReleased( const JoyStickEvent &arg, int button ) = 0;
...@@ -149,7 +149,7 @@ namespace OIS ...@@ -149,7 +149,7 @@ namespace OIS
//-- Not so common control events, so are not required --// //-- Not so common control events, so are not required --//
//! Joystick Event, and sliderID //! Joystick Event, and sliderID
virtual bool sliderMoved( const JoyStickEvent &, int index) {return true;} virtual bool sliderMoved( const JoyStickEvent &, int index) {return true;}
//! Joystick Event, and povID //! Joystick Event, and povID
virtual bool povMoved( const JoyStickEvent &arg, int index) {return true;} virtual bool povMoved( const JoyStickEvent &arg, int index) {return true;}
...@@ -176,7 +176,7 @@ namespace OIS ...@@ -176,7 +176,7 @@ namespace OIS
/** /**
@remarks @remarks
Sets a cutoff limit for changes in the Vector3 component for movement to Sets a cutoff limit for changes in the Vector3 component for movement to
be ignored. Helps reduce much event traffic for frequent small/sensitive be ignored. Helps reduce much event traffic for frequent small/sensitive
changes changes
@param degrees @param degrees
......
includes/OISKeyboard.h
View file @ 01314637
...@@ -6,16 +6,16 @@ Copyright (c) 2005-2007 Phillip Castaneda (pjcast -- www.wreckedgames.com) ...@@ -6,16 +6,16 @@ Copyright (c) 2005-2007 Phillip Castaneda (pjcast -- www.wreckedgames.com)
This software is provided 'as-is', without any express or implied warranty. In no event will This software is provided 'as-is', without any express or implied warranty. In no event will
the authors be held liable for any damages arising from the use of this software. the authors be held liable for any damages arising from the use of this software.
Permission is granted to anyone to use this software for any purpose, including commercial Permission is granted to anyone to use this software for any purpose, including commercial
applications, and to alter it and redistribute it freely, subject to the following applications, and to alter it and redistribute it freely, subject to the following
restrictions: restrictions:
1. The origin of this software must not be misrepresented; you must not claim that 1. The origin of this software must not be misrepresented; you must not claim that
you wrote the original software. If you use this software in a product, you wrote the original software. If you use this software in a product,
an acknowledgment in the product documentation would be appreciated but is an acknowledgment in the product documentation would be appreciated but is
not required. not required.
2. Altered source versions must be plainly marked as such, and must not be 2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software. misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
...@@ -201,7 +201,7 @@ namespace OIS ...@@ -201,7 +201,7 @@ namespace OIS
public: public:
virtual ~KeyListener() {} virtual ~KeyListener() {}
virtual bool keyPressed(const KeyEvent &arg) = 0; virtual bool keyPressed(const KeyEvent &arg) = 0;
virtual bool keyReleased(const KeyEvent &arg) = 0; virtual bool keyReleased(const KeyEvent &arg) = 0;
}; };
/** /**
...@@ -212,7 +212,7 @@ namespace OIS ...@@ -212,7 +212,7 @@ namespace OIS
{ {
public: public:
virtual ~Keyboard() {}; virtual ~Keyboard() {};
/** /**
@remarks @remarks
Returns true if key is donwn Returns true if key is donwn
...@@ -247,8 +247,8 @@ namespace OIS ...@@ -247,8 +247,8 @@ namespace OIS
/** /**
@remarks @remarks
Enable extra processing to translate KC_*** to an Enable extra processing to translate KC_*** to an
actual text character based off of locale. Different actual text character based off of locale. Different
managers may implement none or all. Check the managers may implement none or all. Check the
translation mode after setting to be sure translation mode after setting to be sure
@param mode @param mode
Off, Unicode, Ascii Off, Unicode, Ascii
...@@ -260,7 +260,7 @@ namespace OIS ...@@ -260,7 +260,7 @@ namespace OIS
Returns current translation mode Returns current translation mode
*/ */
TextTranslationMode getTextTranslation() const {return mTextMode;} TextTranslationMode getTextTranslation() const {return mTextMode;}
/** /**
@remarks @remarks
Translates KeyCode to string representation. Translates KeyCode to string representation.
...@@ -293,7 +293,7 @@ namespace OIS ...@@ -293,7 +293,7 @@ namespace OIS
(in the form of 1 is down and 0 is up) (in the form of 1 is down and 0 is up)
*/ */
virtual void copyKeyStates(char keys[256]) const = 0; virtual void copyKeyStates(char keys[256]) const = 0;
protected: protected:
Keyboard(const std::string &vendor, bool buffered, int devID, InputManager* creator) Keyboard(const std::string &vendor, bool buffered, int devID, InputManager* creator)
: Object(vendor, OISKeyboard, buffered, devID, creator), : Object(vendor, OISKeyboard, buffered, devID, creator),
......
includes/OISMultiTouch.h
View file @ 01314637
...@@ -36,7 +36,7 @@ namespace OIS ...@@ -36,7 +36,7 @@ namespace OIS
Represents the state of the multi-touch device Represents the state of the multi-touch device
All members are valid for both buffered and non buffered mode All members are valid for both buffered and non buffered mode
*/ */
//! Touch Event type //! Touch Event type
enum MultiTypeEventTypeID enum MultiTypeEventTypeID
{ {
...@@ -68,7 +68,7 @@ namespace OIS ...@@ -68,7 +68,7 @@ namespace OIS
{ {
return ((touchType & ( 1L << touch )) == 0) ? false : true; return ((touchType & ( 1L << touch )) == 0) ? false : true;
} }
//! Clear all the values //! Clear all the values
void clear() void clear()
{ {
...@@ -130,8 +130,8 @@ namespace OIS ...@@ -130,8 +130,8 @@ namespace OIS
/** @remarks Returns the state of the touch - is valid for both buffered and non buffered mode */ /** @remarks Returns the state of the touch - is valid for both buffered and non buffered mode */
std::vector<MultiTouchState> getMultiTouchStates() const { return mStates; } std::vector<MultiTouchState> getMultiTouchStates() const { return mStates; }
/** @remarks Returns the first n touch states. Useful if you know your app only needs to /** @remarks Returns the first n touch states. Useful if you know your app only needs to
process n touches. The return value is a vector to allow random access */ process n touches. The return value is a vector to allow random access */
const std::vector<MultiTouchState> getFirstNTouchStates(int n) { const std::vector<MultiTouchState> getFirstNTouchStates(int n) {
std::vector<MultiTouchState> states; std::vector<MultiTouchState> states;
...@@ -143,7 +143,7 @@ namespace OIS ...@@ -143,7 +143,7 @@ namespace OIS
return states; return states;
} }
/** @remarks Returns the first n touch states. Useful if you know your app only needs to /** @remarks Returns the first n touch states. Useful if you know your app only needs to
process n touches. The return value is a vector to allow random access */ process n touches. The return value is a vector to allow random access */
const std::vector<MultiTouchState> getMultiTouchStatesOfType(MultiTypeEventTypeID type) { const std::vector<MultiTouchState> getMultiTouchStatesOfType(MultiTypeEventTypeID type) {
std::vector<MultiTouchState> states; std::vector<MultiTouchState> states;
...@@ -154,7 +154,7 @@ namespace OIS ...@@ -154,7 +154,7 @@ namespace OIS
} }
return states; return states;
} }
protected: protected:
MultiTouch(const std::string &vendor, bool buffered, int devID, InputManager* creator) MultiTouch(const std::string &vendor, bool buffered, int devID, InputManager* creator)
: Object(vendor, OISMultiTouch, buffered, devID, creator), mListener(0) {} : Object(vendor, OISMultiTouch, buffered, devID, creator), mListener(0) {}
......
includes/OISObject.h
View file @ 01314637
...@@ -6,16 +6,16 @@ Copyright (c) 2005-2007 Phillip Castaneda (pjcast -- www.wreckedgames.com) ...@@ -6,16 +6,16 @@ Copyright (c) 2005-2007 Phillip Castaneda (pjcast -- www.wreckedgames.com)
This software is provided 'as-is', without any express or implied warranty. In no event will This software is provided 'as-is', without any express or implied warranty. In no event will
the authors be held liable for any damages arising from the use of this software. the authors be held liable for any damages arising from the use of this software.
Permission is granted to anyone to use this software for any purpose, including commercial Permission is granted to anyone to use this software for any purpose, including commercial
applications, and to alter it and redistribute it freely, subject to the following applications, and to alter it and redistribute it freely, subject to the following
restrictions: restrictions:
1. The origin of this software must not be misrepresented; you must not claim that 1. The origin of this software must not be misrepresented; you must not claim that
you wrote the original software. If you use this software in a product, you wrote the original software. If you use this software in a product,
an acknowledgment in the product documentation would be appreciated but is an acknowledgment in the product documentation would be appreciated but is
not required. not required.
2. Altered source versions must be plainly marked as such, and must not be 2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software. misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
......
includes/OISPrereqs.h
View file @ 01314637
...@@ -207,10 +207,10 @@ namespace OIS ...@@ -207,10 +207,10 @@ namespace OIS
public: public:
Vector3() {} Vector3() {}
Vector3(float _x, float _y, float _z) : Component(OIS_Vector3), x(_x), y(_y), z(_z) {}; Vector3(float _x, float _y, float _z) : Component(OIS_Vector3), x(_x), y(_y), z(_z) {};
//! X component of vector //! X component of vector
float x; float x;
//! Y component of vector //! Y component of vector
float y; float y;
......
includes/SDL/SDLInputManager.h
View file @ 01314637
...@@ -6,16 +6,16 @@ Copyright (c) 2005-2007 Phillip Castaneda (pjcast -- www.wreckedgames.com) ...@@ -6,16 +6,16 @@ Copyright (c) 2005-2007 Phillip Castaneda (pjcast -- www.wreckedgames.com)
This software is provided 'as-is', without any express or implied warranty. In no event will This software is provided 'as-is', without any express or implied warranty. In no event will
the authors be held liable for any damages arising from the use of this software. the authors be held liable for any damages arising from the use of this software.
Permission is granted to anyone to use this software for any purpose, including commercial Permission is granted to anyone to use this software for any purpose, including commercial
applications, and to alter it and redistribute it freely, subject to the following applications, and to alter it and redistribute it freely, subject to the following
restrictions: restrictions:
1. The origin of this software must not be misrepresented; you must not claim that 1. The origin of this software must not be misrepresented; you must not claim that
you wrote the original software. If you use this software in a product, you wrote the original software. If you use this software in a product,
an acknowledgment in the product documentation would be appreciated but is an acknowledgment in the product documentation would be appreciated but is
not required. not required.
2. Altered source versions must be plainly marked as such, and must not be 2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software. misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
...@@ -39,14 +39,14 @@ namespace OIS ...@@ -39,14 +39,14 @@ namespace OIS
/** @copydoc InputManager::inputSystemName */ /** @copydoc InputManager::inputSystemName */
virtual const std::string& inputSystemName() { return iName; } virtual const std::string& inputSystemName() { return iName; }
/** @copydoc InputManager::numJoysticks */ /** @copydoc InputManager::numJoysticks */
virtual int numJoySticks(); virtual int numJoySticks();
/** @copydoc InputManager::numMice */ /** @copydoc InputManager::numMice */
virtual int numMice(); virtual int numMice();
/** @copydoc InputManager::numKeyBoards */ /** @copydoc InputManager::numKeyBoards */
virtual int numKeyboards(); virtual int numKeyboards();
/** @copydoc InputManager::createInputObject */ /** @copydoc InputManager::createInputObject */
Object* createInputObject( Type iType, bool bufferMode ); Object* createInputObject( Type iType, bool bufferMode );
/** @copydoc InputManager::destroyInputObject */ /** @copydoc InputManager::destroyInputObject */
......
includes/SDL/SDLKeyboard.h
View file @ 01314637
...@@ -6,16 +6,16 @@ Copyright (c) 2005-2007 Phillip Castaneda (pjcast -- www.wreckedgames.com) ...@@ -6,16 +6,16 @@ Copyright (c) 2005-2007 Phillip Castaneda (pjcast -- www.wreckedgames.com)
This software is provided 'as-is', without any express or implied warranty. In no event will This software is provided 'as-is', without any express or implied warranty. In no event will
the authors be held liable for any damages arising from the use of this software. the authors be held liable for any damages arising from the use of this software.
Permission is granted to anyone to use this software for any purpose, including commercial Permission is granted to anyone to use this software for any purpose, including commercial
applications, and to alter it and redistribute it freely, subject to the following applications, and to alter it and redistribute it freely, subject to the following
restrictions: restrictions:
1. The origin of this software must not be misrepresented; you must not claim that 1. The origin of this software must not be misrepresented; you must not claim that
you wrote the original software. If you use this software in a product, you wrote the original software. If you use this software in a product,
an acknowledgment in the product documentation would be appreciated but is an acknowledgment in the product documentation would be appreciated but is
not required. not required.
2. Altered source versions must be plainly marked as such, and must not be 2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software. misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
......
includes/SDL/SDLMouse.h
View file @ 01314637
...@@ -6,16 +6,16 @@ Copyright (c) 2005-2007 Phillip Castaneda (pjcast -- www.wreckedgames.com) ...@@ -6,16 +6,16 @@ Copyright (c) 2005-2007 Phillip Castaneda (pjcast -- www.wreckedgames.com)
This software is provided 'as-is', without any express or implied warranty. In no event will This software is provided 'as-is', without any express or implied warranty. In no event will
the authors be held liable for any damages arising from the use of this software. the authors be held liable for any damages arising from the use of this software.
Permission is granted to anyone to use this software for any purpose, including commercial Permission is granted to anyone to use this software for any purpose, including commercial
applications, and to alter it and redistribute it freely, subject to the following applications, and to alter it and redistribute it freely, subject to the following
restrictions: restrictions:
1. The origin of this software must not be misrepresented; you must not claim that 1. The origin of this software must not be misrepresented; you must not claim that
you wrote the original software. If you use this software in a product, you wrote the original software. If you use this software in a product,
an acknowledgment in the product documentation would be appreciated but is an acknowledgment in the product documentation would be appreciated but is
not required. not required.
2. Altered source versions must be plainly marked as such, and must not be 2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software. misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
...@@ -33,7 +33,7 @@ namespace OIS ...@@ -33,7 +33,7 @@ namespace OIS
public: public:
SDLMouse( bool buffered ); SDLMouse( bool buffered );
virtual ~SDLMouse(); virtual ~SDLMouse();
/** @copydoc Object::setBuffered */ /** @copydoc Object::setBuffered */
virtual void setBuffered(bool buffered); virtual void setBuffered(bool buffered);
......
includes/SDL/SDLPrereqs.h
View file @ 01314637
...@@ -6,16 +6,16 @@ Copyright (c) 2005-2007 Phillip Castaneda (pjcast -- www.wreckedgames.com) ...@@ -6,16 +6,16 @@ Copyright (c) 2005-2007 Phillip Castaneda (pjcast -- www.wreckedgames.com)
This software is provided 'as-is', without any express or implied warranty. In no event will This software is provided 'as-is', without any express or implied warranty. In no event will
the authors be held liable for any damages arising from the use of this software. the authors be held liable for any damages arising from the use of this software.
Permission is granted to anyone to use this software for any purpose, including commercial Permission is granted to anyone to use this software for any purpose, including commercial
applications, and to alter it and redistribute it freely, subject to the following applications, and to alter it and redistribute it freely, subject to the following
restrictions: restrictions:
1. The origin of this software must not be misrepresented; you must not claim that 1. The origin of this software must not be misrepresented; you must not claim that
you wrote the original software. If you use this software in a product, you wrote the original software. If you use this software in a product,
an acknowledgment in the product documentation would be appreciated but is an acknowledgment in the product documentation would be appreciated but is
not required. not required.
2. Altered source versions must be plainly marked as such, and must not be 2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software. misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
......
includes/iphone/iPhoneAccelerometer.h
View file @ 01314637
...@@ -16,15 +16,15 @@ namespace OIS ...@@ -16,15 +16,15 @@ namespace OIS
public: public:
iPhoneAccelerometer(InputManager* creator, bool buffered); iPhoneAccelerometer(InputManager* creator, bool buffered);
virtual ~iPhoneAccelerometer(); virtual ~iPhoneAccelerometer();
/** @copydoc Object::setBuffered */ /** @copydoc Object::setBuffered */
virtual void setBuffered(bool buffered); virtual void setBuffered(bool buffered);
void setUpdateInterval(float interval) { void setUpdateInterval(float interval) {
mUpdateInterval = interval; mUpdateInterval = interval;
[[UIAccelerometer sharedAccelerometer] setUpdateInterval:(1.0f / mUpdateInterval)]; [[UIAccelerometer sharedAccelerometer] setUpdateInterval:(1.0f / mUpdateInterval)];
} }
Vector3 getAccelerometerVector3(void) { return mState.mVectors[0]; } Vector3 getAccelerometerVector3(void) { return mState.mVectors[0]; }
/** @copydoc Object::capture */ /** @copydoc Object::capture */
virtual void capture(); virtual void capture();
......
includes/iphone/iPhoneHelpers.h
View file @ 01314637
/* /*
The zlib/libpng License The zlib/libpng License
Copyright (c) 2006 Chris Snyder Copyright (c) 2006 Chris Snyder
This software is provided 'as-is', without any express or implied warranty. In no event will This software is provided 'as-is', without any express or implied warranty. In no event will
the authors be held liable for any damages arising from the use of this software. the authors be held liable for any damages arising from the use of this software.
Permission is granted to anyone to use this software for any purpose, including commercial Permission is granted to anyone to use this software for any purpose, including commercial
applications, and to alter it and redistribute it freely, subject to the following applications, and to alter it and redistribute it freely, subject to the following
restrictions: restrictions:
1. The origin of this software must not be misrepresented; you must not claim that 1. The origin of this software must not be misrepresented; you must not claim that
you wrote the original software. If you use this software in a product, you wrote the original software. If you use this software in a product,
an acknowledgment in the product documentation would be appreciated but is an acknowledgment in the product documentation would be appreciated but is
not required. not required.
2. Altered source versions must be plainly marked as such, and must not be 2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software. misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef OIS_iPhoneHelpers_H #ifndef OIS_iPhoneHelpers_H
...@@ -43,13 +43,13 @@ namespace OIS ...@@ -43,13 +43,13 @@ namespace OIS
typedef class iPhoneMultiTouchStackEvent typedef class iPhoneMultiTouchStackEvent
{ {
friend class iPhoneMultiTouch; friend class iPhoneMultiTouch;
private: private:
iPhoneMultiTouchStackEvent( MultiTouchEvent event, iPhoneEventType type) : Event(event), Type(type) {} iPhoneMultiTouchStackEvent( MultiTouchEvent event, iPhoneEventType type) : Event(event), Type(type) {}
iPhoneEventType Type; iPhoneEventType Type;
MultiTouchEvent Event; MultiTouchEvent Event;
} iPhoneMultiTouchStackEvent; } iPhoneMultiTouchStackEvent;
} }
......
includes/iphone/iPhoneInputManager.h
View file @ 01314637
/* /*
The zlib/libpng License The zlib/libpng License
Copyright (c) 2006 Chris Snyder Copyright (c) 2006 Chris Snyder
This software is provided 'as-is', without any express or implied warranty. In no event will This software is provided 'as-is', without any express or implied warranty. In no event will
the authors be held liable for any damages arising from the use of this software. the authors be held liable for any damages arising from the use of this software.
Permission is granted to anyone to use this software for any purpose, including commercial Permission is granted to anyone to use this software for any purpose, including commercial
applications, and to alter it and redistribute it freely, subject to the following applications, and to alter it and redistribute it freely, subject to the following
restrictions: restrictions:
1. The origin of this software must not be misrepresented; you must not claim that 1. The origin of this software must not be misrepresented; you must not claim that
you wrote the original software. If you use this software in a product, you wrote the original software. If you use this software in a product,
an acknowledgment in the product documentation would be appreciated but is an acknowledgment in the product documentation would be appreciated but is
not required. not required.
2. Altered source versions must be plainly marked as such, and must not be 2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software. misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef OIS_iPhoneInputManager_H #ifndef OIS_iPhoneInputManager_H
...@@ -51,7 +51,7 @@ namespace OIS ...@@ -51,7 +51,7 @@ namespace OIS
public: public:
iPhoneInputManager(); iPhoneInputManager();
virtual ~iPhoneInputManager(); virtual ~iPhoneInputManager();
//InputManager Overrides //InputManager Overrides
/** @copydoc InputManager::_initialize */ /** @copydoc InputManager::_initialize */
void _initialize( ParamList &paramList ); void _initialize( ParamList &paramList );
...@@ -89,7 +89,7 @@ namespace OIS ...@@ -89,7 +89,7 @@ namespace OIS
//! method for getting window //! method for getting window
UIWindow * _getWindow() { return mWindow; } UIWindow * _getWindow() { return mWindow; }
protected: protected:
void _parseConfigSettings( ParamList& paramList ); void _parseConfigSettings( ParamList& paramList );
// iPhone stuff // iPhone stuff
......
includes/iphone/iPhoneMultiTouch.h
View file @ 01314637
/* /*
The zlib/libpng License The zlib/libpng License
Copyright (c) 2005-2007 Phillip Castaneda (pjcast -- www.wreckedgames.com) Copyright (c) 2005-2007 Phillip Castaneda (pjcast -- www.wreckedgames.com)
This software is provided 'as-is', without any express or implied warranty. In no event will This software is provided 'as-is', without any express or implied warranty. In no event will
the authors be held liable for any damages arising from the use of this software. the authors be held liable for any damages arising from the use of this software.
Permission is granted to anyone to use this software for any purpose, including commercial Permission is granted to anyone to use this software for any purpose, including commercial
applications, and to alter it and redistribute it freely, subject to the following applications, and to alter it and redistribute it freely, subject to the following
restrictions: restrictions:
1. The origin of this software must not be misrepresented; you must not claim that 1. The origin of this software must not be misrepresented; you must not claim that
you wrote the original software. If you use this software in a product, you wrote the original software. If you use this software in a product,
an acknowledgment in the product documentation would be appreciated but is an acknowledgment in the product documentation would be appreciated but is
not required. not required.
2. Altered source versions must be plainly marked as such, and must not be 2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software. misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef OIS_iPhoneMultiTouch_H #ifndef OIS_iPhoneMultiTouch_H
...@@ -37,7 +37,7 @@ namespace OIS ...@@ -37,7 +37,7 @@ namespace OIS
public: public:
iPhoneMultiTouch( InputManager* creator, bool buffered ); iPhoneMultiTouch( InputManager* creator, bool buffered );
virtual ~iPhoneMultiTouch(); virtual ~iPhoneMultiTouch();
/** @copydoc Object::setBuffered */ /** @copydoc Object::setBuffered */
virtual void setBuffered(bool buffered); virtual void setBuffered(bool buffered);
...@@ -54,7 +54,7 @@ namespace OIS ...@@ -54,7 +54,7 @@ namespace OIS
void _touchEnded(UITouch *touch); void _touchEnded(UITouch *touch);
void _touchMoved(UITouch *touch); void _touchMoved(UITouch *touch);
void _touchCancelled(UITouch *touch); void _touchCancelled(UITouch *touch);
protected: protected:
MultiTouchState mTempState; MultiTouchState mTempState;
}; };
......
includes/iphone/iPhonePrereqs.h
View file @ 01314637
/* /*
The zlib/libpng License The zlib/libpng License
Copyright (c) 2006 Chris Snyder Copyright (c) 2006 Chris Snyder
This software is provided 'as-is', without any express or implied warranty. In no event will This software is provided 'as-is', without any express or implied warranty. In no event will
the authors be held liable for any damages arising from the use of this software. the authors be held liable for any damages arising from the use of this software.
Permission is granted to anyone to use this software for any purpose, including commercial Permission is granted to anyone to use this software for any purpose, including commercial
applications, and to alter it and redistribute it freely, subject to the following applications, and to alter it and redistribute it freely, subject to the following
restrictions: restrictions:
1. The origin of this software must not be misrepresented; you must not claim that 1. The origin of this software must not be misrepresented; you must not claim that
you wrote the original software. If you use this software in a product, you wrote the original software. If you use this software in a product,
an acknowledgment in the product documentation would be appreciated but is an acknowledgment in the product documentation would be appreciated but is
not required. not required.
2. Altered source versions must be plainly marked as such, and must not be 2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software. misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef OIS_iPhonePrereqs_H #ifndef OIS_iPhonePrereqs_H
...@@ -33,7 +33,7 @@ namespace OIS ...@@ -33,7 +33,7 @@ namespace OIS
class iPhoneAccelerometer; class iPhoneAccelerometer;
class iPhoneMouse; class iPhoneMouse;
/** /**
Simple wrapper class for CFString which will create a valid CFString and retain ownership until class instance is outof scope Simple wrapper class for CFString which will create a valid CFString and retain ownership until class instance is outof scope
To Access the CFStringRef instance, simply cast to void*, pass into a function expecting a void* CFStringRef object, or access via cf_str() method To Access the CFStringRef instance, simply cast to void*, pass into a function expecting a void* CFStringRef object, or access via cf_str() method
*/ */
...@@ -48,7 +48,7 @@ namespace OIS ...@@ -48,7 +48,7 @@ namespace OIS
//Allow this class to be autoconverted to base class of StringRef (void*) //Allow this class to be autoconverted to base class of StringRef (void*)
operator void*() { return (void*)m_StringRef; } operator void*() { return (void*)m_StringRef; }
CFStringRef cf_str() { return m_StringRef; } CFStringRef cf_str() { return m_StringRef; }
private: private:
CFStringRef m_StringRef; CFStringRef m_StringRef;
}; };
......
includes/linux/LinuxForceFeedback.h
View file @ 01314637
...@@ -6,16 +6,16 @@ Copyright (c) 2005-2007 Phillip Castaneda (pjcast -- www.wreckedgames.com) ...@@ -6,16 +6,16 @@ Copyright (c) 2005-2007 Phillip Castaneda (pjcast -- www.wreckedgames.com)
This software is provided 'as-is', without any express or implied warranty. In no event will This software is provided 'as-is', without any express or implied warranty. In no event will
the authors be held liable for any damages arising from the use of this software. the authors be held liable for any damages arising from the use of this software.
Permission is granted to anyone to use this software for any purpose, including commercial Permission is granted to anyone to use this software for any purpose, including commercial
applications, and to alter it and redistribute it freely, subject to the following applications, and to alter it and redistribute it freely, subject to the following
restrictions: restrictions:
1. The origin of this software must not be misrepresented; you must not claim that 1. The origin of this software must not be misrepresented; you must not claim that
you wrote the original software. If you use this software in a product, you wrote the original software. If you use this software in a product,
an acknowledgment in the product documentation would be appreciated but is an acknowledgment in the product documentation would be appreciated but is
not required. not required.
2. Altered source versions must be plainly marked as such, and must not be 2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software. misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
...@@ -37,7 +37,7 @@ namespace OIS ...@@ -37,7 +37,7 @@ namespace OIS
/** @copydoc ForceFeedback::setMasterGain */ /** @copydoc ForceFeedback::setMasterGain */
void setMasterGain(float); void setMasterGain(float);
/** @copydoc ForceFeedback::setAutoCenterMode */ /** @copydoc ForceFeedback::setAutoCenterMode */
void setAutoCenterMode(bool); void setAutoCenterMode(bool);
...@@ -59,7 +59,7 @@ namespace OIS ...@@ -59,7 +59,7 @@ namespace OIS
protected: protected:
//Sets the common properties to all effects //Sets the common properties to all effects
void _setCommonProperties(struct ff_effect *event, struct ff_envelope *ffenvelope, void _setCommonProperties(struct ff_effect *event, struct ff_envelope *ffenvelope,
const Effect* effect, const Envelope *envelope ); const Effect* effect, const Envelope *envelope );
//Specific Effect Settings //Specific Effect Settings
......
includes/linux/LinuxInputManager.h
View file @ 01314637
...@@ -6,16 +6,16 @@ Copyright (c) 2005-2007 Phillip Castaneda (pjcast -- www.wreckedgames.com) ...@@ -6,16 +6,16 @@ Copyright (c) 2005-2007 Phillip Castaneda (pjcast -- www.wreckedgames.com)
This software is provided 'as-is', without any express or implied warranty. In no event will This software is provided 'as-is', without any express or implied warranty. In no event will
the authors be held liable for any damages arising from the use of this software. the authors be held liable for any damages arising from the use of this software.
Permission is granted to anyone to use this software for any purpose, including commercial Permission is granted to anyone to use this software for any purpose, including commercial
applications, and to alter it and redistribute it freely, subject to the following applications, and to alter it and redistribute it freely, subject to the following
restrictions: restrictions:
1. The origin of this software must not be misrepresented; you must not claim that 1. The origin of this software must not be misrepresented; you must not claim that
you wrote the original software. If you use this software in a product, you wrote the original software. If you use this software in a product,
an acknowledgment in the product documentation would be appreciated but is an acknowledgment in the product documentation would be appreciated but is
not required. not required.
2. Altered source versions must be plainly marked as such, and must not be 2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software. misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
...@@ -75,7 +75,7 @@ namespace OIS ...@@ -75,7 +75,7 @@ namespace OIS
//! Internal method, used for flaggin mouse as available/unavailable for creation //! Internal method, used for flaggin mouse as available/unavailable for creation
void _setMouseUsed(bool used) { mouseUsed = used; } void _setMouseUsed(bool used) { mouseUsed = used; }
protected: protected:
//! internal class method for dealing with param list //! internal class method for dealing with param list
void _parseConfigSettings( ParamList &paramList ); void _parseConfigSettings( ParamList &paramList );
...@@ -95,7 +95,7 @@ namespace OIS ...@@ -95,7 +95,7 @@ namespace OIS
//! X11 Stuff //! X11 Stuff
Window window; Window window;
/// Keyboard, Mouse Settings /// Keyboard, Mouse Settings
bool grabMouse, grabKeyboard; bool grabMouse, grabKeyboard;
bool mGrabs; bool mGrabs;
......
includes/linux/LinuxJoyStickEvents.h
View file @ 01314637
...@@ -6,16 +6,16 @@ Copyright (c) 2005-2007 Phillip Castaneda (pjcast -- www.wreckedgames.com) ...@@ -6,16 +6,16 @@ Copyright (c) 2005-2007 Phillip Castaneda (pjcast -- www.wreckedgames.com)
This software is provided 'as-is', without any express or implied warranty. In no event will This software is provided 'as-is', without any express or implied warranty. In no event will
the authors be held liable for any damages arising from the use of this software. the authors be held liable for any damages arising from the use of this software.
Permission is granted to anyone to use this software for any purpose, including commercial Permission is granted to anyone to use this software for any purpose, including commercial
applications, and to alter it and redistribute it freely, subject to the following applications, and to alter it and redistribute it freely, subject to the following
restrictions: restrictions:
1. The origin of this software must not be misrepresented; you must not claim that 1. The origin of this software must not be misrepresented; you must not claim that
you wrote the original software. If you use this software in a product, you wrote the original software. If you use this software in a product,
an acknowledgment in the product documentation would be appreciated but is an acknowledgment in the product documentation would be appreciated but is
not required. not required.
2. Altered source versions must be plainly marked as such, and must not be 2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software. misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
......
includes/linux/LinuxKeyboard.h
View file @ 01314637
...@@ -60,7 +60,7 @@ namespace OIS ...@@ -60,7 +60,7 @@ namespace OIS
protected: protected:
inline bool _isKeyRepeat(XEvent &event) inline bool _isKeyRepeat(XEvent &event)
{ {
//When a key is repeated, there will be two events: released, followed by another immediate pressed. So check to see if another pressed is present //When a key is repeated, there will be two events: released, followed by another immediate pressed. So check to see if another pressed is present
if(!XPending(display)) if(!XPending(display))
return false; return false;
......
includes/linux/LinuxPrereqs.h
View file @ 01314637
...@@ -6,16 +6,16 @@ Copyright (c) 2005-2007 Phillip Castaneda (pjcast -- www.wreckedgames.com) ...@@ -6,16 +6,16 @@ Copyright (c) 2005-2007 Phillip Castaneda (pjcast -- www.wreckedgames.com)
This software is provided 'as-is', without any express or implied warranty. In no event will This software is provided 'as-is', without any express or implied warranty. In no event will
the authors be held liable for any damages arising from the use of this software. the authors be held liable for any damages arising from the use of this software.
Permission is granted to anyone to use this software for any purpose, including commercial Permission is granted to anyone to use this software for any purpose, including commercial
applications, and to alter it and redistribute it freely, subject to the following applications, and to alter it and redistribute it freely, subject to the following
restrictions: restrictions:
1. The origin of this software must not be misrepresented; you must not claim that 1. The origin of this software must not be misrepresented; you must not claim that
you wrote the original software. If you use this software in a product, you wrote the original software. If you use this software in a product,
an acknowledgment in the product documentation would be appreciated but is an acknowledgment in the product documentation would be appreciated but is
not required. not required.
2. Altered source versions must be plainly marked as such, and must not be 2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software. misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
...@@ -39,7 +39,7 @@ namespace OIS ...@@ -39,7 +39,7 @@ namespace OIS
class LinuxKeyboard; class LinuxKeyboard;
class LinuxJoyStick; class LinuxJoyStick;
class LinuxMouse; class LinuxMouse;
class LinuxForceFeedback; class LinuxForceFeedback;
class Range class Range
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment