GuiInspectorTypes Update

This code combines inspector types for Point2I, Point2F, and Vector2 so that they share a common base class. It also moves the display of those types to 2 text boxes in a single line.

engine/source/gui/editor/guiInspectorTypes.cc

@@ -539,7 +539,11 @@ GuiControl * GuiInspectorTypeS32::constructEditControl(S32 width)
    }
    else
    {
-      return GuiInspectorField::constructEditControl(width);
+      GuiControl* retCtrl = GuiInspectorField::constructEditControl(width);
+	  GuiTextEditCtrl *editCtrl = dynamic_cast<GuiTextEditCtrl*>(retCtrl);
+	  editCtrl->setInputMode(GuiTextEditCtrl::InputMode::Number);
+
+	  return editCtrl;
    }
 }
 
@@ -552,234 +556,139 @@ const char* GuiInspectorTypeS32::getData()
 }
 
 //////////////////////////////////////////////////////////////////////////
-// TypePoint2I GuiInspectorField Class
+// DualValue GuiInspectorField Class
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_CONOBJECT(GuiInspectorTypePoint2I);
-
-void GuiInspectorTypePoint2I::consoleInit()
-{
-   Parent::consoleInit();
-
-   ConsoleBaseType::getType(TypePoint2I)->setInspectorFieldType("GuiInspectorTypePoint2I");
-}
-
-GuiControl * GuiInspectorTypePoint2I::constructEditControl(S32 width)
+void GuiInspectorTypeDualValue::constructEditControlChildren(GuiControl* retCtrl, S32 width)
 {
-   // Do everything in a simple way first.
-   // then complicate it.
-   GuiControl* retCtrl = new GuiControl();
+	// make our x fields.
+	mCtrlX = new GuiTextEditCtrl();
+	GuiControl* mLabelX = new GuiControl();
 
-   // If we couldn't construct the control, bail!
-   if (retCtrl == NULL)
-      return retCtrl;
+	// make our y fields.
+	mCtrlY = new GuiTextEditCtrl();
+	GuiControl* mLabelY = new GuiControl();
 
-   // Let's make it look pretty.
-   retCtrl->setControlProfile(mGroup->mInspector->mBackgroundProfile);
-   retCtrl->mBounds.set(mGroup->mInspector->mControlOffset, Point2I(width - mGroup->mInspector->mControlOffset.x, 60));
+	// Don't forget to register ourselves
+	registerEditControl(mCtrlX);
+	registerEditControl(mCtrlY);
 
-   // get our data.
-   const char* mData = mTarget->getDataField(mField->pFieldname, NULL);
-   // Don't forget to register ourselves
-   retCtrl->setCanSaveDynamicFields(true);
-   registerEditControl(retCtrl);
+	// Let's make it look pretty.
+	mCtrlX->setControlProfile(mGroup->mInspector->mTextEditProfile);
+	mCtrlY->setControlProfile(mGroup->mInspector->mTextEditProfile);
+	mLabelX->setControlProfile(mGroup->mInspector->mLabelProfile);
+	mLabelY->setControlProfile(mGroup->mInspector->mLabelProfile);
 
-   // make our x fields.
-   GuiTextEditCtrl* mXctrl = new GuiTextEditCtrl();
-   GuiControl* mXLabel = new GuiControl();
+	// make and position our controls.
+	S32 labelWidth = 20;
+	mLabelX->setExtent(Point2I(labelWidth, 30));
+	mLabelY->setExtent(Point2I(labelWidth, 30));
+	mLabelX->setField("text", "X");
+	mLabelY->setField("text", "Y");
 
-   // make our y fields.
-   GuiTextEditCtrl* mYctrl = new GuiTextEditCtrl();
-   GuiControl* mYLabel = new GuiControl();
+	S32 halfX = mCeil(width / 2);
+	mLabelY->setPosition(Point2I(halfX, 0));
 
-   // Don't forget to register ourselves
-   registerEditControl(mXctrl);
-   registerEditControl(mYctrl);
+	mCtrlX->setExtent(Point2I(halfX - labelWidth, 30));
+	mCtrlY->setExtent(Point2I(halfX - labelWidth, 30));
 
-   // Let's make it look pretty.
-   mXctrl->setControlProfile(mGroup->mInspector->mTextEditProfile);
-   mYctrl->setControlProfile(mGroup->mInspector->mTextEditProfile);
-   mXLabel->setControlProfile(mGroup->mInspector->mLabelProfile);
-   mYLabel->setControlProfile(mGroup->mInspector->mLabelProfile);
+	char szCommand[512];
 
-   U32 mCount = StringUnit::getUnitCount(mData, " ");
+	dSprintf(szCommand, 512, "%d.apply(%d.getText() SPC %d.getText());", getId(), mCtrlX->getId(), mCtrlY->getId());
 
-   for (U32 i = 0; i < mCount; i++)
-   {
-      const char* mVal = StringUnit::getUnit(mData, i, " ");
+	mCtrlX->setPosition(Point2I(labelWidth, 0));
+	mCtrlY->setPosition(Point2I(halfX + labelWidth, 0));
 
-      if (i == 0)
-      {
-         mXctrl->setText(mVal);
-      }
-      else
-      {
-         mYctrl->setText(mVal);
-      }
-   }
+	mCtrlX->setInputMode(GuiTextEditCtrl::InputMode::Number);
+	mCtrlY->setInputMode(GuiTextEditCtrl::InputMode::Number);
 
-   // make and position our controls.
-   mXLabel->setExtent(Point2I(15, 30));
-   mYLabel->setExtent(Point2I(15, 30));
-   mXLabel->setField("text","X:");
-   mYLabel->setField("text", "Y:");
-   mYLabel->setPosition(Point2I(0, 30));
-   
-   mXctrl->setExtent(Point2I(width - 25 - 20, 30));
-   mYctrl->setExtent(Point2I(width - 25 - 20, 30));
-
-   char szCommand[512];
-
-   dSprintf(szCommand, 512, "ApplyPoint2Value(\"%d.apply\",%d,%d);", getId(), mXctrl->getId(), mYctrl->getId());
-
-   mXctrl->setPosition(Point2I(10, 0));
-   mYctrl->setPosition(Point2I(10, 30));
-
-   // they can share the same command.
-   // set altCommand instead.
-   mXctrl->setField("AltCommand", szCommand);
-   mYctrl->setField("AltCommand", szCommand);
-
-   retCtrl->addObject(mXLabel);
-   retCtrl->addObject(mYLabel);
-   retCtrl->addObject(mXctrl);
-   retCtrl->addObject(mYctrl);
-   char szBuffX[512];
-   char szBuffY[512];
-   dSprintf(szBuffX, 512, "%d", mXctrl->getId());
-   dSprintf(szBuffY, 512, "%d", mYctrl->getId());
-   retCtrl->setDataField(StringTable->insert("fieldX"),NULL, StringTable->insert(szBuffX));
-   retCtrl->setDataField(StringTable->insert("fieldY"),NULL, StringTable->insert(szBuffY));
+	mCtrlX->setField("AltCommand", szCommand);
+	mCtrlY->setField("AltCommand", szCommand);
 
-   return retCtrl;
+	retCtrl->addObject(mLabelX);
+	retCtrl->addObject(mLabelY);
+	retCtrl->addObject(mCtrlX);
+	retCtrl->addObject(mCtrlY);
 }
 
