Merge pull request #1248 from marauder2k9-torque/fix-angle-display

Update guiInspectorTypes.cpp
This commit is contained in:
Brian Roberts 2024-04-01 20:29:05 -05:00 committed by GitHub
commit 42a852a64d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -2394,15 +2394,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, "%.6f"); mCtrlX->setDataField(StringTable->insert("format"), NULL, "%g");
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, "%.6f"); mCtrlY->setDataField(StringTable->insert("format"), NULL, "%g");
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, "%.6f"); mCtrlZ->setDataField(StringTable->insert("format"), NULL, "%g");
} }
void GuiInspectorTypeMatrixRotation::updateValue() void GuiInspectorTypeMatrixRotation::updateValue()
@ -2424,19 +2424,19 @@ void GuiInspectorTypeMatrixRotation::updateValue()
if (elementCount > 0) if (elementCount > 0)
{ {
char szBuffer[64]; char szBuffer[64];
dSprintf(szBuffer, 64, "%.6f", eulAng.x); dSprintf(szBuffer, 64, "%g", eulAng.x);
mCtrlX->setText(szBuffer); mCtrlX->setText(szBuffer);
} }
if (elementCount > 1) if (elementCount > 1)
{ {
char szBuffer[64]; char szBuffer[64];
dSprintf(szBuffer, 64, "%.6f", eulAng.y); dSprintf(szBuffer, 64, "%g", eulAng.y);
mCtrlY->setText(szBuffer); mCtrlY->setText(szBuffer);
} }
if (elementCount > 2) if (elementCount > 2)
{ {
char szBuffer[64]; char szBuffer[64];
dSprintf(szBuffer, 64, "%.6f", eulAng.z); dSprintf(szBuffer, 64, "%g", eulAng.z);
mCtrlZ->setText(szBuffer); mCtrlZ->setText(szBuffer);
} }
@ -2506,7 +2506,7 @@ void GuiInspectorTypeMatrixRotation::updateData()
StringTableEntry GuiInspectorTypeMatrixRotation::getValue() StringTableEntry GuiInspectorTypeMatrixRotation::getValue()
{ {
String angBuffer = String::ToString("%.6f %.6f %.6f %.6f", angAx.axis.x, angAx.axis.y, angAx.axis.z, angAx.angle); String angBuffer = String::ToString("%g %g %g %g", angAx.axis.x, angAx.axis.y, angAx.axis.z, angAx.angle);
return StringTable->insert(angBuffer.c_str()); return StringTable->insert(angBuffer.c_str());
} }