probably should use uint32_t instead of size_t for 32+64bit compatibility
This commit is contained in:
parent
4d6a8b3c0d
commit
c1cf4d58f0
|
@ -22,12 +22,12 @@ struct MaterialsChunk
|
||||||
SAFE_DELETE_ARRAY(materials);
|
SAFE_DELETE_ARRAY(materials);
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t GetSize()
|
uint32_t GetSize()
|
||||||
{
|
{
|
||||||
if (count == 0)
|
if (count == 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
size_t size = sizeof(uint32_t);
|
uint32_t size = sizeof(uint32_t);
|
||||||
for (uint32_t i = 0; i < count; ++i)
|
for (uint32_t i = 0; i < count; ++i)
|
||||||
{
|
{
|
||||||
size += materials[i].name.length() + 1; // include null terminator
|
size += materials[i].name.length() + 1; // include null terminator
|
||||||
|
|
|
@ -22,12 +22,12 @@ struct NormalsChunk
|
||||||
SAFE_DELETE_ARRAY(normals);
|
SAFE_DELETE_ARRAY(normals);
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t GetSize()
|
uint32_t GetSize()
|
||||||
{
|
{
|
||||||
if (count == 0)
|
if (count == 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
size_t size = sizeof(uint32_t);
|
uint32_t size = sizeof(uint32_t);
|
||||||
size +=
|
size +=
|
||||||
(sizeof(float) * 3) // x, y, z
|
(sizeof(float) * 3) // x, y, z
|
||||||
* count;
|
* count;
|
||||||
|
|
|
@ -22,12 +22,12 @@ struct TexCoordsChunk
|
||||||
SAFE_DELETE_ARRAY(texCoords);
|
SAFE_DELETE_ARRAY(texCoords);
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t GetSize()
|
uint32_t GetSize()
|
||||||
{
|
{
|
||||||
if (count == 0)
|
if (count == 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
size_t size = sizeof(uint32_t);
|
uint32_t size = sizeof(uint32_t);
|
||||||
size +=
|
size +=
|
||||||
(sizeof(float) * 2) // u, v
|
(sizeof(float) * 2) // u, v
|
||||||
* count;
|
* count;
|
||||||
|
|
|
@ -22,12 +22,12 @@ struct TrianglesChunk
|
||||||
SAFE_DELETE_ARRAY(triangles);
|
SAFE_DELETE_ARRAY(triangles);
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t GetSize()
|
uint32_t GetSize()
|
||||||
{
|
{
|
||||||
if (count == 0)
|
if (count == 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
size_t size = sizeof(uint32_t);
|
uint32_t size = sizeof(uint32_t);
|
||||||
size +=
|
size +=
|
||||||
(
|
(
|
||||||
(sizeof(uint32_t) * 3) // vertex indices
|
(sizeof(uint32_t) * 3) // vertex indices
|
||||||
|
|
|
@ -22,12 +22,12 @@ struct VerticesChunk
|
||||||
SAFE_DELETE_ARRAY(vertices);
|
SAFE_DELETE_ARRAY(vertices);
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t GetSize()
|
uint32_t GetSize()
|
||||||
{
|
{
|
||||||
if (count == 0)
|
if (count == 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
size_t size = sizeof(uint32_t);
|
uint32_t size = sizeof(uint32_t);
|
||||||
size +=
|
size +=
|
||||||
(sizeof(float) * 3) // x, y, z
|
(sizeof(float) * 3) // x, y, z
|
||||||
* count;
|
* count;
|
||||||
|
|
Reference in a new issue