-void GuiInspectorTypePoint2I::updateValue(StringTableEntry newValue)
+void GuiInspectorTypeDualValue::updateValue(StringTableEntry newValue)
 {
-   GuiControl *ctrl = dynamic_cast<GuiControl*>(mEdit);
-   if (ctrl != NULL)
-   {
-      const char* xField = ctrl->getDataField(StringTable->insert("fieldX"), NULL);
-      const char* yField = ctrl->getDataField(StringTable->insert("fieldY"), NULL);
-      Con::evaluatef("UpdatePoint2Value(\"%s\",\"%s\",\"%s\");", newValue, xField, yField);
-
-   }
+	U32 elementCount = Utility::mGetStringElementCount(newValue);
 
+	if (elementCount > 0)
+	{
+		mCtrlX->setText(StringUnit::getUnit(newValue, 0, " \t\n"));
+	}
+	if (elementCount > 1)
+	{
+		mCtrlY->setText(StringUnit::getUnit(newValue, 1, " \t\n"));
+	}
 }
 
 //////////////////////////////////////////////////////////////////////////
-// TypePoint2F GuiInspectorField Class
+// TypePoint2I GuiInspectorField Class
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_CONOBJECT(GuiInspectorTypePoint2F);
+IMPLEMENT_CONOBJECT(GuiInspectorTypePoint2I);
 
