From 1a9631dae9b94a51516cfb669cb10dd44a114989 Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Thu, 2 Dec 2021 11:27:47 +0800
Subject: [PATCH] added project folder attribute.

---
 CMakeLists.txt     | 22 +++++++++++++++++-----
 CubemapConvert.cpp |  0
 ILImageSupport.cpp |  2 ++
 3 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 CubemapConvert.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8560ee0..ba707cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,16 +46,18 @@ SET(TEXTURE_FILE_CREATER_SOURCE TextureFileCreater.h
                                 TextureFileCreaterRGBA.cpp
                                 TextureFileCreaterCompress.cpp)
 
-set(SOURCE_FILE main.cpp
-                ConvertImage.cpp)
-
 SOURCE_GROUP("Image File" FILES ${ILIMAGE_SOURCE})
 SOURCE_GROUP("Pixel Format" FILES ${PIXEL_FORMAT_SOURCE})
 SOURCE_GROUP("Texture File Creater" FILES ${TEXTURE_FILE_CREATER_SOURCE})
 
-add_executable(TexConv ${SOURCE_FILE} ${ILIMAGE_SOURCE} ${PIXEL_FORMAT_SOURCE} ${TEXTURE_FILE_CREATER_SOURCE})
+SET(TEX_CONV_SOURCE ${ILIMAGE_SOURCE} ${PIXEL_FORMAT_SOURCE} ${TEXTURE_FILE_CREATER_SOURCE})
+SET(TEX_CONV_LIBRARY CMCore CMPlatform CMUtil DevIL ILU CMP_Compressonator CMP_Framework CMP_Core)
 
-target_link_libraries(TexConv PRIVATE CMCore CMPlatform CMUtil DevIL ILU CMP_Compressonator CMP_Framework CMP_Core)
+add_executable(TexConv ${TEX_CONV_SOURCE} main.cpp ConvertImage.cpp)
+target_link_libraries(TexConv PRIVATE ${TEX_CONV_LIBRARY})
+
+add_executable(CubeMapConv ${TEX_CONV_SOURCE} CubeMapConvert.cpp)
+target_link_libraries(CubeMapConv PRIVATE ${TEX_CONV_LIBRARY})
 
 IF(CM_BUILD_GUI_TOOLS)
     set(IDENTIFIER "com.hyzgame.texconv")
@@ -74,3 +76,13 @@ target_link_libraries(ComboTexture PRIVATE CMCore CMPlatform CMUtil DevIL ILU Ma
 
 add_executable(DFGen DistanceFieldGenerater.cpp ILImage.h ILImageSupport.cpp)
 target_link_libraries(DFGen PRIVATE CMCore CMPlatform CMUtil DevIL ILU MathGeoLib)
+
+
+macro(texture_tool_project project_name)
+    set_property(TARGET ${project_name} PROPERTY FOLDER "CM/Tools/Texture")
+endmacro()
+
+texture_tool_project(TexConv)
+texture_tool_project(CubeMapConv)
+texture_tool_project(ComboTexture)
+texture_tool_project(DFGen)
diff --git a/CubemapConvert.cpp b/CubemapConvert.cpp
new file mode 100644
index 0000000..e69de29
diff --git a/ILImageSupport.cpp b/ILImageSupport.cpp
index f7cf9b5..94e8d2a 100644
--- a/ILImageSupport.cpp
+++ b/ILImageSupport.cpp
@@ -163,6 +163,8 @@ bool ILImage::Resize(uint nw,uint nh)
     if(nw==il_width&&nh==il_height)return(true);
     if(nw==0||nh==0)return(false);
 
+    iluImageParameter(ILU_FILTER,ILU_SCALE_LANCZOS3);
+
     if(!iluScale(nw,nh,il_depth))
         return(false);