TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-26 01:53:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1234 from marauder2k9-torque/virtuals-override

Browse source 
Virtuals override
This commit is contained in:
Brian Roberts 2024-03-21 10:43:26 -05:00 • committed by GitHub
commit 05a083ca6f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
710 changed files with 6353 additions and 6324 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Engine/source/gui/editor/inspector/customField.h
View file

@ -38,27 +38,27 @@ public:
DECLARE_CONOBJECT( GuiInspectorCustomField );
virtual void setData( const char* data, bool callbacks = true );
virtual const char* getData( U32 inspectObjectIndex = 0 );
virtual void updateValue();
virtual StringTableEntry getFieldName() { return StringTable->EmptyString(); }
void setData( const char* data, bool callbacks = true ) override;
const char* getData( U32 inspectObjectIndex = 0 ) override;
void updateValue() override;
StringTableEntry getFieldName() override { return StringTable->EmptyString(); }
virtual void setDoc( const char* doc );
virtual void setToolTip( StringTableEntry data );
virtual bool onAdd();
bool onAdd() override;
virtual void setInspectorField( AbstractClassRep::Field *field,
void setInspectorField( AbstractClassRep::Field *field,
StringTableEntry caption = NULL,
const char *arrayIndex = NULL );
const char *arrayIndex = NULL ) override;
virtual GuiControl* constructEditControl();
GuiControl* constructEditControl() override;
virtual void setValue( const char* newValue );
void setValue( const char* newValue ) override;
protected:
virtual void _executeSelectedCallback();
void _executeSelectedCallback() override;
protected:

14
Engine/source/gui/editor/inspector/datablockField.h
View file

@ -44,9 +44,9 @@ class GuiInspectorDatablockField : public GuiInspectorTypeMenuBase
RectI mBrowseRect;
virtual SimSet* _getDatablockSet() const { return Sim::getDataBlockSet(); }
virtual void _populateMenu( GuiPopUpMenuCtrlEx* menu );
virtual GuiControl* constructEditControl();
virtual bool updateRects();
void _populateMenu( GuiPopUpMenuCtrlEx* menu ) override;
GuiControl* constructEditControl() override;
bool updateRects() override;
public:
@ -69,7 +69,7 @@ class GuiInspectorTypeSFXDescriptionName : public GuiInspectorDatablockField
protected:
virtual SimSet* _getDatablockSet() const { return Sim::getSFXDescriptionSet(); }
SimSet* _getDatablockSet() const override { return Sim::getSFXDescriptionSet(); }
public:
@ -89,7 +89,7 @@ class GuiInspectorTypeSFXTrackName : public GuiInspectorDatablockField
protected:
virtual SimSet* _getDatablockSet() const { return Sim::getSFXTrackSet(); }
SimSet* _getDatablockSet() const override { return Sim::getSFXTrackSet(); }
public:
@ -109,7 +109,7 @@ class GuiInspectorTypeSFXEnvironmentName : public GuiInspectorDatablockField
protected:
virtual SimSet* _getDatablockSet() const { return Sim::getSFXEnvironmentSet(); }
SimSet* _getDatablockSet() const override { return Sim::getSFXEnvironmentSet(); }
public:
DECLARE_CONOBJECT(GuiInspectorTypeSFXEnvironmentName);
@ -128,7 +128,7 @@ class GuiInspectorTypeSFXAmbienceName : public GuiInspectorDatablockField
protected:
virtual SimSet* _getDatablockSet() const { return Sim::getSFXAmbienceSet(); }
SimSet* _getDatablockSet() const override { return Sim::getSFXAmbienceSet(); }
public:

18
Engine/source/gui/editor/inspector/dynamicField.h
View file

