GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
Wojtek Figat
2024-12-16 20:07:53 +01:00
parent 59b4755379
commit d1ac9cd2bc
4 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Engine/Core/Collections/Array.h
View File

@@ -125,8 +125,8 @@ public:
/// Initializes a new instance of the <see cref="Array"/> class.
/// </summary>
/// <param name="other">The other collection to copy.</param>
template<typename OtherT = T, typename OtherAllocationType = AllocationType>
explicit Array(const Array<OtherT, OtherAllocationType>& other) noexcept
template<typename Other = T, typename OtherAllocationType = AllocationType>
explicit Array(const Array<Other, OtherAllocationType>& other) noexcept
{
_capacity = other.Capacity();
_count = other.Count();
@@ -512,8 +512,8 @@ public:
/// Adds the other collection to the collection.
/// </summary>
/// <param name="other">The other collection to add.</param>
template<typename OtherT, typename OtherAllocationType = AllocationType>
FORCE_INLINE void Add(const Array<OtherT, OtherAllocationType>& other)
template<typename Other, typename OtherAllocationType = AllocationType>
FORCE_INLINE void Add(const Array<Other, OtherAllocationType>& other)
{
Add(other.Get(), other.Count());
}
@@ -629,8 +629,8 @@ public:
/// </summary>
/// <param name="item">The item to check.</param>
/// <returns>True if item has been found in the collection, otherwise false.</returns>
template<typename TComparableType>
bool Contains(const TComparableType& item) const
template<typename Other>
bool Contains(const Other& item) const
{
const T* data = _allocation.Get();
for (int32 i = 0; i < _count; i++)
@@ -914,8 +914,8 @@ public:
}
public:
template<typename OtherT = T, typename OtherAllocationType = AllocationType>
bool operator==(const Array<OtherT, OtherAllocationType>& other) const
template<typename Other = T, typename OtherAllocationType = AllocationType>
bool operator==(const Array<Other, OtherAllocationType>& other) const
{
if (_count == other.Count())
{
@@ -931,8 +931,8 @@ public:
return false;
}
template<typename OtherT = T, typename OtherAllocationType = AllocationType>
bool operator!=(const Array<OtherT, OtherAllocationType>& other) const
template<typename Other = T, typename OtherAllocationType = AllocationType>
bool operator!=(const Array<Other, OtherAllocationType>& other) const
{
return !operator==(other);
}

1
Source/Engine/Graphics/GPUBufferDescription.h
View File

@@ -281,7 +281,6 @@ public:
auto bufferFlags = GPUBufferFlags::Structured | GPUBufferFlags::ShaderResource;
if (isUnorderedAccess)
bufferFlags |= GPUBufferFlags::UnorderedAccess;
return Buffer(elementCount * elementSize, bufferFlags, PixelFormat::Unknown, nullptr, elementSize);
}

2
Source/Engine/Graphics/Models/MeshDeformation.cpp
View File

@@ -127,7 +127,7 @@ void MeshDeformation::RunDeformers(const MeshBase* mesh, MeshBufferType type, GP
}
if (!deformation)
{
deformation = New<MeshDeformationData>(key, type, vertexStride);
deformation = New<MeshDeformationData>(key, type, vertexStride, vertexBuffer->GetVertexLayout());
deformation->VertexBuffer.Data.Resize(vertexBuffer->GetSize());
deformation->Bounds = mesh->GetBox();
_deformations.Add(deformation);

4
Source/Engine/Graphics/Models/MeshDeformation.h
View File

@@ -20,10 +20,10 @@ struct MeshDeformationData
BoundingBox Bounds;
DynamicVertexBuffer VertexBuffer;
MeshDeformationData(uint64 key, MeshBufferType type, uint32 stride)
MeshDeformationData(uint64 key, MeshBufferType type, uint32 stride, GPUVertexLayout* layout)
: Key(key)
, Type(type)
, VertexBuffer(0, stride, TEXT("MeshDeformation"))
, VertexBuffer(0, stride, TEXT("MeshDeformation"), layout)
{
}