TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 22:54:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'method_Unmangle' into PBR_PR

Browse source
This commit is contained in:
Azaezel 2018-12-12 14:54:22 -06:00
commit 1eed979a9c
632 changed files with 3935 additions and 3450 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/gfx/gfxDevice.cpp
View file

@ -1385,7 +1385,7 @@ DefineEngineFunction( getBestHDRFormat, GFXFormat, (),,
return format;
}
DefineConsoleFunction(ResetGFX, void, (), , "forces the gbuffer to be reinitialized in cases of improper/lack of buffer clears.")
DefineEngineFunction(ResetGFX, void, (), , "forces the gbuffer to be reinitialized in cases of improper/lack of buffer clears.")
{
GFX->beginReset();
}

2
Engine/source/gfx/gfxInit.cpp
View file

@ -523,7 +523,7 @@ DefineEngineStaticMethod( GFXInit, getAdapterModeCount, S32, ( S32 index ),,
return adapters[index]->mAvailableModes.size();
}
DefineConsoleStaticMethod( GFXInit, getAdapterMode, String, ( S32 index, S32 modeIndex ),,
DefineEngineStaticMethod( GFXInit, getAdapterMode, String, ( S32 index, S32 modeIndex ),,
"Gets the details of the specified adapter mode.\n\n"
"@param index Index of the adapter to query.\n"
"@param modeIndex Index of the mode to get data from.\n"

2
Engine/source/gfx/gl/gfxGLDevice.cpp
View file

@ -998,7 +998,7 @@ public:
static GFXGLRegisterDevice pGLRegisterDevice;
ConsoleFunction(cycleResources, void, 1, 1, "")
DefineEngineFunction(cycleResources, void, (),, "")
{
static_cast<GFXGLDevice*>(GFX)->zombify();
static_cast<GFXGLDevice*>(GFX)->resurrect();

2
Engine/source/gfx/gl/gfxGLDeviceProfiler.cpp
View file

@ -86,7 +86,7 @@ protected:
GFXProfiler<GLTimer> gfxProfiler;
DefineConsoleFunction(printGFXGLTimers, void,(), ,"")
DefineEngineFunction(printGFXGLTimers, void,(), ,"")
{
gfxProfiler.printTimes();
}

6
Engine/source/gfx/video/theoraTextureObject.cpp
View file

@ -191,7 +191,7 @@ void TheoraTextureObject::play()
//-----------------------------------------------------------------------------
DefineConsoleMethod( TheoraTextureObject, play, void, (),,
DefineEngineMethod( TheoraTextureObject, play, void, (),,
"Start playback of the video." )
{
object->play();
@ -199,7 +199,7 @@ DefineConsoleMethod( TheoraTextureObject, play, void, (),,
//-----------------------------------------------------------------------------
DefineConsoleMethod( TheoraTextureObject, stop, void, (),,
DefineEngineMethod( TheoraTextureObject, stop, void, (),,
"Stop playback of the video." )
{
object->stop();
@ -207,7 +207,7 @@ DefineConsoleMethod( TheoraTextureObject, stop, void, (),,
//-----------------------------------------------------------------------------
DefineConsoleMethod( TheoraTextureObject, pause, void, (),,
DefineEngineMethod( TheoraTextureObject, pause, void, (),,
"Pause playback of the video." )
{
object->pause();