From f2e065dee10fb110e9d51175ee6381333319ef56 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Tue, 20 Oct 2015 21:05:29 -0700 Subject: Release v1.0.0 --- TextureLoader/interface/Image.h | 82 ++++++++++++++++++++++++++++++ TextureLoader/interface/TextureLoader.h | 61 ++++++++++++++++++++++ TextureLoader/interface/TextureUtilities.h | 46 +++++++++++++++++ 3 files changed, 189 insertions(+) create mode 100644 TextureLoader/interface/Image.h create mode 100644 TextureLoader/interface/TextureLoader.h create mode 100644 TextureLoader/interface/TextureUtilities.h (limited to 'TextureLoader/interface') diff --git a/TextureLoader/interface/Image.h b/TextureLoader/interface/Image.h new file mode 100644 index 0000000..74917e6 --- /dev/null +++ b/TextureLoader/interface/Image.h @@ -0,0 +1,82 @@ +/* Copyright 2015 Egor Yusov + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. + * + * In no event and under no legal theory, whether in tort (including negligence), + * contract, or otherwise, unless required by applicable law (such as deliberate + * and grossly negligent acts) or agreed to in writing, shall any Contributor be + * liable for any damages, including any direct, indirect, special, incidental, + * or consequential damages of any character arising as a result of this License or + * out of the use or inability to use the software (including but not limited to damages + * for loss of goodwill, work stoppage, computer failure or malfunction, or any and + * all other commercial damages or losses), even if such Contributor has been advised + * of the possibility of such damages. + */ + +#pragma once + +#include "FileStream.h" +#include "DataBlob.h" +#include "RefCntAutoPtr.h" +#include "ObjectBase.h" + +namespace Diligent +{ + enum class EImageFileFormat + { + unknown = 0, + jpeg, + png, + tiff + }; + + struct ImageLoadInfo + { + EImageFileFormat Format; + ImageLoadInfo() : + Format(EImageFileFormat::unknown) + {} + }; + + struct ImageDesc + { + Diligent::Uint32 Width; + Diligent::Uint32 Height; + Diligent::Uint32 BitsPerPixel; + Diligent::Uint32 NumComponents; + Diligent::Uint32 RowStride; // In bytes + ImageDesc() : + Width(0), + Height(0), + BitsPerPixel(0), + NumComponents(0), + RowStride(0) + {} + }; + + class Image : public Diligent::ObjectBase + { + public: + Image( Diligent::IFileStream *pSrcFile, + const ImageLoadInfo& LoadInfo ); + + const ImageDesc &GetDesc(){ return m_Desc; } + IDataBlob *GetData(){ return m_pData; } + + private: + void LoadPngFile( IDataBlob *pFileData, const ImageLoadInfo& LoadInfo ); + void LoadTiffFile( IDataBlob *pFileData,const ImageLoadInfo& LoadInfo ); + void LoadJpegFile( IDataBlob *pFileData,const ImageLoadInfo& LoadInfo ); + + ImageDesc m_Desc; + RefCntAutoPtr m_pData; + }; +} diff --git a/TextureLoader/interface/TextureLoader.h b/TextureLoader/interface/TextureLoader.h new file mode 100644 index 0000000..d46582e --- /dev/null +++ b/TextureLoader/interface/TextureLoader.h @@ -0,0 +1,61 @@ +/* Copyright 2015 Egor Yusov + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. + * + * In no event and under no legal theory, whether in tort (including negligence), + * contract, or otherwise, unless required by applicable law (such as deliberate + * and grossly negligent acts) or agreed to in writing, shall any Contributor be + * liable for any damages, including any direct, indirect, special, incidental, + * or consequential damages of any character arising as a result of this License or + * out of the use or inability to use the software (including but not limited to damages + * for loss of goodwill, work stoppage, computer failure or malfunction, or any and + * all other commercial damages or losses), even if such Contributor has been advised + * of the possibility of such damages. + */ + +#pragma once + +#include "FileStream.h" +#include "RenderDevice.h" +#include "Texture.h" +#include "Image.h" + +namespace Diligent +{ + struct TextureLoadInfo + { + Diligent::USAGE Usage; + Diligent::Uint32 BindFlags; + Diligent::Uint32 MipLevels; + Diligent::Uint32 CPUAccessFlags; + Diligent::Bool IsSRGB; + Diligent::TEXTURE_FORMAT Format; + + TextureLoadInfo() : + Usage( Diligent::USAGE_STATIC ), + BindFlags( Diligent::BIND_SHADER_RESOURCE ), + MipLevels(0), + CPUAccessFlags(0), + IsSRGB(true), + Format(Diligent::TEX_FORMAT_UNKNOWN) + {} + }; + + void CreateTextureFromImage( Image *pSrcImage, + const TextureLoadInfo& TexLoadInfo, + Diligent::IRenderDevice *pDevice, + Diligent::ITexture **ppTexture ); + + void CreateTextureFromDDS( IDataBlob *pDDSData, + const TextureLoadInfo& TexLoadInfo, + Diligent::IRenderDevice *pDevice, + Diligent::ITexture **ppTexture ); +}; diff --git a/TextureLoader/interface/TextureUtilities.h b/TextureLoader/interface/TextureUtilities.h new file mode 100644 index 0000000..e68ac40 --- /dev/null +++ b/TextureLoader/interface/TextureUtilities.h @@ -0,0 +1,46 @@ +/* Copyright 2015 Egor Yusov + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. + * + * In no event and under no legal theory, whether in tort (including negligence), + * contract, or otherwise, unless required by applicable law (such as deliberate + * and grossly negligent acts) or agreed to in writing, shall any Contributor be + * liable for any damages, including any direct, indirect, special, incidental, + * or consequential damages of any character arising as a result of this License or + * out of the use or inability to use the software (including but not limited to damages + * for loss of goodwill, work stoppage, computer failure or malfunction, or any and + * all other commercial damages or losses), even if such Contributor has been advised + * of the possibility of such damages. + */ + +#pragma once + +/// \file +/// Defines texture utilities + +#include "GraphicsTypes.h" +#include "Texture.h" +#include "RenderDevice.h" +#include "TextureLoader.h" + +namespace Diligent +{ + +void CreateImageFromFile( const Diligent::Char *FilePath, + Image **ppImage, + IDataBlob **ppDDSData = nullptr); + +void CreateTextureFromFile( const Diligent::Char *FilePath, + const TextureLoadInfo& TexLoadInfo, + Diligent::IRenderDevice *pDevice, + Diligent::ITexture **ppTexture ); + +} -- cgit v1.2.3