Cleanup

src/resource/texture_resource.cpp

@@ -17,63 +17,63 @@
 namespace crown
 {
 
-#define FOURCC(a, b, c, d)			uint32_t(a | (b << 8) | (c << 16) | (d << 24))
-
-#define DDSD_MAGIC 					FOURCC('D', 'D', 'S', ' ')
-#define DDSD_HEADERSIZE				uint32_t(124)
-#define DDSD_UNUSED					uint32_t(0x00000000)
-#define DDSD_CAPS					uint32_t(0x00000001) // Required in every .dds file.
-#define DDSD_HEIGHT					uint32_t(0x00000002) // Required in every .dds file.
-#define DDSD_WIDTH					uint32_t(0x00000004) // Required in every .dds file.
-#define DDSD_PITCH					uint32_t(0x00000008) // Required when pitch is provided for an uncompressed texture.
-#define DDSD_PIXELFORMAT			uint32_t(0x00001000) // Required in every .dds file.
-#define DDSD_MIPMAPCOUNT			uint32_t(0x00020000) // Required in a mipmapped texture.
-#define DDSD_LINEARSIZE				uint32_t(0x00080000) // Required when pitch is provided for a compressed texture.
-#define DDSD_DEPTH					uint32_t(0x00800000) // Required in a depth texture.
-
-#define DDS_HEADER_FLAGS_TEXTURE	uint32_t(DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT)
-#define DDS_HEADER_FLAGS_MIPMAP		uint32_t(DDSD_MIPMAPCOUNT)
-#define DDS_HEADER_FLAGS_VOLUME		uint32_t(DDSD_DEPTH)
-#define DDS_HEADER_FLAGS_PITCH		uint32_t(DDSD_PITCH)
-#define DDS_HEADER_FLAGS_LINEARSIZE	uint32_t(DDSD_LINEARSIZE)
-
-#define DDSCAPS_COMPLEX				uint32_t(0x00000008) // Optional; must be used on any file that contains more than one surface (a mipmap, a cubic environment map, or mipmapped volume texture).
-#define DDSCAPS_MIPMAP				uint32_t(0x00400000) // Optional; should be used for a mipmap.
-#define DDSCAPS_TEXTURE				uint32_t(0x00001000) // Required
-
-#define DDSCAPS2_CUBEMAP			uint32_t(0x00000200) // Required for a cube map.
-#define DDSCAPS2_CUBEMAP_POSITIVEX	uint32_t(0x00000400) // Required when these surfaces are stored in a cube map.
-#define DDSCAPS2_CUBEMAP_NEGATIVEX	uint32_t(0x00000800) // Required when these surfaces are stored in a cube map.
-#define DDSCAPS2_CUBEMAP_POSITIVEY	uint32_t(0x00001000) // Required when these surfaces are stored in a cube map.
-#define DDSCAPS2_CUBEMAP_NEGATIVEY	uint32_t(0x00002000) // Required when these surfaces are stored in a cube map.
-#define DDSCAPS2_CUBEMAP_POSITIVEZ	uint32_t(0x00004000) // Required when these surfaces are stored in a cube map.
-#define DDSCAPS2_CUBEMAP_NEGATIVEZ	uint32_t(0x00008000) // Required when these surfaces are stored in a cube map.
-#define DDSCAPS2_VOLUME				uint32_t(0x00200000) // Required for a volume texture.
-
-#define DDPF_HEADERSIZE				uint32_t(32)
-#define DDPF_ALPHAPIXELS			uint32_t(0x00000001) // Texture contains alpha data; dwRGBAlphaBitMask contains valid data.
-#define DDPF_ALPHA					uint32_t(0x00000002) // Used in some older DDS files for alpha channel only uncompressed data (dwRGBBitCount contains the alpha channel bitcount; dwABitMask contains valid data)
-#define DDPF_FOURCC					uint32_t(0x00000004) // Texture contains compressed RGB data; dwFourCC contains valid data.
-#define DDPF_RGB					uint32_t(0x00000040) // Texture contains uncompressed RGB data; dwRGBBitCount and the RGB masks (dwRBitMask, dwGBitMask, dwBBitMask) contain valid data.
-#define DDPF_YUV					uint32_t(0x00000200) // Used in some older DDS files for YUV uncompressed data (dwRGBBitCount contains the YUV bit count; dwRBitMask contains the Y mask, dwGBitMask contains the U mask, dwBBitMask contains the V mask)
-#define DDPF_LUMINANCE				uint32_t(0x00020000) // Used in some older DDS files for single channel color uncompressed data (dwRGBBitCount contains the luminance channel bit count; dwRBitMask contains the channel mask). Can be combined with DDPF_ALPHAPIXELS for a two channel DDS file.
-
-#define DDS_FOURCC					uint32_t(DDPF_FOURCC)
-#define DDS_RGB						uint32_t(DDPF_RGB)
-#define DDS_RGBA					uint32_t(DDPF_RGB | DDPF_ALPHAPIXELS)
-#define DDS_LUMINANCE				uint32_t(DDPF_LUMINANCE)
-#define DDS_LUMINANCEA				uint32_t(DDPF_LUMINANCE | DDPF_ALPHAPIXELS)
-#define DDS_ALPHA					uint32_t(DDPF_ALPHA)
-
-#define DDPF_FOURCC_DXT1			FOURCC('D', 'X', 'T', '1')
-#define DDPF_FOURCC_DXT2			FOURCC('D', 'X', 'T', '2')
-#define DDPF_FOURCC_DXT3			FOURCC('D', 'X', 'T', '3')
-#define DDPF_FOURCC_DXT4			FOURCC('D', 'X', 'T', '4')
-#define DDPF_FOURCC_DXT5			FOURCC('D', 'X', 'T', '5')
-#define DDPF_FOURCC_DX10			FOURCC('D', 'X', '1', '0')
-
-#define DDS_HEADER_OFFSET			uint32_t(sizeof(TextureHeader))
-#define DDS_DATA_OFFSET				uint32_t(DDS_HEADER_OFFSET + DDSD_HEADERSIZE)
+#define FOURCC(a, b, c, d)          uint32_t(a | (b << 8) | (c << 16) | (d << 24))
+
+#define DDSD_MAGIC                  FOURCC('D', 'D', 'S', ' ')
+#define DDSD_HEADERSIZE             uint32_t(124)
+#define DDSD_UNUSED                 uint32_t(0x00000000)
+#define DDSD_CAPS                   uint32_t(0x00000001) // Required in every .dds file.
+#define DDSD_HEIGHT                 uint32_t(0x00000002) // Required in every .dds file.
+#define DDSD_WIDTH                  uint32_t(0x00000004) // Required in every .dds file.
+#define DDSD_PITCH                  uint32_t(0x00000008) // Required when pitch is provided for an uncompressed texture.
+#define DDSD_PIXELFORMAT            uint32_t(0x00001000) // Required in every .dds file.
+#define DDSD_MIPMAPCOUNT            uint32_t(0x00020000) // Required in a mipmapped texture.
+#define DDSD_LINEARSIZE             uint32_t(0x00080000) // Required when pitch is provided for a compressed texture.
+#define DDSD_DEPTH                  uint32_t(0x00800000) // Required in a depth texture.
+
+#define DDS_HEADER_FLAGS_TEXTURE    uint32_t(DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT)
+#define DDS_HEADER_FLAGS_MIPMAP     uint32_t(DDSD_MIPMAPCOUNT)
+#define DDS_HEADER_FLAGS_VOLUME     uint32_t(DDSD_DEPTH)
+#define DDS_HEADER_FLAGS_PITCH      uint32_t(DDSD_PITCH)
+#define DDS_HEADER_FLAGS_LINEARSIZE uint32_t(DDSD_LINEARSIZE)
+
+#define DDSCAPS_COMPLEX             uint32_t(0x00000008) // Optional; must be used on any file that contains more than one surface (a mipmap, a cubic environment map, or mipmapped volume texture).
+#define DDSCAPS_MIPMAP              uint32_t(0x00400000) // Optional; should be used for a mipmap.
+#define DDSCAPS_TEXTURE             uint32_t(0x00001000) // Required
+
+#define DDSCAPS2_CUBEMAP            uint32_t(0x00000200) // Required for a cube map.
+#define DDSCAPS2_CUBEMAP_POSITIVEX  uint32_t(0x00000400) // Required when these surfaces are stored in a cube map.
+#define DDSCAPS2_CUBEMAP_NEGATIVEX  uint32_t(0x00000800) // Required when these surfaces are stored in a cube map.
+#define DDSCAPS2_CUBEMAP_POSITIVEY  uint32_t(0x00001000) // Required when these surfaces are stored in a cube map.
+#define DDSCAPS2_CUBEMAP_NEGATIVEY  uint32_t(0x00002000) // Required when these surfaces are stored in a cube map.
+#define DDSCAPS2_CUBEMAP_POSITIVEZ  uint32_t(0x00004000) // Required when these surfaces are stored in a cube map.
+#define DDSCAPS2_CUBEMAP_NEGATIVEZ  uint32_t(0x00008000) // Required when these surfaces are stored in a cube map.
+#define DDSCAPS2_VOLUME             uint32_t(0x00200000) // Required for a volume texture.
+
+#define DDPF_HEADERSIZE             uint32_t(32)
+#define DDPF_ALPHAPIXELS            uint32_t(0x00000001) // Texture contains alpha data; dwRGBAlphaBitMask contains valid data.
+#define DDPF_ALPHA                  uint32_t(0x00000002) // Used in some older DDS files for alpha channel only uncompressed data (dwRGBBitCount contains the alpha channel bitcount; dwABitMask contains valid data)
+#define DDPF_FOURCC                 uint32_t(0x00000004) // Texture contains compressed RGB data; dwFourCC contains valid data.
+#define DDPF_RGB                    uint32_t(0x00000040) // Texture contains uncompressed RGB data; dwRGBBitCount and the RGB masks (dwRBitMask, dwGBitMask, dwBBitMask) contain valid data.
+#define DDPF_YUV                    uint32_t(0x00000200) // Used in some older DDS files for YUV uncompressed data (dwRGBBitCount contains the YUV bit count; dwRBitMask contains the Y mask, dwGBitMask contains the U mask, dwBBitMask contains the V mask)
+#define DDPF_LUMINANCE              uint32_t(0x00020000) // Used in some older DDS files for single channel color uncompressed data (dwRGBBitCount contains the luminance channel bit count; dwRBitMask contains the channel mask). Can be combined with DDPF_ALPHAPIXELS for a two channel DDS file.
+
+#define DDS_FOURCC                  uint32_t(DDPF_FOURCC)
+#define DDS_RGB                     uint32_t(DDPF_RGB)
+#define DDS_RGBA                    uint32_t(DDPF_RGB | DDPF_ALPHAPIXELS)
+#define DDS_LUMINANCE               uint32_t(DDPF_LUMINANCE)
+#define DDS_LUMINANCEA              uint32_t(DDPF_LUMINANCE | DDPF_ALPHAPIXELS)
+#define DDS_ALPHA                   uint32_t(DDPF_ALPHA)
+
+#define DDPF_FOURCC_DXT1            FOURCC('D', 'X', 'T', '1')
+#define DDPF_FOURCC_DXT2            FOURCC('D', 'X', 'T', '2')
+#define DDPF_FOURCC_DXT3            FOURCC('D', 'X', 'T', '3')
+#define DDPF_FOURCC_DXT4            FOURCC('D', 'X', 'T', '4')
+#define DDPF_FOURCC_DXT5            FOURCC('D', 'X', 'T', '5')
+#define DDPF_FOURCC_DX10            FOURCC('D', 'X', '1', '0')
+
+#define DDS_HEADER_OFFSET           uint32_t(sizeof(TextureHeader))
+#define DDS_DATA_OFFSET             uint32_t(DDS_HEADER_OFFSET + DDSD_HEADERSIZE)
 
 struct DdsPixelFormat
 {
@@ -89,21 +89,21 @@ struct DdsPixelFormat
 
 struct DdsHeader
 {
-	uint32_t		magic;
-	uint32_t        size;
-	uint32_t        flags;
-	uint32_t        height;
-	uint32_t        width;
-	uint32_t        pitch_or_linear_size;
-	uint32_t        depth;
-	uint32_t        num_mips;
-	uint32_t        reserved[11];
-	DdsPixelFormat  ddspf;
-	uint32_t        caps;
-	uint32_t        caps2;
-	uint32_t        caps3;
-	uint32_t        caps4;
-	uint32_t        reserved2;
+	uint32_t       magic;
+	uint32_t       size;
+	uint32_t       flags;
+	uint32_t       height;
+	uint32_t       width;
+	uint32_t       pitch_or_linear_size;
+	uint32_t       depth;
+	uint32_t       num_mips;
+	uint32_t       reserved[11];
+	DdsPixelFormat ddspf;
+	uint32_t       caps;
+	uint32_t       caps2;
+	uint32_t       caps3;
+	uint32_t       caps4;
+	uint32_t       reserved2;
 };
 
 struct PixelFormat