-void GuiInspectorTypePoint2F::consoleInit()
+void GuiInspectorTypePoint2I::consoleInit()
 {
    Parent::consoleInit();
 
-   ConsoleBaseType::getType(TypePoint2F)->setInspectorFieldType("GuiInspectorTypePoint2F");
+   ConsoleBaseType::getType(TypePoint2I)->setInspectorFieldType("GuiInspectorTypePoint2I");
 }
 
-GuiControl * GuiInspectorTypePoint2F::constructEditControl(S32 width)
+GuiControl * GuiInspectorTypePoint2I::constructEditControl(S32 width)
 {
-   GuiControl* retCtrl = new GuiControl();
-
-   // If we couldn't construct the control, bail!
-   if (retCtrl == NULL)
-      return retCtrl;
+	GuiControl* retCtrl = new GuiControl();
 
-   // Let's make it look pretty.
-   retCtrl->setControlProfile(mGroup->mInspector->mBackgroundProfile);
-   retCtrl->mBounds.set(mGroup->mInspector->mControlOffset, Point2I(width - mGroup->mInspector->mControlOffset.x, 60));
-
-   // get our data.
-   const char* mData = mTarget->getDataField(mField->pFieldname, NULL);
-   // Don't forget to register ourselves
-   retCtrl->setCanSaveDynamicFields(true);
-   registerEditControl(retCtrl);
-
-   // make our x fields.
-   GuiTextEditCtrl* mXctrl = new GuiTextEditCtrl();
-   GuiControl* mXLabel = new GuiControl();
-
-   // make our y fields.
-   GuiTextEditCtrl* mYctrl = new GuiTextEditCtrl();
-   GuiControl* mYLabel = new GuiControl();
-
-   // Don't forget to register ourselves
-   registerEditControl(mXctrl);
-   registerEditControl(mYctrl);
-
-   // Let's make it look pretty.
-   mXctrl->setControlProfile(mGroup->mInspector->mTextEditProfile);
-   mYctrl->setControlProfile(mGroup->mInspector->mTextEditProfile);
-   mXLabel->setControlProfile(mGroup->mInspector->mLabelProfile);
-   mYLabel->setControlProfile(mGroup->mInspector->mLabelProfile);
-
-   // the only difference between point2i and 2f
-   // keeping them separate just incase changes to textEdit.
+	// If we couldn't construct the control, bail!
+	if (retCtrl == NULL)
+		return retCtrl;
 
-   U32 mCount = StringUnit::getUnitCount(mData, " ");
+	// Let's make it look pretty.
+	retCtrl->setControlProfile(mGroup->mInspector->mBackgroundProfile);
+	retCtrl->mBounds.set(mGroup->mInspector->mControlOffset, Point2I(width - mGroup->mInspector->mControlOffset.x, 30));
 
-   for (U32 i = 0; i < mCount; i++)
-   {
-      const char* mVal = StringUnit::getUnit(mData, i, " ");
+	// Don't forget to register ourselves
+	registerEditControl(retCtrl);
 
-      if (i == 0)
-      {
-         mXctrl->setText(mVal);
-      }
-      else
-      {
-         mYctrl->setText(mVal);
-      }
-   }
+	constructEditControlChildren(retCtrl, width - mGroup->mInspector->mControlOffset.x);
 
-   // make and position our controls.
-   mXLabel->setExtent(Point2I(15, 30));
-   mYLabel->setExtent(Point2I(15, 30));
-   mXLabel->setField("text", "X:");
-   mYLabel->setField("text", "Y:");
-   mYLabel->setPosition(Point2I(0, 30));
+	return retCtrl;
+}
 
