From 0e5b5bbf8e34148c86d82100c4d58e89c40c4c08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= <branimirkaradzic@gmail.com>
Date: Mon, 2 Jul 2018 16:31:16 -0700
Subject: [PATCH] [texturec] Added support for converting strip to cubemap.

---
 include/bimg/encode.h        |  8 ++++++
 src/image_cubemap_filter.cpp | 48 +++++++++++++++++++++++++++++++++++-
 tools/texturec/texturec.cpp  | 30 +++++++++++++++++++---
 3 files changed, 82 insertions(+), 4 deletions(-)

diff --git a/include/bimg/encode.h b/include/bimg/encode.h
index 4165f5e..7e1de03 100644
--- a/include/bimg/encode.h
+++ b/include/bimg/encode.h
@@ -135,6 +135,13 @@ namespace bimg
 		, bx::Error* _err
 		);
 
+	///
+	ImageContainer* imageCubemapFromStripRgba32F(
+		  bx::AllocatorI* _allocator
+		, const ImageContainer& _input
+		, bx::Error* _err
+		);
+
 	///
 	ImageContainer* imageGenerateMips(
 		  bx::AllocatorI* _allocator
@@ -160,6 +167,7 @@ namespace bimg
 		  bx::AllocatorI* _allocator
 		, const ImageContainer& _image
 		, LightingModel::Enum _lightingModel
+		, bx::Error* _err
 		);
 
 } // namespace bimg
diff --git a/src/image_cubemap_filter.cpp b/src/image_cubemap_filter.cpp
index 6793e86..021fcf7 100644
--- a/src/image_cubemap_filter.cpp
+++ b/src/image_cubemap_filter.cpp
@@ -306,6 +306,46 @@ namespace bimg
 		return output;
 	}
 
+	ImageContainer* imageCubemapFromStripRgba32F(bx::AllocatorI* _allocator, const ImageContainer& _input, bx::Error* _err)
+	{
+		BX_ERROR_SCOPE(_err);
+
+		if (_input.m_depth     != 1
+		&&  _input.m_numLayers != 1
+		&&  _input.m_format    != TextureFormat::RGBA32F
+		&&  _input.m_width/6   != _input.m_height)
+		{
+			BX_ERROR_SET(_err, BIMG_ERROR, "Input image format is not strip projection.");
+			return NULL;
+		}
+
+		const uint32_t srcPitch = _input.m_width*16;
+		const uint32_t dstWidth = _input.m_height;
+		const uint32_t dstPitch = dstWidth*16;
+
+		ImageContainer* output = imageAlloc(_allocator
+			, _input.m_format
+			, uint16_t(dstWidth)
+			, uint16_t(dstWidth)
+			, uint16_t(1)
+			, 1
+			, true
+			, false
+			);
+
+		const uint8_t* srcData = (const uint8_t*)_input.m_data;
+
+		for (uint8_t side = 0; side < 6 && _err->isOk(); ++side, srcData += dstPitch)
+		{
+			ImageMip dstMip;
+			imageGetRawData(*output, side, 0, output->m_data, output->m_size, dstMip);
+
+			bx::memCopy(const_cast<uint8_t*>(dstMip.m_data), srcData, dstPitch, dstWidth, srcPitch, dstPitch);
+		}
+
+		return output;
+	}
+
 	inline float areaElement(float _x, float _y)
 	{
 		return bx::atan2(_x*_y, bx::sqrt(_x*_x + _y*_y + 1.0f));
@@ -984,8 +1024,14 @@ namespace bimg
 		return _specularPower;
 	}
 
-	ImageContainer* imageCubemapRadianceFilter(bx::AllocatorI* _allocator, const ImageContainer& _image, LightingModel::Enum _lightingModel)
+	ImageContainer* imageCubemapRadianceFilter(bx::AllocatorI* _allocator, const ImageContainer& _image, LightingModel::Enum _lightingModel, bx::Error* _err)
 	{
+		if (!_image.m_cubeMap)
+		{
+			BX_ERROR_SET(_err, BIMG_ERROR, "Input image is not cubemap.");
+			return NULL;
+		}
+
 		ImageContainer* input = imageConvert(_allocator, TextureFormat::RGBA32F, _image, true);
 
 		if (1 >= input->m_numMips)
diff --git a/tools/texturec/texturec.cpp b/tools/texturec/texturec.cpp
index eeb4a2b..9780381 100644
--- a/tools/texturec/texturec.cpp
+++ b/tools/texturec/texturec.cpp
@@ -169,6 +169,15 @@ bimg::ImageContainer* convert(bx::AllocatorI* _allocator, const void* _inputData
 					outputHeight = _options.maxSize*2;
 				}
 			}
+			else if (outputDepth   == 1
+				 &&  outputWidth/6 == outputHeight)
+			{
+				if (outputWidth/6 > _options.maxSize)
+				{
+					outputWidth  = _options.maxSize*6;
+					outputHeight = _options.maxSize;
+				}
+			}
 			else
 			{
 				bimg::imageFree(input);
@@ -276,8 +285,18 @@ bimg::ImageContainer* convert(bx::AllocatorI* _allocator, const void* _inputData
 			bimg::ImageContainer* src = bimg::imageConvert(_allocator, bimg::TextureFormat::RGBA32F, *input);
 			bimg::imageFree(input);
 
-			bimg::ImageContainer* dst = bimg::imageCubemapFromLatLongRgba32F(_allocator, *src, true, _err);
-			bimg::imageFree(src);
+			bimg::ImageContainer* dst;
+
+			if (outputWidth/2 == outputHeight)
+			{
+				dst = bimg::imageCubemapFromLatLongRgba32F(_allocator, *src, true, _err);
+				bimg::imageFree(src);
+			}
+			else
+			{
+				dst = bimg::imageCubemapFromStripRgba32F(_allocator, *src, _err);
+				bimg::imageFree(src);
+			}
 
 			if (!_err->isOk() )
 			{
@@ -290,7 +309,12 @@ bimg::ImageContainer* convert(bx::AllocatorI* _allocator, const void* _inputData
 
 		if (bimg::LightingModel::Count != _options.radiance)
 		{
-			output = bimg::imageCubemapRadianceFilter(_allocator, *input, _options.radiance);
+			output = bimg::imageCubemapRadianceFilter(_allocator, *input, _options.radiance, _err);
+
+			if (!_err->isOk() )
+			{
+				return NULL;
+			}
 
 			if (bimg::TextureFormat::RGBA32F != outputFormat)
 			{