From 78147821a06a694e44fe8d0109e926a9046e1673 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Tue, 19 Dec 2023 23:29:46 -0600 Subject: [PATCH] filter inspector buttons out of the following: PersistenceManager::updateObject SimObject::writeFields SimObject::assignFieldsFrom DefineEngineMethod( SimObject, getFieldCount, S32, (),, DefineEngineMethod( SimObject, getField, const char*, ( S32 index ),, SimObject::writeObject do not do so for SimObject::setDataField DefineEngineMethod( SimObject, dump, void, ( bool detailed ), ( false ), --- Engine/source/console/persistenceManager.cpp | 2 +- Engine/source/console/simObject.cpp | 8 ++++---- Engine/source/console/simSerialize.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Engine/source/console/persistenceManager.cpp b/Engine/source/console/persistenceManager.cpp index b7dfb97f5..630dad448 100644 --- a/Engine/source/console/persistenceManager.cpp +++ b/Engine/source/console/persistenceManager.cpp @@ -1358,7 +1358,7 @@ void PersistenceManager::updateObject(SimObject* object, ParsedObject* parentObj const AbstractClassRep::Field* f = &list[i]; // Skip the special field types. - if ( f->type >= AbstractClassRep::ARCFirstCustomField ) + if ( f->type >= AbstractClassRep::ARCFirstCustomField || f->flag.test(AbstractClassRep::FieldFlags::FIELD_ComponentInspectors)) continue; for(U32 j = 0; S32(j) < f->elementCount; j++) diff --git a/Engine/source/console/simObject.cpp b/Engine/source/console/simObject.cpp index 6c01e4f00..049742e50 100644 --- a/Engine/source/console/simObject.cpp +++ b/Engine/source/console/simObject.cpp @@ -317,7 +317,7 @@ void SimObject::writeFields(Stream &stream, U32 tabStop) const AbstractClassRep::Field* f = &list[i]; // Skip the special field types. - if ( f->type >= AbstractClassRep::ARCFirstCustomField ) + if ( f->type >= AbstractClassRep::ARCFirstCustomField || f->flag.test(AbstractClassRep::FieldFlags::FIELD_ComponentInspectors)) continue; for(U32 j = 0; S32(j) < f->elementCount; j++) @@ -913,7 +913,7 @@ void SimObject::assignFieldsFrom(SimObject *parent) continue; // Skip the special field types. - if ( f->type >= AbstractClassRep::ARCFirstCustomField ) + if ( f->type >= AbstractClassRep::ARCFirstCustomField || f->flag.test(AbstractClassRep::FieldFlags::FIELD_ComponentInspectors)) continue; // Skip certain fields that we don't want to see copied so we don't @@ -3255,7 +3255,7 @@ DefineEngineMethod( SimObject, getFieldCount, S32, (),, f = &list[i]; // The special field types do not need to be counted. - if ( f->type >= AbstractClassRep::ARCFirstCustomField ) + if ( f->type >= AbstractClassRep::ARCFirstCustomField || f->flag.test(AbstractClassRep::FieldFlags::FIELD_ComponentInspectors)) numDummyEntries++; } @@ -3280,7 +3280,7 @@ DefineEngineMethod( SimObject, getField, const char*, ( S32 index ),, f = &list[i]; // The special field types can be skipped. - if ( f->type >= AbstractClassRep::ARCFirstCustomField ) + if ( f->type >= AbstractClassRep::ARCFirstCustomField || f->flag.test(AbstractClassRep::FieldFlags::FIELD_ComponentInspectors)) continue; if(currentField == index) diff --git a/Engine/source/console/simSerialize.cpp b/Engine/source/console/simSerialize.cpp index 6a7a84b17..c87033265 100644 --- a/Engine/source/console/simSerialize.cpp +++ b/Engine/source/console/simSerialize.cpp @@ -48,7 +48,7 @@ bool SimObject::writeObject(Stream *stream) for(itr = fieldList.begin();itr != fieldList.end();itr++) { - if( itr->type >= AbstractClassRep::ARCFirstCustomField ) + if( itr->type >= AbstractClassRep::ARCFirstCustomField || itr->flag.test(AbstractClassRep::FieldFlags::FIELD_ComponentInspectors)) { numFields--; continue;