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

Revert "Merge branch 'development' into ShaderConstBuffer-CleanupRefactor"

Browse source 
This reverts commit ae11d996d9, reversing
changes made to e6c653c441.
This commit is contained in:
marauder2k7 2024-03-14 08:32:29 +00:00
parent ae11d996d9
commit bd7bbd782c
5 changed files with 4 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -404,22 +404,6 @@ 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();
@ -756,12 +740,6 @@ 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" )