Skip to content

multi-dimension inspector augs #1819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Areloch merged 1 commit into from
Aug 24, 2026
Merged

multi-dimension inspector augs #1819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 45 additions & 3 deletions Engine/source/gui/editor/guiInspectorTypes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1903,12 +1903,18 @@ void GuiInspectorTypeSFXSourceName::consoleInit()

void GuiInspectorType2DValue::constructEditControlChildren(GuiControl* retCtrl, S32 width)
{
mCtrlX = new GuiTextEditCtrl();
mCtrlX = new GuiTextEditSliderCtrl();
mCtrlX->setField("range", String::ToString("%f %f", F32_MIN_EX, F32_MAX));
mCtrlX->setField("increment", String::ToString("%f", POINT_EPSILON * 100.0f));
mCtrlX->setDataField(StringTable->insert("format"), NULL, "%g");
_registerEditControl(mCtrlX, "x");
mLabelX = new GuiControl();
_registerEditControl(mLabelX, "lx");

mCtrlY = new GuiTextEditCtrl();
mCtrlY = new GuiTextEditSliderCtrl();
mCtrlY->setField("range", String::ToString("%f %f", F32_MIN_EX, F32_MAX));
mCtrlY->setField("increment", String::ToString("%f", POINT_EPSILON * 100.0f));
mCtrlY->setDataField(StringTable->insert("format"), NULL, "%g");
_registerEditControl(mCtrlY, "y");
mLabelY = new GuiControl();
_registerEditControl(mLabelY, "ly");
Expand Down Expand Up @@ -2078,7 +2084,11 @@ void GuiInspectorType3DValue::constructEditControlChildren(GuiControl* retCtrl,
{
Parent::constructEditControlChildren(retCtrl, width);

mCtrlZ = new GuiTextEditCtrl();
mCtrlZ = new GuiTextEditSliderCtrl();
mCtrlZ->setField("range", String::ToString("%f %f", F32_MIN_EX, F32_MAX));
mCtrlZ->setField("increment", String::ToString("%f", POINT_EPSILON*100.0f));
mCtrlZ->setDataField(StringTable->insert("format"), NULL, "%g");

_registerEditControl(mCtrlZ, "z");
mLabelZ = new GuiControl();
_registerEditControl(mLabelZ, "lz");
Expand Down Expand Up @@ -2387,12 +2397,44 @@ GuiControl* GuiInspectorTypePoint2I::constructEditControl()
{
GuiControl* retCtrl = Parent::constructEditControl();

mCtrlX->setField("increment", "1");
mCtrlX->setField("range", String::ToString("%d %d", S32_MIN, S32_MAX));
mCtrlX->setDataField(StringTable->insert("format"), NULL, "%d");
mCtrlY->setField("increment", "1");
mCtrlY->setField("range", String::ToString("%d %d", S32_MIN, S32_MAX));
mCtrlY->setDataField(StringTable->insert("format"), NULL, "%d");

return retCtrl;
}

void GuiInspectorTypePoint2I::updateValue()
{
if (mField)
{
Parent::updateValue();
const char* data = getData();
if (!data)
data = "";
U32 elementCount = StringUnit::getUnitCount(data, " ");
if (elementCount > 0)
{
S32 value = dAtoi(StringUnit::getUnit(data, 0, " \t\n"));
char szBuffer[64];
dSprintf(szBuffer, 64, "%d", value);
mCtrlX->setText(szBuffer);
}
if (elementCount > 1)
{
S32 value = dAtoi(StringUnit::getUnit(data, 1, " \t\n"));
char szBuffer[64];
dSprintf(szBuffer, 64, "%d", value);
mCtrlY->setText(szBuffer);
}
mScriptValue->setText(data);
mEdit->setDataField(StringTable->insert("tooltip"), NULL, data);
}
}

//-----------------------------------------------------------------------------
// TypePoint3F GuiInspectorField Class
//-----------------------------------------------------------------------------
Expand Down
7 changes: 4 additions & 3 deletions Engine/source/gui/editor/guiInspectorTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,10 +633,10 @@ class GuiInspectorType2DValue : public GuiInspectorField
private:
typedef GuiInspectorField Parent;
protected:
GuiTextEditCtrl* mCtrlX;
GuiTextEditSliderCtrl* mCtrlX;
GuiControl* mLabelX;
GuiControl* mContainerX;
GuiTextEditCtrl* mCtrlY;
GuiTextEditSliderCtrl* mCtrlY;
GuiControl* mLabelY;
GuiControl* mContainerY;
GuiTextCtrl* mScriptValue;
Expand All @@ -663,7 +663,7 @@ class GuiInspectorType3DValue : public GuiInspectorType2DValue
private:
typedef GuiInspectorType2DValue Parent;
protected:
GuiTextEditCtrl* mCtrlZ;
GuiTextEditSliderCtrl* mCtrlZ;
GuiControl* mLabelZ;
GuiControl* mContainerZ;

Expand Down Expand Up @@ -718,6 +718,7 @@ class GuiInspectorTypePoint2I : public GuiInspectorTypePoint2F
DECLARE_CONOBJECT(GuiInspectorTypePoint2I);
static void consoleInit();
GuiControl* constructEditControl() override;
void updateValue() override;
};


Expand Down
Loading