-   mXctrl->setExtent(Point2I(width - 25 - 20, 30));
-   mYctrl->setExtent(Point2I(width - 25 - 20, 30));
+//////////////////////////////////////////////////////////////////////////
+// TypePoint2F GuiInspectorField Class
+//////////////////////////////////////////////////////////////////////////
+IMPLEMENT_CONOBJECT(GuiInspectorTypePoint2F);
 
-   char szCommand[512];
+void GuiInspectorTypePoint2F::consoleInit()
+{
+   Parent::consoleInit();
 
-   dSprintf(szCommand, 512, "ApplyPoint2Value(\"%d.apply\",%d,%d);", getId(), mXctrl->getId(), mYctrl->getId());
+   ConsoleBaseType::getType(TypePoint2F)->setInspectorFieldType("GuiInspectorTypePoint2F");
+}
 
-   mXctrl->setPosition(Point2I(10, 0));
-   mYctrl->setPosition(Point2I(10, 30));
+GuiControl * GuiInspectorTypePoint2F::constructEditControl(S32 width)
+{
+	GuiControl* retCtrl = new GuiControl();
 
-   // they can share the same command.
-   // set altCommand instead.
-   mXctrl->setField("AltCommand", szCommand);
-   mYctrl->setField("AltCommand", szCommand);
+	// If we couldn't construct the control, bail!
+	if (retCtrl == NULL)
+		return retCtrl;
 
-   retCtrl->addObject(mXLabel);
-   retCtrl->addObject(mYLabel);
-   retCtrl->addObject(mXctrl);
-   retCtrl->addObject(mYctrl);
-   char szBuffX[512];
-   char szBuffY[512];
-   dSprintf(szBuffX, 512, "%d", mXctrl->getId());
-   dSprintf(szBuffY, 512, "%d", mYctrl->getId());
-   retCtrl->setDataField(StringTable->insert("fieldX"), NULL, StringTable->insert(szBuffX));
-   retCtrl->setDataField(StringTable->insert("fieldY"), NULL, StringTable->insert(szBuffY));
+	// Let's make it look pretty.
+	retCtrl->setControlProfile(mGroup->mInspector->mBackgroundProfile);
+	retCtrl->mBounds.set(mGroup->mInspector->mControlOffset, Point2I(width - mGroup->mInspector->mControlOffset.x, 30));
 
-   return retCtrl;
-}
+	// Don't forget to register ourselves
+	registerEditControl(retCtrl);
 
