mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-01-19 20:24:49 +00:00
Revert "Merge branch 'development' into ShaderConstBuffer-CleanupRefactor"
This reverts commitae11d996d9, reversing changes made toe6c653c441.
This commit is contained in:
parent
ae11d996d9
commit
bd7bbd782c
1
.github/workflows/build-windows-msvc.yml
vendored
1
.github/workflows/build-windows-msvc.yml
vendored
|
|
@ -9,6 +9,7 @@ concurrency:
|
|||
cancel-in-progress: true
|
||||
jobs:
|
||||
build-windows:
|
||||
if: github.repository == 'TorqueGameEngines/Torque3D'
|
||||
name: ${{matrix.config.name}}
|
||||
runs-on: windows-latest
|
||||
strategy:
|
||||
|
|
|
|||
1
.github/workflows/test-results-linux.yml
vendored
1
.github/workflows/test-results-linux.yml
vendored
|
|
@ -21,6 +21,7 @@ jobs:
|
|||
runos: ubuntu-latest,
|
||||
artifact-name: "torque3dLinuxGCCUnitTest"
|
||||
}
|
||||
|
||||
steps:
|
||||
- name: Download Linux Test Report
|
||||
uses: dawidd6/action-download-artifact@v2
|
||||
|
|
|
|||
|
|
@ -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" )
|
||||
|
|
|
|||
|
|
@ -158,10 +158,6 @@ 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 );
|
||||
|
||||
|
|
|
|||
|
|
@ -650,7 +650,7 @@ function populateAllFonts()
|
|||
continue;
|
||||
%fontarray.push_back(%obj.fontType,%obj.fontSize);
|
||||
}
|
||||
%fontarray.uniquePair();
|
||||
%fontarray.uniqueKey();
|
||||
|
||||
%fontarrayCount = %fontarray.count();
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue