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

Commit before cleanup

Browse source 
-TypeRotationMatrix working as designed
no more funny business on focus.
This commit is contained in:
marauder2k7 2023-06-11 22:37:08 +01:00
parent cbe2bd4c7b
commit a4e2bfe34e
2 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Engine/source/gui/editor/guiInspectorTypes.cpp
View file

@ -2247,15 +2247,15 @@ void GuiInspectorTypeMatrixRotation::constructEditControlChildren(GuiControl* re
mCtrlX->setField("AltCommand", angleInput.c_str()); mCtrlX->setField("AltCommand", angleInput.c_str());
mCtrlX->setField("Validate", angleInput.c_str()); mCtrlX->setField("Validate", angleInput.c_str());
mCtrlX->setDataField(StringTable->insert("format"), NULL, "%g"); mCtrlX->setDataField(StringTable->insert("format"), NULL, "%.6f");
mCtrlY->setField("AltCommand", angleInput.c_str()); mCtrlY->setField("AltCommand", angleInput.c_str());
mCtrlY->setField("Validate", angleInput.c_str()); mCtrlY->setField("Validate", angleInput.c_str());
mCtrlY->setDataField(StringTable->insert("format"), NULL, "%g"); mCtrlY->setDataField(StringTable->insert("format"), NULL, "%.6f");
mCtrlZ->setField("AltCommand", angleInput.c_str()); mCtrlZ->setField("AltCommand", angleInput.c_str());
mCtrlZ->setField("Validate", angleInput.c_str()); mCtrlZ->setField("Validate", angleInput.c_str());
mCtrlZ->setDataField(StringTable->insert("format"), NULL, "%g"); mCtrlZ->setDataField(StringTable->insert("format"), NULL, "%.6f");
} }
void GuiInspectorTypeMatrixRotation::updateValue() void GuiInspectorTypeMatrixRotation::updateValue()
@ -2268,28 +2268,28 @@ void GuiInspectorTypeMatrixRotation::updateValue()
angAx.set(Point3F(dAtof(StringUnit::getUnit(data, 0, " \t\n")), angAx.set(Point3F(dAtof(StringUnit::getUnit(data, 0, " \t\n")),
dAtof(StringUnit::getUnit(data, 1, " \t\n")), dAtof(StringUnit::getUnit(data, 1, " \t\n")),
dAtof(StringUnit::getUnit(data, 2, " \t\n"))), dAtof(StringUnit::getUnit(data, 2, " \t\n"))),
dAtof(StringUnit::getUnit(data, 3, " \t\n"))); mDegToRad(dAtof(StringUnit::getUnit(data, 3, " \t\n"))));
EulerF euler = mAngToEul(angAx); eulAng = mAngToEul(angAx);
U32 elementCount = StringUnit::getUnitCount(data, " "); U32 elementCount = StringUnit::getUnitCount(data, " ");
if (elementCount > 0) if (elementCount > 0)
{ {
char szBuffer[64]; char szBuffer[64];
dSprintf(szBuffer, 64, "%g", euler.x); dSprintf(szBuffer, 64, "%.6f", eulAng.x);
mCtrlX->setText(szBuffer); mCtrlX->setText(szBuffer);
} }
if (elementCount > 1) if (elementCount > 1)
{ {
char szBuffer[64]; char szBuffer[64];
dSprintf(szBuffer, 64, "%g", euler.y); dSprintf(szBuffer, 64, "%.6f", eulAng.y);
mCtrlY->setText(szBuffer); mCtrlY->setText(szBuffer);
} }
if (elementCount > 2) if (elementCount > 2)
{ {
char szBuffer[64]; char szBuffer[64];
dSprintf(szBuffer, 64, "%g", euler.z); dSprintf(szBuffer, 64, "%.6f", eulAng.z);
mCtrlZ->setText(szBuffer); mCtrlZ->setText(szBuffer);
} }
@ -2339,7 +2339,13 @@ bool GuiInspectorTypeMatrixRotation::updateRects()
void GuiInspectorTypeMatrixRotation::updateAng(AngAxisF newAngAx) void GuiInspectorTypeMatrixRotation::updateAng(AngAxisF newAngAx)
{ {
angAx = newAngAx; angAx.axis = newAngAx.axis;
angAx.angle = mRadToDeg(newAngAx.angle);
}
void GuiInspectorTypeMatrixRotation::updateEul(EulerF newEul)
{
eulAng = newEul;
} }
void GuiInspectorTypeMatrixRotation::updateData() void GuiInspectorTypeMatrixRotation::updateData()
@ -2350,13 +2356,14 @@ void GuiInspectorTypeMatrixRotation::updateData()
StringTableEntry GuiInspectorTypeMatrixRotation::getValue() StringTableEntry GuiInspectorTypeMatrixRotation::getValue()
{ {
String angBuffer = String::ToString("%g %g %g %g", angAx.axis.x, angAx.axis.y, angAx.axis.z, angAx.angle); String angBuffer = String::ToString("%.6f %.6f %.6f %.6f", angAx.axis.x, angAx.axis.y, angAx.axis.z, angAx.angle);
return StringTable->insert(angBuffer.c_str()); return StringTable->insert(angBuffer.c_str());
} }
DefineEngineMethod(GuiInspectorTypeMatrixRotation, applyRotation, void, (AngAxisF angAx), , "") DefineEngineMethod(GuiInspectorTypeMatrixRotation, applyRotation, void, (AngAxisF angAx), , "")
{ {
object->updateAng(angAx); object->updateAng(angAx);
object->updateEul(mAngToEul(angAx));
object->updateData(); object->updateData();
} }

1
Engine/source/gui/editor/guiInspectorTypes.h
View file

@ -686,6 +686,7 @@ public:
virtual bool updateRects(); virtual bool updateRects();
void updateAng(AngAxisF newAngAx); void updateAng(AngAxisF newAngAx);
void updateEul(EulerF newEul);
virtual void updateData(); virtual void updateData();
virtual StringTableEntry getValue(); virtual StringTableEntry getValue();