From b1da998d24119ec8a6cb83880503b378656e7327 Mon Sep 17 00:00:00 2001 From: Lynix Date: Sat, 2 Mar 2013 00:24:34 +0100 Subject: [PATCH] Updated Utility Former-commit-id: 6da80ae53e6965e1fb8a74e656434f514aac8c62 --- include/Nazara/Utility/Enums.hpp | 11 ++++++++++- include/Nazara/Utility/Image.hpp | 3 +++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/include/Nazara/Utility/Enums.hpp b/include/Nazara/Utility/Enums.hpp index c42d0ccac..62a21182e 100644 --- a/include/Nazara/Utility/Enums.hpp +++ b/include/Nazara/Utility/Enums.hpp @@ -140,6 +140,15 @@ enum nzImageType nzImageType_Max = nzImageType_Cubemap }; +enum nzNodeType +{ + nzNodeType_Default, + nzNodeType_Scene, + nzNodeType_Skeletal, + + nzNodeType_Max = nzNodeType_Skeletal +}; + enum nzPixelFormat { nzPixelFormat_Undefined = -1, @@ -161,9 +170,9 @@ enum nzPixelFormat nzPixelFormat_RGBA32F, nzPixelFormat_RGBA32I, // 4*nzUInt32 */ - nzPixelFormat_RGBA4, // 1*nzUInt16 nzPixelFormat_RGB5A1, // 1*nzUInt16 nzPixelFormat_RGB8, // 3*nzUInt8 + nzPixelFormat_RGBA4, // 1*nzUInt16 nzPixelFormat_RGBA8, // 4*nzUInt8 nzPixelFormat_Depth16, nzPixelFormat_Depth24, diff --git a/include/Nazara/Utility/Image.hpp b/include/Nazara/Utility/Image.hpp index 25c9a83d7..a97d9dbbe 100644 --- a/include/Nazara/Utility/Image.hpp +++ b/include/Nazara/Utility/Image.hpp @@ -28,7 +28,10 @@ struct NAZARA_API NzImageParams { + // Le format dans lequel l'image doit être chargée (Undefined pour le format le plus proche de l'original) nzPixelFormat loadFormat = nzPixelFormat_Undefined; + + // Le nombre de niveaux de mipmaps maximum devant être créé nzUInt8 levelCount = 0; bool IsValid() const;