TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-25 22:35:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reduce console spam from probe manager when not in debug

Browse source 
Added ability to activate height override on inspector fields from script
Further refinements of theme usage as well as editor settings
This commit is contained in:
Areloch 2019-06-17 23:48:20 -05:00
parent f1777016b8
commit 436c28b87c
7 changed files with 204 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Engine/source/gui/editor/inspector/field.cpp
View file

@ -690,6 +690,28 @@ void GuiInspectorField::_setFieldDocs( StringTableEntry docs )
}
}
void GuiInspectorField::setHeightOverride(bool useOverride, U32 heightOverride)
{
mUseHeightOverride = useOverride;
if (useOverride)
mHeightOverride = heightOverride;
S32 fieldHeight = 18;
if (mUseHeightOverride)
fieldHeight = mHeightOverride;
RectI bnds = getBounds();
setBounds(bnds.point.x, bnds.point.y, bnds.extent.x, fieldHeight);
// Calculate Caption and EditCtrl Rects
updateRects();
// Force our editField to set it's value
updateValue();
}
//=============================================================================
// Console Methods.
//=============================================================================
@ -749,6 +771,11 @@ DefineEngineMethod(GuiInspectorField, setCaption, void, (String newCaption),, "(
object->setCaption(StringTable->insert(newCaption.c_str()));
}
DefineEngineMethod(GuiInspectorField, setHeightOverride, void, (bool useOverride, U32 heightOverride), , "")
{
object->setHeightOverride(useOverride, heightOverride);
}
DefineEngineMethod(GuiInspectorField, setEditControl, void, (GuiControl* editCtrl), (nullAsType<GuiControl*>()), "() - Reset to default value.")
{
object->setEditControl(editCtrl);

2
Engine/source/gui/editor/inspector/field.h
View file

@ -132,6 +132,8 @@ class GuiInspectorField : public GuiControl
void setEditControl(GuiControl* editCtrl);
void setHeightOverride(bool useOverride, U32 heightOverride);
virtual void setDocs(String docs) { mFieldDocs = docs; }
/// Returns pointer to this InspectorField's edit ctrl.

4
Engine/source/renderInstance/renderProbeMgr.cpp
View file

@ -358,7 +358,9 @@ ProbeRenderInst* RenderProbeMgr::registerProbe()
mCubeMapSlots[cubeIndex] = true;
mCubeMapCount++;
#ifdef TORQUE_DEBUG
Con::warnf("RenderProbeMgr::registerProbe: Registered probe %u to cubeIndex %u", newProbe.mProbeIdx, cubeIndex);
#endif
mProbesDirty = true;
@ -495,8 +497,10 @@ void RenderProbeMgr::updateProbeTexture(ProbeRenderInst* probeInfo)
mIrradianceArray->updateTexture(probeInfo->mIrradianceCubemap, cubeIndex);
mPrefilterArray->updateTexture(probeInfo->mPrefilterCubemap, cubeIndex);
#ifdef TORQUE_DEBUG
Con::warnf("UpdatedProbeTexture - probeIdx: %u on cubeIndex %u, Irrad validity: %d, Prefilter validity: %d", probeInfo->mProbeIdx, cubeIndex,
probeInfo->mIrradianceCubemap->isInitialized(), probeInfo->mPrefilterCubemap->isInitialized());
#endif
}
void RenderProbeMgr::_setupPerFrameParameters(const SceneRenderState *state)