"vscode:/vscode.git/clone" did not exist on "1cb8a563887872f64c80e8f9eb7070e5c22bd703"
Commit 01314637 authored by Ben Hymers's avatar Ben Hymers
Browse files

Removed all trailing whitespace

parent b408932f
......@@ -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
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
restrictions:
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,
an acknowledgment in the product documentation would be appreciated but is
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,
an acknowledgment in the product documentation would be appreciated but is
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.
3. This notice may not be removed or altered from any source distribution.
......
......@@ -139,7 +139,7 @@ namespace OIS
virtual ~JoyStickListener() {}
/** @remarks Joystick button down event */
virtual bool buttonPressed( const JoyStickEvent &arg, int button ) = 0;
/** @remarks Joystick button up event */
virtual bool buttonReleased( const JoyStickEvent &arg, int button ) = 0;
......@@ -149,7 +149,7 @@ namespace OIS
//-- Not so common control events, so are not required --//
//! Joystick Event, and sliderID
virtual bool sliderMoved( const JoyStickEvent &, int index) {return true;}
//! Joystick Event, and povID
virtual bool povMoved( const JoyStickEvent &arg, int index) {return true;}
......@@ -176,7 +176,7 @@ namespace OIS
/**
@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
changes
@param degrees
......
......@@ -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
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
restrictions:
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,
an acknowledgment in the product documentation would be appreciated but is
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,
an acknowledgment in the product documentation would be appreciated but is
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.
3. This notice may not be removed or altered from any source distribution.
......@@ -201,7 +201,7 @@ namespace OIS
public:
virtual ~KeyListener() {}
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
{
public:
virtual ~Keyboard() {};
/**
@remarks
Returns true if key is donwn
......@@ -247,8 +247,8 @@ namespace OIS
/**
@remarks
Enable extra processing to translate KC_*** to an
actual text character based off of locale. Different
managers may implement none or all. Check the
actual text character based off of locale. Different
managers may implement none or all. Check the
translation mode after setting to be sure
@param mode
Off, Unicode, Ascii
......@@ -260,7 +260,7 @@ namespace OIS
Returns current translation mode
*/
TextTranslationMode getTextTranslation() const {return mTextMode;}
/**
@remarks
Translates KeyCode to string representation.
......@@ -293,7 +293,7 @@ namespace OIS
(in the form of 1 is down and 0 is up)
*/
virtual void copyKeyStates(char keys[256]) const = 0;
protected:
Keyboard(const std::string &vendor, bool buffered, int devID, InputManager* creator)
: Object(vendor, OISKeyboard, buffered, devID, creator),
......
......@@ -36,7 +36,7 @@ namespace OIS
Represents the state of the multi-touch device
All members are valid for both buffered and non buffered mode
*/
//! Touch Event type
enum MultiTypeEventTypeID
{
......@@ -68,7 +68,7 @@ namespace OIS
{
return ((touchType & ( 1L << touch )) == 0) ? false : true;
}
//! Clear all the values
void clear()
{
......@@ -130,8 +130,8 @@ namespace OIS
/** @remarks Returns the state of the touch - is valid for both buffered and non buffered mode */
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 */
const std::vector<MultiTouchState> getFirstNTouchStates(int n) {
std::vector<MultiTouchState> states;
......@@ -143,7 +143,7 @@ namespace OIS
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 */
const std::vector<MultiTouchState> getMultiTouchStatesOfType(MultiTypeEventTypeID type) {
std::vector<MultiTouchState> states;
......@@ -154,7 +154,7 @@ namespace OIS
}
return states;
}
protected:
MultiTouch(const std::string &vendor, bool buffered, int devID, InputManager* creator)
: Object(vendor, OISMultiTouch, buffered, devID, creator), mListener(0) {}
......
......@@ -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
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
restrictions:
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,
an acknowledgment in the product documentation would be appreciated but is
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,
an acknowledgment in the product documentation would be appreciated but is
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.
3. This notice may not be removed or altered from any source distribution.
......
......@@ -207,10 +207,10 @@ namespace OIS
public:
Vector3() {}
Vector3(float _x, float _y, float _z) : Component(OIS_Vector3), x(_x), y(_y), z(_z) {};
//! X component of vector
float x;
//! Y component of vector
float y;
......
......@@ -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
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
restrictions:
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,
an acknowledgment in the product documentation would be appreciated but is
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,
an acknowledgment in the product documentation would be appreciated but is
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.
3. This notice may not be removed or altered from any source distribution.
......@@ -39,14 +39,14 @@ namespace OIS
/** @copydoc InputManager::inputSystemName */
virtual const std::string& inputSystemName() { return iName; }
/** @copydoc InputManager::numJoysticks */
virtual int numJoySticks();
/** @copydoc InputManager::numMice */
virtual int numMice();
/** @copydoc InputManager::numKeyBoards */
virtual int numKeyboards();
/** @copydoc InputManager::createInputObject */
Object* createInputObject( Type iType, bool bufferMode );
/** @copydoc InputManager::destroyInputObject */
......
......@@ -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
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
restrictions:
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,
an acknowledgment in the product documentation would be appreciated but is
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,
an acknowledgment in the product documentation would be appreciated but is
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.
3. This notice may not be removed or altered from any source distribution.
......
......@@ -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
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
restrictions:
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,
an acknowledgment in the product documentation would be appreciated but is
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,
an acknowledgment in the product documentation would be appreciated but is
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.
3. This notice may not be removed or altered from any source distribution.
......@@ -33,7 +33,7 @@ namespace OIS
public:
SDLMouse( bool buffered );
virtual ~SDLMouse();
/** @copydoc Object::setBuffered */
virtual void setBuffered(bool buffered);
......
......@@ -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
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
restrictions:
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,
an acknowledgment in the product documentation would be appreciated but is
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,
an acknowledgment in the product documentation would be appreciated but is
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.
3. This notice may not be removed or altered from any source distribution.
......
......@@ -16,15 +16,15 @@ namespace OIS
public:
iPhoneAccelerometer(InputManager* creator, bool buffered);
virtual ~iPhoneAccelerometer();
/** @copydoc Object::setBuffered */
virtual void setBuffered(bool buffered);
void setUpdateInterval(float interval) {
void setUpdateInterval(float interval) {
mUpdateInterval = interval;
[[UIAccelerometer sharedAccelerometer] setUpdateInterval:(1.0f / mUpdateInterval)];
}
Vector3 getAccelerometerVector3(void) { return mState.mVectors[0]; }
/** @copydoc Object::capture */
virtual void capture();
......
/*
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
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
restrictions:
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,
an acknowledgment in the product documentation would be appreciated but is
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,
an acknowledgment in the product documentation would be appreciated but is
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.
3. This notice may not be removed or altered from any source distribution.
*/
#ifndef OIS_iPhoneHelpers_H
......@@ -43,13 +43,13 @@ namespace OIS
typedef class iPhoneMultiTouchStackEvent
{
friend class iPhoneMultiTouch;
private:
iPhoneMultiTouchStackEvent( MultiTouchEvent event, iPhoneEventType type) : Event(event), Type(type) {}
iPhoneEventType Type;
MultiTouchEvent Event;
} iPhoneMultiTouchStackEvent;
}
......
/*
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
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
restrictions:
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,
an acknowledgment in the product documentation would be appreciated but is
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,
an acknowledgment in the product documentation would be appreciated but is
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.
3. This notice may not be removed or altered from any source distribution.
*/
#ifndef OIS_iPhoneInputManager_H
......@@ -51,7 +51,7 @@ namespace OIS
public:
iPhoneInputManager();
virtual ~iPhoneInputManager();
//InputManager Overrides
/** @copydoc InputManager::_initialize */
void _initialize( ParamList &paramList );
......@@ -89,7 +89,7 @@ namespace OIS
//! method for getting window
UIWindow * _getWindow() { return mWindow; }
protected:
protected:
void _parseConfigSettings( ParamList& paramList );
// iPhone stuff
......
/*
The zlib/libpng License
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
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
applications, and to alter it and redistribute it freely, subject to the following
restrictions:
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,
an acknowledgment in the product documentation would be appreciated but is
not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
*/
#ifndef OIS_iPhoneMultiTouch_H
......@@ -37,7 +37,7 @@ namespace OIS
public:
iPhoneMultiTouch( InputManager* creator, bool buffered );
virtual ~iPhoneMultiTouch();
/** @copydoc Object::setBuffered */
virtual void setBuffered(bool buffered);
......@@ -54,7 +54,7 @@ namespace OIS
void _touchEnded(UITouch *touch);
void _touchMoved(UITouch *touch);
void _touchCancelled(UITouch *touch);
protected:
MultiTouchState mTempState;
};
......
/*
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
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
restrictions:
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,
an acknowledgment in the product documentation would be appreciated but is
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,
an acknowledgment in the product documentation would be appreciated but is
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.
3. This notice may not be removed or altered from any source distribution.
*/
#ifndef OIS_iPhonePrereqs_H
......@@ -33,7 +33,7 @@ namespace OIS
class iPhoneAccelerometer;
class iPhoneMouse;
/**
/**
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
*/
......@@ -48,7 +48,7 @@ namespace OIS
//Allow this class to be autoconverted to base class of StringRef (void*)
operator void*() { return (void*)m_StringRef; }
CFStringRef cf_str() { return m_StringRef; }
private:
CFStringRef m_StringRef;
};
......
......@@ -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
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
restrictions:
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,
an acknowledgment in the product documentation would be appreciated but is
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,
an acknowledgment in the product documentation would be appreciated but is
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.
3. This notice may not be removed or altered from any source distribution.
......@@ -37,7 +37,7 @@ namespace OIS
/** @copydoc ForceFeedback::setMasterGain */
void setMasterGain(float);
/** @copydoc ForceFeedback::setAutoCenterMode */
void setAutoCenterMode(bool);
......@@ -59,7 +59,7 @@ namespace OIS
protected:
//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 );
//Specific Effect Settings
......
......@@ -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
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
restrictions:
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,
an acknowledgment in the product documentation would be appreciated but is
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,
an acknowledgment in the product documentation would be appreciated but is
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.
3. This notice may not be removed or altered from any source distribution.
......@@ -75,7 +75,7 @@ namespace OIS
//! Internal method, used for flaggin mouse as available/unavailable for creation
void _setMouseUsed(bool used) { mouseUsed = used; }
protected:
//! internal class method for dealing with param list
void _parseConfigSettings( ParamList &paramList );
......@@ -95,7 +95,7 @@ namespace OIS
//! X11 Stuff
Window window;
/// Keyboard, Mouse Settings
bool grabMouse, grabKeyboard;
bool mGrabs;
......
......@@ -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
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
restrictions:
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,
an acknowledgment in the product documentation would be appreciated but is
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,
an acknowledgment in the product documentation would be appreciated but is
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.
3. This notice may not be removed or altered from any source distribution.
......
......@@ -60,7 +60,7 @@ namespace OIS
protected:
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))
return false;
......
......@@ -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
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
restrictions:
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,
an acknowledgment in the product documentation would be appreciated but is
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,
an acknowledgment in the product documentation would be appreciated but is
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.
3. This notice may not be removed or altered from any source distribution.
......@@ -39,7 +39,7 @@ namespace OIS
class LinuxKeyboard;
class LinuxJoyStick;
class LinuxMouse;
class LinuxForceFeedback;
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