TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 03:33:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into ShaderConstBuffer-CleanupRefactor

Browse source
This commit is contained in:
marauder2k7 2024-03-14 08:28:29 +00:00
commit ae11d996d9
5 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Engine/source/console/arrayObject.cpp
View file

@ -404,6 +404,22 @@ void ArrayObject::uniqueKey()
//-----------------------------------------------------------------------------
void ArrayObject::uniquePair()
{
for (S32 i = 0; i < mArray.size(); i++)
{
for (S32 j = i + 1; j < mArray.size(); j++)
{
if (isEqual(mArray[i].key, mArray[j].key) && isEqual(mArray[i].value, mArray[j].value))
{
erase(j);
j--;
}
}
}
}
//-----------------------------------------------------------------------------
void ArrayObject::duplicate(ArrayObject* obj)
{
empty();
@ -740,6 +756,12 @@ DefineEngineMethod( ArrayObject, uniqueKey, void, (),,
object->uniqueKey();
}
DefineEngineMethod(ArrayObject, uniquePair, void, (), ,
"Removes any elements that have duplicated key and value pairs (leaving the first instance)")
{
object->uniquePair();
}
DefineEngineMethod( ArrayObject, duplicate, bool, ( ArrayObject* target ),,
"Alters array into an exact duplicate of the target array.\n"
"@param target ArrayObject to duplicate\n" )

6
Engine/source/console/arrayObject.h
View file

@ -158,6 +158,10 @@ public:
/// (keeps the first instance only)
void uniqueKey();
/// Removes any duplicate keys from the array
/// (keeps the first instance only)
void uniquePair();
/// Makes this array an exact duplicate of another array
void duplicate( ArrayObject *obj );
@ -229,4 +233,4 @@ public:
static void initPersistFields();
};
#endif // _ARRAYOBJECT_H_
#endif // _ARRAYOBJECT_H_