-void GuiInspectorTypePoint2F::updateValue(StringTableEntry newValue)
-{
-   GuiControl *ctrl = dynamic_cast<GuiControl*>(mEdit);
-   if (ctrl != NULL)
-   {
-      const char* xField = ctrl->getDataField(StringTable->insert("fieldX"), NULL);
-      const char* yField = ctrl->getDataField(StringTable->insert("fieldY"), NULL);
-      Con::evaluatef("UpdatePoint2Value(\"%s\",\"%s\",\"%s\");", newValue, xField, yField);
+	constructEditControlChildren(retCtrl, width - mGroup->mInspector->mControlOffset.x);
 
-   }
+	mCtrlX->setInputMode(GuiTextEditCtrl::InputMode::Decimal);
+	mCtrlY->setInputMode(GuiTextEditCtrl::InputMode::Decimal);
 
+	return retCtrl;
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -796,105 +705,25 @@ void GuiInspectorTypeVector2::consoleInit()
 
 GuiControl * GuiInspectorTypeVector2::constructEditControl(S32 width)
 {
-   // yes vector2 is the same as point2f as well. 
-   // all of these could be done similarly to color. but testing need test.
-   GuiControl* retCtrl = new GuiControl();
-
-   // If we couldn't construct the control, bail!
-   if (retCtrl == NULL)
-      return retCtrl;
-
-   // Let's make it look pretty.
-   retCtrl->setControlProfile(mGroup->mInspector->mBackgroundProfile);
-   retCtrl->mBounds.set(mGroup->mInspector->mControlOffset, Point2I(width - mGroup->mInspector->mControlOffset.x, 60));
+	GuiControl* retCtrl = new GuiControl();
 
-   // get our data.
-   const char* mData = mTarget->getDataField(mField->pFieldname, NULL);
-   // Don't forget to register ourselves
-   retCtrl->setCanSaveDynamicFields(true);
-   registerEditControl(retCtrl);
-
-   // make our x fields.
-   GuiTextEditCtrl* mXctrl = new GuiTextEditCtrl();
-   GuiControl* mXLabel = new GuiControl();
-
-   // make our y fields.
-   GuiTextEditCtrl* mYctrl = new GuiTextEditCtrl();
-   GuiControl* mYLabel = new GuiControl();
-
-   // Don't forget to register ourselves
-   registerEditControl(mXctrl);
-   registerEditControl(mYctrl);
-
-   // Let's make it look pretty.
-   mXctrl->setControlProfile(mGroup->mInspector->mTextEditProfile);
-   mYctrl->setControlProfile(mGroup->mInspector->mTextEditProfile);
-   mXLabel->setControlProfile(mGroup->mInspector->mLabelProfile);
-   mYLabel->setControlProfile(mGroup->mInspector->mLabelProfile);
-
-   U32 mCount = StringUnit::getUnitCount(mData, " ");
-
-   for (U32 i = 0; i < mCount; i++)
-   {
-      const char* mVal = StringUnit::getUnit(mData, i, " ");
-
-      if (i == 0)
-      {
-         mXctrl->setText(mVal);
-      }
-      else
-      {
-         mYctrl->setText(mVal);
-      }
-   }
-
-   // make and position our controls.
-   mXLabel->setExtent(Point2I(15, 30));
-   mYLabel->setExtent(Point2I(15, 30));
-   mXLabel->setField("text", "X:");
-   mYLabel->setField("text", "Y:");
-   mYLabel->setPosition(Point2I(0, 30));
-
-   mXctrl->setExtent(Point2I(width - 25 - 20, 30));
-   mYctrl->setExtent(Point2I(width - 25 - 20, 30));
-
-   char szCommand[512];
-
-   dSprintf(szCommand, 512, "ApplyPoint2Value(\"%d.apply\",%d,%d);", getId(), mXctrl->getId(), mYctrl->getId());
-
-   mXctrl->setPosition(Point2I(10, 0));
-   mYctrl->setPosition(Point2I(10, 30));
-
-   // they can share the same command.
-   // set altCommand instead.
-   mXctrl->setField("AltCommand", szCommand);
-   mYctrl->setField("AltCommand", szCommand);
+	// If we couldn't construct the control, bail!
+	if (retCtrl == NULL)
+		return retCtrl;
 
-   retCtrl->addObject(mXLabel);
-   retCtrl->addObject(mYLabel);
-   retCtrl->addObject(mXctrl);
-   retCtrl->addObject(mYctrl);
-   char szBuffX[512];
-   char szBuffY[512];
-   dSprintf(szBuffX, 512, "%d", mXctrl->getId());
-   dSprintf(szBuffY, 512, "%d", mYctrl->getId());
-   retCtrl->setDataField(StringTable->insert("fieldX"), NULL, StringTable->insert(szBuffX));
-   retCtrl->setDataField(StringTable->insert("fieldY"), NULL, StringTable->insert(szBuffY));
+	// Let's make it look pretty.
+	retCtrl->setControlProfile(mGroup->mInspector->mBackgroundProfile);
+	retCtrl->mBounds.set(mGroup->mInspector->mControlOffset, Point2I(width - mGroup->mInspector->mControlOffset.x, 30));
 
-   return retCtrl;
-}
+	// Don't forget to register ourselves
+	registerEditControl(retCtrl);
 
-void GuiInspectorTypeVector2::updateValue(StringTableEntry newValue)
-{
-   GuiControl *ctrl = dynamic_cast<GuiControl*>(mEdit);
-   if (ctrl != NULL)
-   {
-      const char* xField = ctrl->getDataField(StringTable->insert("fieldX"), NULL);
-      const char* yField = ctrl->getDataField(StringTable->insert("fieldY"), NULL);
-      Con::evaluatef("UpdatePoint2Value(\"%s\",\"%s\",\"%s\");", newValue, xField, yField);
+	constructEditControlChildren(retCtrl, width - mGroup->mInspector->mControlOffset.x);
 
-   }
+	mCtrlX->setInputMode(GuiTextEditCtrl::InputMode::Decimal);
+	mCtrlY->setInputMode(GuiTextEditCtrl::InputMode::Decimal);
 
+	return retCtrl;
 }
 
 //////////////////////////////////////////////////////////////////////////

engine/source/gui/editor/guiInspectorTypes.h

@@ -250,10 +250,24 @@ public:
    virtual const char*        getData();
 };
 