@ -39,24 +39,24 @@ public:
DECLARE_CONOBJECT( GuiInspectorDynamicField );
virtual void setData( const char* data, bool callbacks = true );
virtual const char* getData( U32 inspectObjectIndex = 0 );
virtual StringTableEntry getFieldName() { return ( mDynField != NULL ) ? mDynField->slotName : StringTable->insert( "" ); }
virtual StringTableEntry getRawFieldName() { return getFieldName(); }
void setData( const char* data, bool callbacks = true ) override;
const char* getData( U32 inspectObjectIndex = 0 ) override;
StringTableEntry getFieldName() override { return ( mDynField != NULL ) ? mDynField->slotName : StringTable->insert( "" ); }
StringTableEntry getRawFieldName() override { return getFieldName(); }
virtual bool onAdd();
bool onAdd() override;
void renameField( const char* newFieldName );
GuiControl* constructRenameControl();
virtual bool updateRects();
virtual void setInspectorField( AbstractClassRep::Field *field,
bool updateRects() override;
void setInspectorField( AbstractClassRep::Field *field,
StringTableEntry caption = NULL,
const char *arrayIndex = NULL );
const char *arrayIndex = NULL ) override;
protected:
virtual void _executeSelectedCallback();
void _executeSelectedCallback() override;
protected:

6
Engine/source/gui/editor/inspector/dynamicGroup.h
View file

@ -45,8 +45,8 @@ public:
// inspectGroup is overridden in GuiInspectorDynamicGroup to inspect an
// objects FieldDictionary (dynamic fields) instead of regular persistent
// fields.
bool inspectGroup();
virtual void updateAllFields();
bool inspectGroup() override;
void updateAllFields() override;
// For scriptable dynamic field additions
void addDynamicField();
@ -58,7 +58,7 @@ public:
virtual SimFieldDictionary::Entry* findDynamicFieldInDictionary( StringTableEntry fieldName );
protected:
// create our inner controls when we add
virtual bool createContent();
bool createContent() override;
};

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

@ -202,12 +202,12 @@ class GuiInspectorField : public GuiControl
GuiInspector* getInspector() const { return mInspector; }
// GuiControl.
virtual bool onAdd();
virtual bool resize(const Point2I &newPosition, const Point2I &newExtent);
virtual void onRender(Point2I offset, const RectI &updateRect);
virtual void setFirstResponder( GuiControl *firstResponder );
virtual void onMouseDown( const GuiEvent &event );
virtual void onRightMouseUp( const GuiEvent &event );
bool onAdd() override;
bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
void onRender(Point2I offset, const RectI &updateRect) override;
void setFirstResponder( GuiControl *firstResponder ) override;
void onMouseDown( const GuiEvent &event ) override;
void onRightMouseUp( const GuiEvent &event ) override;
void setTargetObject(SimObject* obj) { mTargetObject = obj; }
SimObject* getTargetObject() { return mTargetObject; }

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

@ -70,7 +70,7 @@ public:
const String& getGroupName() const { return mCaption; };
SimObjectPtr<GuiInspector> getInspector() { return mParent; };
bool onAdd();
bool onAdd() override;
virtual bool inspectGroup();
virtual void animateToContents();

14
Engine/source/gui/editor/inspector/variableField.h
View file

@ -45,15 +45,15 @@ public:
DECLARE_CONOBJECT( GuiInspectorVariableField );
DECLARE_CATEGORY( "Gui Editor" );
virtual bool onAdd();
bool onAdd() override;
virtual void setValue( const char* newValue );
virtual const char* getValue() { return NULL; }
virtual void updateValue();
virtual void setData( const char* data, bool callbacks = true );
virtual const char* getData( U32 inspectObjectIndex = 0 );
virtual void updateData() {};
void setValue( const char* newValue ) override;
const char* getValue() override { return NULL; }
void updateValue() override;
void setData( const char* data, bool callbacks = true ) override;
const char* getData( U32 inspectObjectIndex = 0 ) override;
void updateData() override {};
protected:
StringTableEntry mVariableName;

4
Engine/source/gui/editor/inspector/variableGroup.h
View file

@ -67,9 +67,9 @@ public:
DECLARE_CONOBJECT(GuiInspectorVariableGroup);
DECLARE_CATEGORY( "Gui Editor" );
virtual GuiInspectorField* constructField( S32 fieldType );
GuiInspectorField* constructField( S32 fieldType ) override;
virtual bool inspectGroup();
bool inspectGroup() override;
void clearFields();
void addField(VariableField* field);

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

@ -43,7 +43,7 @@ public:
DECLARE_CONOBJECT( GuiVariableInspector );
DECLARE_CATEGORY( "Gui Editor" );
virtual void inspectObject( SimObject *object ) {}
void inspectObject( SimObject *object ) override {}
virtual void loadVars( String searchString );