From c1cf4d58f07b3c18abf18134e7a5ce623e67dc5b Mon Sep 17 00:00:00 2001 From: gered Date: Sun, 24 Apr 2011 18:54:39 -0400 Subject: [PATCH] probably should use uint32_t instead of size_t for 32+64bit compatibility --- MeshConverter/src/chunks/materials.h | 4 ++-- MeshConverter/src/chunks/normals.h | 4 ++-- MeshConverter/src/chunks/texcoords.h | 4 ++-- MeshConverter/src/chunks/triangles.h | 4 ++-- MeshConverter/src/chunks/vertices.h | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/MeshConverter/src/chunks/materials.h b/MeshConverter/src/chunks/materials.h index abf2bcc..37a96f5 100644 --- a/MeshConverter/src/chunks/materials.h +++ b/MeshConverter/src/chunks/materials.h @@ -22,12 +22,12 @@ struct MaterialsChunk SAFE_DELETE_ARRAY(materials); } - size_t GetSize() + uint32_t GetSize() { if (count == 0) return 0; - size_t size = sizeof(uint32_t); + uint32_t size = sizeof(uint32_t); for (uint32_t i = 0; i < count; ++i) { size += materials[i].name.length() + 1; // include null terminator diff --git a/MeshConverter/src/chunks/normals.h b/MeshConverter/src/chunks/normals.h index b98e751..93a8b4d 100644 --- a/MeshConverter/src/chunks/normals.h +++ b/MeshConverter/src/chunks/normals.h @@ -22,12 +22,12 @@ struct NormalsChunk SAFE_DELETE_ARRAY(normals); } - size_t GetSize() + uint32_t GetSize() { if (count == 0) return 0; - size_t size = sizeof(uint32_t); + uint32_t size = sizeof(uint32_t); size += (sizeof(float) * 3) // x, y, z * count; diff --git a/MeshConverter/src/chunks/texcoords.h b/MeshConverter/src/chunks/texcoords.h index f56e631..98be852 100644 --- a/MeshConverter/src/chunks/texcoords.h +++ b/MeshConverter/src/chunks/texcoords.h @@ -22,12 +22,12 @@ struct TexCoordsChunk SAFE_DELETE_ARRAY(texCoords); } - size_t GetSize() + uint32_t GetSize() { if (count == 0) return 0; - size_t size = sizeof(uint32_t); + uint32_t size = sizeof(uint32_t); size += (sizeof(float) * 2) // u, v * count; diff --git a/MeshConverter/src/chunks/triangles.h b/MeshConverter/src/chunks/triangles.h index 2df3252..b5936ac 100644 --- a/MeshConverter/src/chunks/triangles.h +++ b/MeshConverter/src/chunks/triangles.h @@ -22,12 +22,12 @@ struct TrianglesChunk SAFE_DELETE_ARRAY(triangles); } - size_t GetSize() + uint32_t GetSize() { if (count == 0) return 0; - size_t size = sizeof(uint32_t); + uint32_t size = sizeof(uint32_t); size += ( (sizeof(uint32_t) * 3) // vertex indices diff --git a/MeshConverter/src/chunks/vertices.h b/MeshConverter/src/chunks/vertices.h index 494067e..857b59c 100644 --- a/MeshConverter/src/chunks/vertices.h +++ b/MeshConverter/src/chunks/vertices.h @@ -22,12 +22,12 @@ struct VerticesChunk SAFE_DELETE_ARRAY(vertices); } - size_t GetSize() + uint32_t GetSize() { if (count == 0) return 0; - size_t size = sizeof(uint32_t); + uint32_t size = sizeof(uint32_t); size += (sizeof(float) * 3) // x, y, z * count;