actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style

Browse Source
This commit is contained in:
Glenn Maynard
2005-05-25 22:32:12 +00:00
parent f9192adc07
commit cef33517ee
5 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/InputHandler/InputHandler_DirectInput.h
+8 -7
View File
@@ -7,6 +7,14 @@
struct DIDevice; struct DIDevice;
class InputHandler_DInput: public InputHandler class InputHandler_DInput: public InputHandler
{ {
public:
InputHandler_DInput();
~InputHandler_DInput();
void GetDevicesAndDescriptions(vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut);
void Update(float fDeltaTime);
void WindowReset();
private:
RageThread InputThread; RageThread InputThread;
bool shutdown; bool shutdown;
@@ -19,13 +27,6 @@ class InputHandler_DInput: public InputHandler
void StartThread(); void StartThread();
void ShutdownThread(); void ShutdownThread();
public:
InputHandler_DInput();
~InputHandler_DInput();
void GetDevicesAndDescriptions(vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut);
void Update(float fDeltaTime);
void WindowReset();
}; };
#define USE_INPUT_HANDLER_DIRECTINPUT #define USE_INPUT_HANDLER_DIRECTINPUT
stepmania/src/arch/InputHandler/InputHandler_MonkeyKeyboard.h
+5 -4
View File
@@ -1,5 +1,5 @@
#ifndef INPUT_HANDLER_MONKEY_SCRIPT #ifndef INPUT_HANDLER_MONKEY_SCRIPT
#define INPUT_HANDLER_MONKEY_SCRIPT 1 #define INPUT_HANDLER_MONKEY_SCRIPT
#include "InputHandler.h" #include "InputHandler.h"
#include "RageTimer.h" #include "RageTimer.h"
@@ -7,14 +7,15 @@
class InputHandler_MonkeyKeyboard: public InputHandler class InputHandler_MonkeyKeyboard: public InputHandler
{ {
RageTimer m_timerPressButton;
DeviceInput m_diLast; // Last input that we sent
public: public:
void Update(float fDeltaTime); void Update(float fDeltaTime);
InputHandler_MonkeyKeyboard(); InputHandler_MonkeyKeyboard();
~InputHandler_MonkeyKeyboard(); ~InputHandler_MonkeyKeyboard();
void GetDevicesAndDescriptions(vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut); void GetDevicesAndDescriptions(vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut);
private:
RageTimer m_timerPressButton;
DeviceInput m_diLast; // Last input that we sent
}; };
#define USE_INPUT_HANDLER_MONKEY_KEYBOARD #define USE_INPUT_HANDLER_MONKEY_KEYBOARD
stepmania/src/arch/InputHandler/InputHandler_Win32_MIDI.h
+3 -2
View File
@@ -10,10 +10,11 @@ public:
InputHandler_Win32_MIDI(); InputHandler_Win32_MIDI();
~InputHandler_Win32_MIDI(); ~InputHandler_Win32_MIDI();
void Update(float fDeltaTime); void Update( float fDeltaTime );
void GetDevicesAndDescriptions(vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut); void GetDevicesAndDescriptions( vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut );
void SetDev( DeviceInput key, bool pressed ) { ButtonPressed( key, pressed ); } void SetDev( DeviceInput key, bool pressed ) { ButtonPressed( key, pressed ); }
private: private:
bool m_bFoundDevice; bool m_bFoundDevice;
}; };
stepmania/src/arch/InputHandler/InputHandler_Win32_Para.h
+8 -8
View File
@@ -1,5 +1,5 @@
#ifndef INPUT_HANDLER_WIN32_PARA_H #ifndef INPUT_HANDLER_WIN32_PARA_H
#define INPUT_HANDLER_WIN32_PARA_H 1 #define INPUT_HANDLER_WIN32_PARA_H
#include "InputHandler.h" #include "InputHandler.h"
#include "RageThreads.h" #include "RageThreads.h"
@@ -7,6 +7,13 @@
class USBDevice; class USBDevice;
class InputHandler_Win32_Para: public InputHandler class InputHandler_Win32_Para: public InputHandler
{ {
public:
void Update(float fDeltaTime);
InputHandler_Win32_Para();
~InputHandler_Win32_Para();
void GetDevicesAndDescriptions(vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut);
private:
USBDevice *dev; USBDevice *dev;
RageThread InputThread; RageThread InputThread;
bool shutdown; bool shutdown;
@@ -14,13 +21,6 @@ class InputHandler_Win32_Para: public InputHandler
static int InputThread_Start( void *p ); static int InputThread_Start( void *p );
void InputThreadMain(); void InputThreadMain();
void HandleInput( int devno, int event ); void HandleInput( int devno, int event );
public:
void Update(float fDeltaTime);
InputHandler_Win32_Para();
~InputHandler_Win32_Para();
void GetDevicesAndDescriptions(vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut);
}; };
#define USE_INPUT_HANDLER_WIN32_PARA #define USE_INPUT_HANDLER_WIN32_PARA
stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.h
+8 -8
View File
@@ -1,5 +1,5 @@
#ifndef INPUT_HANDLER_WIN32_PUMP_H #ifndef INPUT_HANDLER_WIN32_PUMP_H
#define INPUT_HANDLER_WIN32_PUMP_H 1 #define INPUT_HANDLER_WIN32_PUMP_H
#include "InputHandler.h" #include "InputHandler.h"
#include "RageThreads.h" #include "RageThreads.h"
@@ -7,6 +7,13 @@
class USBDevice; class USBDevice;
class InputHandler_Win32_Pump: public InputHandler class InputHandler_Win32_Pump: public InputHandler
{ {
public:
void Update(float fDeltaTime);
InputHandler_Win32_Pump();
~InputHandler_Win32_Pump();
void GetDevicesAndDescriptions(vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut);
private:
USBDevice *dev; USBDevice *dev;
RageThread InputThread; RageThread InputThread;
bool shutdown; bool shutdown;
@@ -14,13 +21,6 @@ class InputHandler_Win32_Pump: public InputHandler
static int InputThread_Start( void *p ); static int InputThread_Start( void *p );
void InputThreadMain(); void InputThreadMain();
void HandleInput( int devno, int event ); void HandleInput( int devno, int event );
public:
void Update(float fDeltaTime);
InputHandler_Win32_Pump();
~InputHandler_Win32_Pump();
void GetDevicesAndDescriptions(vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut);
}; };
#define USE_INPUT_HANDLER_WIN32_PUMP #define USE_INPUT_HANDLER_WIN32_PUMP