TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added propagated multibake mode.

Browse source 
Temporarily disabled Precapture post effect.
This commit is contained in:
Areloch 2018-10-27 02:21:46 -05:00
parent 78b2bcde0c
commit 43c1abbc96
4 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Engine/source/T3D/lighting/reflectionProbe.cpp
View file

@ -838,7 +838,7 @@ String ReflectionProbe::getIrradianceMapPath()
return fileName; return fileName;
} }
void ReflectionProbe::bake(String outputPath, S32 resolution) void ReflectionProbe::bake(String outputPath, S32 resolution, bool renderWithProbes)
{ {
GFXDEBUGEVENT_SCOPE(ReflectionProbe_Bake, ColorI::WHITE); GFXDEBUGEVENT_SCOPE(ReflectionProbe_Bake, ColorI::WHITE);
@ -846,7 +846,7 @@ void ReflectionProbe::bake(String outputPath, S32 resolution)
U32 startMSTime = Platform::getRealMilliseconds(); U32 startMSTime = Platform::getRealMilliseconds();
PostEffect *preCapture = dynamic_cast<PostEffect*>(Sim::findObject("AL_PreCapture")); /*PostEffect *preCapture = dynamic_cast<PostEffect*>(Sim::findObject("AL_PreCapture"));
PostEffect *deferredShading = dynamic_cast<PostEffect*>(Sim::findObject("AL_DeferredShading")); PostEffect *deferredShading = dynamic_cast<PostEffect*>(Sim::findObject("AL_DeferredShading"));
if (preCapture) if (preCapture)
{ {
@ -855,7 +855,7 @@ void ReflectionProbe::bake(String outputPath, S32 resolution)
preCapture->enable(); preCapture->enable();
} }
if (deferredShading) if (deferredShading)
deferredShading->disable(); deferredShading->disable();*/
GFXCubemapHandle sceneCaptureCubemap; GFXCubemapHandle sceneCaptureCubemap;
@ -904,8 +904,12 @@ void ReflectionProbe::bake(String outputPath, S32 resolution)
//gEditingMission = false; //gEditingMission = false;
//Set this to true to use the prior method where it goes through the SPT_Reflect path for the bake //Set this to true to use the prior method where it goes through the SPT_Reflect path for the bake
bool probeRenderState = ProbeManager::smRenderReflectionProbes; bool probeRenderState = ProbeManager::smRenderReflectionProbes;
ProbeManager::smRenderReflectionProbes = false;
if (!renderWithProbes)
ProbeManager::smRenderReflectionProbes = false;
for (U32 i = 0; i < 6; ++i) for (U32 i = 0; i < 6; ++i)
{ {
GFXTexHandle blendTex; GFXTexHandle blendTex;
@ -1023,13 +1027,15 @@ void ReflectionProbe::bake(String outputPath, S32 resolution)
Con::errorf("ReflectionProbe::bake() - Didn't generate a valid scene capture cubemap, unable to generate prefilter and irradiance maps!"); Con::errorf("ReflectionProbe::bake() - Didn't generate a valid scene capture cubemap, unable to generate prefilter and irradiance maps!");
} }
ProbeManager::smRenderReflectionProbes = probeRenderState; if(!renderWithProbes)
ProbeManager::smRenderReflectionProbes = probeRenderState;
setMaskBits(-1); setMaskBits(-1);
if (preCapture) /*if (preCapture)
preCapture->disable(); preCapture->disable();
if (deferredShading) if (deferredShading)
deferredShading->enable(); deferredShading->enable();*/
U32 endMSTime = Platform::getRealMilliseconds(); U32 endMSTime = Platform::getRealMilliseconds();
F32 diffTime = F32(endMSTime - startMSTime); F32 diffTime = F32(endMSTime - startMSTime);
@ -1037,14 +1043,14 @@ void ReflectionProbe::bake(String outputPath, S32 resolution)
Con::warnf("ReflectionProbe::bake() - Finished bake! Took %g milliseconds", diffTime); Con::warnf("ReflectionProbe::bake() - Finished bake! Took %g milliseconds", diffTime);
} }
DefineEngineMethod(ReflectionProbe, Bake, void, (String outputPath, S32 resolution), ("", 256), DefineEngineMethod(ReflectionProbe, Bake, void, (String outputPath, S32 resolution, bool renderWithProbes), ("", 64, false),
"@brief returns true if control object is inside the fog\n\n.") "@brief returns true if control object is inside the fog\n\n.")
{ {
ReflectionProbe *clientProbe = (ReflectionProbe*)object->getClientObject(); ReflectionProbe *clientProbe = (ReflectionProbe*)object->getClientObject();
if (clientProbe) if (clientProbe)
{ {
clientProbe->bake(outputPath, resolution); clientProbe->bake(outputPath, resolution, renderWithProbes);
} }
//object->bake(outputPath, resolution); //object->bake(outputPath, resolution);
} }

2
Engine/source/T3D/lighting/reflectionProbe.h
View file

@ -240,7 +240,7 @@ public:
//Baking //Baking
String getPrefilterMapPath(); String getPrefilterMapPath();
String getIrradianceMapPath(); String getIrradianceMapPath();
void bake(String outputPath, S32 resolution); void bake(String outputPath, S32 resolution, bool renderWithProbes = false);
}; };
typedef ProbeRenderInst::ProbeShapeType ReflectProbeType; typedef ProbeRenderInst::ProbeShapeType ReflectProbeType;

2
Engine/source/T3D/missionMarker.cpp
View file

@ -82,7 +82,7 @@ ConsoleDocClass( MissionMarker,
MissionMarker::MissionMarker() MissionMarker::MissionMarker()
{ {
mTypeMask |= StaticObjectType; mTypeMask |= StaticObjectType | MarkerObjectType;
mDataBlock = 0; mDataBlock = 0;
mAddedToScene = false; mAddedToScene = false;
mNetFlags.set(Ghostable | ScopeAlways); mNetFlags.set(Ghostable | ScopeAlways);

8
Templates/Full/game/tools/worldEditor/scripts/probeBake.ed.cs
View file

@ -28,15 +28,21 @@ function ProbeBakeDlg_RunBake::onClick(%this)
%currentProgressValue = 0; %currentProgressValue = 0;
ProbeBakeDlg_Progress.setValue(%currentProgressValue); ProbeBakeDlg_Progress.setValue(%currentProgressValue);
Canvas.repaint();
for(%iter=0; %iter < %numIter; %iter++) for(%iter=0; %iter < %numIter; %iter++)
{ {
%renderWithProbes = false;
if(%iter != 0)
%renderWithProbes = true;
for(%i=0; %i < %probeCount; %i++) for(%i=0; %i < %probeCount; %i++)
{ {
%probe = getWord(%probeIds, %i); %probe = getWord(%probeIds, %i);
%path = filePath($Server::MissionFile) @ "/" @ fileBase($Server::MissionFile) @ "/probes/"; %path = filePath($Server::MissionFile) @ "/" @ fileBase($Server::MissionFile) @ "/probes/";
%probe.bake(%path, %resolution); %probe.bake(%path, %resolution, %renderWithProbes);
%currentProgressValue += %progressStep; %currentProgressValue += %progressStep;
ProbeBakeDlg_Progress.setValue(%currentProgressValue); ProbeBakeDlg_Progress.setValue(%currentProgressValue);