+//////////////////////////////////////////////////////////////////////////
+// DualValue GuiInspectorField Class
+//////////////////////////////////////////////////////////////////////////
+class GuiInspectorTypeDualValue : public GuiInspectorField
+{
+protected: 
+	GuiTextEditCtrl* mCtrlX;
+	GuiTextEditCtrl* mCtrlY;
+
+public:
+	virtual void		constructEditControlChildren(GuiControl* retCtrl, S32 width);
+	virtual void		updateValue(StringTableEntry newValue);
+};
+
 //////////////////////////////////////////////////////////////////////////
 // TypePoint2I GuiInspectorField Class
 //////////////////////////////////////////////////////////////////////////
-class GuiInspectorTypePoint2I : public GuiInspectorField
+class GuiInspectorTypePoint2I : public GuiInspectorTypeDualValue
 {
 private:
    typedef GuiInspectorField Parent;
@@ -265,13 +279,12 @@ public:
    // Override able methods for custom edit fields
    //////////////////////////////////////////////////////////////////////////
    virtual GuiControl*        constructEditControl(S32 width);
-   virtual void               updateValue(StringTableEntry newValue);
 };
 
 //////////////////////////////////////////////////////////////////////////
 // TypePoint2F GuiInspectorField Class
 //////////////////////////////////////////////////////////////////////////
-class GuiInspectorTypePoint2F : public GuiInspectorField
+class GuiInspectorTypePoint2F : public GuiInspectorTypeDualValue
 {
 private:
    typedef GuiInspectorField Parent;
@@ -283,13 +296,12 @@ public:
    // Override able methods for custom edit fields
    //////////////////////////////////////////////////////////////////////////
    virtual GuiControl*        constructEditControl(S32 width);
-   virtual void               updateValue(StringTableEntry newValue);
 };
 
 //////////////////////////////////////////////////////////////////////////
 // TypeVector2 GuiInspectorField Class
 //////////////////////////////////////////////////////////////////////////
-class GuiInspectorTypeVector2 : public GuiInspectorField
+class GuiInspectorTypeVector2 : public GuiInspectorTypeDualValue
 {
 private:
    typedef GuiInspectorField Parent;
@@ -301,7 +313,6 @@ public:
    // Override able methods for custom edit fields
    //////////////////////////////////////////////////////////////////////////
    virtual GuiControl*        constructEditControl(S32 width);
-   virtual void               updateValue(StringTableEntry newValue);
 };
 
 //////////////////////////////////////////////////////////////////////////