sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SparsePtr: Make pointer conversion explicit

This commit is contained in:
Lynix 2020-02-23 02:06:48 +01:00
parent 2cc95b4f75
commit 364122f582
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Core/SparsePtr.hpp
View File

@ -43,7 +43,7 @@ namespace Nz
void SetStride(int stride);
explicit operator bool() const;
operator T*() const;
explicit operator T*() const;
T& operator*() const;
T* operator->() const;
T& operator[](std::size_t index) const;

2
src/Nazara/Physics3D/Collider3D.cpp
View File

@ -347,7 +347,7 @@ namespace Nz
m_vertices[i] = *vertices++;
}
else // Fast path
std::memcpy(m_vertices.data(), vertices, vertexCount*sizeof(Vector3f));
std::memcpy(m_vertices.data(), vertices.GetPtr(), vertexCount*sizeof(Vector3f));
}
ConvexCollider3D::ConvexCollider3D(SparsePtr<const Vector3f> vertices, unsigned int vertexCount, float tolerance, const Vector3f& translation, const Quaternionf& rotation) :