TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-09 23:40:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Eliminate DefineConsoleFunction

Browse source
This commit is contained in:
Lukas Joergensen 2018-04-17 16:33:56 +02:00
parent 037d089c4d
commit 5bde18143f
55 changed files with 314 additions and 332 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/platformWin32/cardProfile.cpp
View file

@ -74,7 +74,7 @@ void initDisplayDeviceInfo()
Con::setVariable( "$PCI_DEV", dev );
}
DefineConsoleFunction( initDisplayDeviceInfo, void, (), , "()"
DefineEngineFunction( initDisplayDeviceInfo, void, (), , "()"
"@brief Initializes variables that track device and vendor information/IDs\n\n"
"@ingroup Rendering")
{

2
Engine/source/platformWin32/winConsole.cpp
View file

@ -38,7 +38,7 @@ namespace Con
extern bool alwaysUseDebugOutput;
}
DefineConsoleFunction( enableWinConsole, void, (bool flag), , "enableWinConsole(bool);")
DefineEngineFunction( enableWinConsole, void, (bool flag), , "enableWinConsole(bool);")
{
WindowsConsole->enable(flag);
}

20
Engine/source/platformWin32/winDirectInput.cpp
View file

@ -769,7 +769,7 @@ void DInputManager::processXInput( void )
mXInputStateReset = false;
}
}
DefineConsoleFunction( enableJoystick, bool, (), , "()"
DefineEngineFunction( enableJoystick, bool, (), , "()"
"@brief Enables use of the joystick.\n\n"
"@note DirectInput must be enabled and active to use this function.\n\n"
"@ingroup Input")
@ -778,7 +778,7 @@ DefineConsoleFunction( enableJoystick, bool, (), , "()"
}
//------------------------------------------------------------------------------
DefineConsoleFunction( disableJoystick, void, (), , "()"
DefineEngineFunction( disableJoystick, void, (), , "()"
"@brief Disables use of the joystick.\n\n"
"@note DirectInput must be enabled and active to use this function.\n\n"
"@ingroup Input")
@ -787,7 +787,7 @@ DefineConsoleFunction( disableJoystick, void, (), , "()"
}
//------------------------------------------------------------------------------
DefineConsoleFunction( isJoystickEnabled, bool, (), , "()"
DefineEngineFunction( isJoystickEnabled, bool, (), , "()"
"@brief Queries input manager to see if a joystick is enabled\n\n"
"@return 1 if a joystick exists and is enabled, 0 if it's not.\n"
"@ingroup Input")
@ -796,7 +796,7 @@ DefineConsoleFunction( isJoystickEnabled, bool, (), , "()"
}
//------------------------------------------------------------------------------
DefineConsoleFunction( enableXInput, bool, (), , "()"
DefineEngineFunction( enableXInput, bool, (), , "()"
"@brief Enables XInput for Xbox 360 controllers.\n\n"
"@note XInput is enabled by default. Disable to use an Xbox 360 "
"Controller as a joystick device.\n\n"
@ -811,7 +811,7 @@ DefineConsoleFunction( enableXInput, bool, (), , "()"
}
//------------------------------------------------------------------------------
DefineConsoleFunction( disableXInput, void, (), , "()"
DefineEngineFunction( disableXInput, void, (), , "()"
"@brief Disables XInput for Xbox 360 controllers.\n\n"
"@ingroup Input")
{
@ -819,7 +819,7 @@ DefineConsoleFunction( disableXInput, void, (), , "()"
}
//------------------------------------------------------------------------------
DefineConsoleFunction( resetXInput, void, (), , "()"
DefineEngineFunction( resetXInput, void, (), , "()"
"@brief Rebuilds the XInput section of the InputManager\n\n"
"Requests a full refresh of events for all controllers. Useful when called at the beginning "
"of game code after actionMaps are set up to hook up all appropriate events.\n\n"
@ -836,7 +836,7 @@ DefineConsoleFunction( resetXInput, void, (), , "()"
}
//------------------------------------------------------------------------------
DefineConsoleFunction( isXInputConnected, bool, (S32 controllerID), , "( int controllerID )"
DefineEngineFunction( isXInputConnected, bool, (S32 controllerID), , "( int controllerID )"
"@brief Checks to see if an Xbox 360 controller is connected\n\n"
"@param controllerID Zero-based index of the controller to check.\n"
"@return 1 if the controller is connected, 0 if it isn't, and 205 if XInput "
@ -849,7 +849,7 @@ DefineConsoleFunction( isXInputConnected, bool, (S32 controllerID), , "( int con
}
//------------------------------------------------------------------------------
DefineConsoleFunction( getXInputState, int, (S32 controllerID, const char * properties, bool current), (false), "( int controllerID, string property, bool currentD )"
DefineEngineFunction( getXInputState, int, (S32 controllerID, const char * properties, bool current), (false), "( int controllerID, string property, bool currentD )"
"@brief Queries the current state of a connected Xbox 360 controller.\n\n"
"XInput Properties:\n\n"
" - XI_THUMBLX, XI_THUMBLY - X and Y axes of the left thumbstick. \n"
@ -905,7 +905,7 @@ DefineConsoleFunction( getXInputState, int, (S32 controllerID, const char * prop
}
//------------------------------------------------------------------------------
DefineConsoleFunction( echoInputState, void, (), , "()"
DefineEngineFunction( echoInputState, void, (), , "()"
"@brief Prints information to the console stating if DirectInput and a Joystick are enabled and active.\n\n"
"@ingroup Input")
{
@ -921,7 +921,7 @@ DefineConsoleFunction( echoInputState, void, (), , "()"
Con::printf( "DirectInput is not enabled." );
}
DefineConsoleFunction( rumble, void, (const char * device, F32 xRumble, F32 yRumble), , "(string device, float xRumble, float yRumble)"
DefineEngineFunction( rumble, void, (const char * device, F32 xRumble, F32 yRumble), , "(string device, float xRumble, float yRumble)"
"@brief Activates the vibration motors in the specified controller.\n\n"
"The controller will constantly at it's xRumble and yRumble intensities until "
"changed or told to stop."

2
Engine/source/platformWin32/winExec.cpp
View file

@ -136,7 +136,7 @@ void ExecuteThread::run(void *arg /* = 0 */)
// Console Functions
//-----------------------------------------------------------------------------
DefineConsoleFunction( shellExecute, bool, (const char * executable, const char * args, const char * directory), ("", ""), "(string executable, string args, string directory)"
DefineEngineFunction( shellExecute, bool, (const char * executable, const char * args, const char * directory), ("", ""), "(string executable, string args, string directory)"
"@brief Launches an outside executable or batch file\n\n"
"@param executable Name of the executable or batch file\n"
"@param args Optional list of arguments, in string format, to pass to the executable\n"

6
Engine/source/platformWin32/winInput.cpp
View file

@ -157,13 +157,13 @@ void Input::init()
}
//------------------------------------------------------------------------------
DefineConsoleFunction( isJoystickDetected, bool, (), , "isJoystickDetected()")
DefineEngineFunction( isJoystickDetected, bool, (), , "isJoystickDetected()")
{
return( DInputDevice::joystickDetected() );
}
//------------------------------------------------------------------------------
DefineConsoleFunction( getJoystickAxes, const char*, (U32 deviceID), , "getJoystickAxes( instance )")
DefineEngineFunction( getJoystickAxes, const char*, (U32 deviceID), , "getJoystickAxes( instance )")
{
DInputManager* mgr = dynamic_cast<DInputManager*>( Input::getManager() );
if ( mgr )
@ -505,7 +505,7 @@ void Input::log( const char* format, ... )
va_end( argptr );
}
DefineConsoleFunction( inputLog, void, (const char * log), , "inputLog( string )")
DefineEngineFunction( inputLog, void, (const char * log), , "inputLog( string )")
{
Input::log( "%s\n", log );
}

2
Engine/source/platformWin32/winWindow.cpp
View file

@ -643,7 +643,7 @@ bool Platform::setLoginPassword( const char* password )
// as commentary on Koreans as a nationality. Thank you for your
// attention.
//--------------------------------------
DefineConsoleFunction( isKoreanBuild, bool, ( ), , "isKoreanBuild()")
DefineEngineFunction( isKoreanBuild, bool, ( ), , "isKoreanBuild()")
{
HKEY regKey;
bool result = false;