From 2fb443bcb4bd6eaa7e980baef775c660f8f88327 Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Sun, 19 Feb 2023 19:28:47 +0800 Subject: [PATCH] updated codes to support newly CM??? modules. --- CMCMakeModule | 2 +- CMCore | 2 +- CMPlatform | 2 +- CMSceneGraph | 2 +- CMUtil | 2 +- example/Vulkan/first_triangle.cpp | 4 ++-- example/common/VulkanAppFramework.h | 2 +- inc/hgl/graph/InlineGeometry.h | 2 +- inc/hgl/graph/RenderList.h | 2 +- inc/hgl/graph/VKCommandBuffer.h | 2 +- inc/hgl/graph/VKDebugMaker.h | 2 +- inc/hgl/graph/VKDebugUtils.h | 2 +- inc/hgl/graph/VertexAttribDataAccess.h | 22 +++++++++++----------- inc/hgl/graph/font/TextRender.h | 2 +- src/SceneGraph/Vulkan/VKDevice.cpp | 4 ++-- src/SceneGraph/Vulkan/VKPipelineCache.cpp | 6 +++--- src/SceneGraph/Vulkan/VKRenderable.cpp | 4 ++-- src/SceneGraph/font/FontSourceWin.cpp | 2 +- src/SceneGraph/font/TextRender.cpp | 2 +- 19 files changed, 34 insertions(+), 34 deletions(-) diff --git a/CMCMakeModule b/CMCMakeModule index 9899bc1c..ca9aece2 160000 --- a/CMCMakeModule +++ b/CMCMakeModule @@ -1 +1 @@ -Subproject commit 9899bc1c07122a77b754345e8ce31fbcd8624772 +Subproject commit ca9aece201dd581c0576fe5448162686081261ff diff --git a/CMCore b/CMCore index 68d0082e..47f40baa 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 68d0082e0e2dd2ec2d55fe0756aeb0bfb3c2be69 +Subproject commit 47f40baaab2278752e86762d92c4738e1317a22c diff --git a/CMPlatform b/CMPlatform index c91c3780..ef90beb4 160000 --- a/CMPlatform +++ b/CMPlatform @@ -1 +1 @@ -Subproject commit c91c3780f42df182fdb752b8165ed41a03358949 +Subproject commit ef90beb4501fe8712ab93e4c775612e172598fa3 diff --git a/CMSceneGraph b/CMSceneGraph index c539ce80..441c61c5 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit c539ce808b9a8a3acf451c3e26d47881631be954 +Subproject commit 441c61c5fdb0d625d84e664385a1226c28b48b36 diff --git a/CMUtil b/CMUtil index b0ca13cf..9f94d508 160000 --- a/CMUtil +++ b/CMUtil @@ -1 +1 @@ -Subproject commit b0ca13cfb34175fd90c370ded64e8c0f3586b8ec +Subproject commit 9f94d5082bbbba65d55ae259deebbfc72b4a672a diff --git a/example/Vulkan/first_triangle.cpp b/example/Vulkan/first_triangle.cpp index 68a050bc..6d1e17dc 100644 --- a/example/Vulkan/first_triangle.cpp +++ b/example/Vulkan/first_triangle.cpp @@ -56,8 +56,8 @@ private: Primitive *primitive=db->CreatePrimitive(VERTEX_COUNT); if(!primitive)return(false); - if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data )))return(false); - if(!primitive->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data )))return(false); + if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data )))return(false); + if(!primitive->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data )))return(false); render_obj=db->CreateRenderable(primitive,material_instance,pipeline); return(render_obj); diff --git a/example/common/VulkanAppFramework.h b/example/common/VulkanAppFramework.h index 5200d104..2fb2942d 100644 --- a/example/common/VulkanAppFramework.h +++ b/example/common/VulkanAppFramework.h @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include //#include diff --git a/inc/hgl/graph/InlineGeometry.h b/inc/hgl/graph/InlineGeometry.h index 608c34f2..1e95d9c4 100644 --- a/inc/hgl/graph/InlineGeometry.h +++ b/inc/hgl/graph/InlineGeometry.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include namespace hgl { diff --git a/inc/hgl/graph/RenderList.h b/inc/hgl/graph/RenderList.h index 5db82929..6fd3c4b5 100644 --- a/inc/hgl/graph/RenderList.h +++ b/inc/hgl/graph/RenderList.h @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include namespace hgl { diff --git a/inc/hgl/graph/VKCommandBuffer.h b/inc/hgl/graph/VKCommandBuffer.h index 23a8bfdb..2ba6c8b6 100644 --- a/inc/hgl/graph/VKCommandBuffer.h +++ b/inc/hgl/graph/VKCommandBuffer.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include VK_NAMESPACE_BEGIN class GPUCmdBuffer { diff --git a/inc/hgl/graph/VKDebugMaker.h b/inc/hgl/graph/VKDebugMaker.h index ee56e0d7..19b59eb4 100644 --- a/inc/hgl/graph/VKDebugMaker.h +++ b/inc/hgl/graph/VKDebugMaker.h @@ -2,7 +2,7 @@ #define HGL_GRAPH_VULKAN_DEBUG_MAKER_INCLUDE #include -#include +#include VK_NAMESPACE_BEGIN struct DebugMakerFunction diff --git a/inc/hgl/graph/VKDebugUtils.h b/inc/hgl/graph/VKDebugUtils.h index bea06f25..a3e73a55 100644 --- a/inc/hgl/graph/VKDebugUtils.h +++ b/inc/hgl/graph/VKDebugUtils.h @@ -2,7 +2,7 @@ #define HGL_GRAPH_VULKAN_DEBUG_UTILS_INCLUDE #include -#include +#include VK_NAMESPACE_BEGIN struct DebugUtilsFunction diff --git a/inc/hgl/graph/VertexAttribDataAccess.h b/inc/hgl/graph/VertexAttribDataAccess.h index c011f3cd..3fd5e389 100644 --- a/inc/hgl/graph/VertexAttribDataAccess.h +++ b/inc/hgl/graph/VertexAttribDataAccess.h @@ -1,8 +1,8 @@ #ifndef HGL_GRAPH_VERTEX_ATTRIB_DATA_ACCESS_INCLUDE #define HGL_GRAPH_VERTEX_ATTRIB_DATA_ACCESS_INCLUDE -#include -#include +#include +#include #include #include #include @@ -60,7 +60,7 @@ namespace hgl { if(!data||offset>=count) { - LOG_HINT(OS_TEXT("VertexAttribDataAccess::Get() out,offset:")+OSString::valueOf(offset)); + LOG_HINT(OS_TEXT("VertexAttribDataAccess::Get() out,offset:")+OSString::numberOf(offset)); return(nullptr); } @@ -76,7 +76,7 @@ namespace hgl { if(access) { - LOG_HINT(OS_TEXT("VertexAttribDataAccess::Begin() access!=0,offset:")+OSString::valueOf(offset)); + LOG_HINT(OS_TEXT("VertexAttribDataAccess::Begin() access!=0,offset:")+OSString::numberOf(offset)); return(nullptr); } @@ -106,7 +106,7 @@ namespace hgl { if(!this->access||this->access+C*number>this->data_end) { - LOG_HINT(OS_TEXT("VertexAttribDataAccess::Write(const T *,number) out,number:")+OSString::valueOf(number)); + LOG_HINT(OS_TEXT("VertexAttribDataAccess::Write(const T *,number) out,number:")+OSString::numberOf(number)); return(false); } @@ -201,7 +201,7 @@ namespace hgl { if(!this->access||this->access+count>this->data_end) { - LOG_HINT(OS_TEXT("VertexAttribDataAccess1::Write(const T,")+OSString::valueOf(count)+OS_TEXT(") out")); + LOG_HINT(OS_TEXT("VertexAttribDataAccess1::Write(const T,")+OSString::numberOf(count)+OS_TEXT(") out")); return(false); } @@ -328,7 +328,7 @@ namespace hgl { if(!this->access||this->access+(count<<1)>this->data_end) { - LOG_HINT(OS_TEXT("VertexAttribDataAccess1::Write(const Vector2f &,")+OSString::valueOf(count)+OS_TEXT(") out")); + LOG_HINT(OS_TEXT("VertexAttribDataAccess1::Write(const Vector2f &,")+OSString::numberOf(count)+OS_TEXT(") out")); return(false); } @@ -633,7 +633,7 @@ namespace hgl { if(!this->access||this->access+(count*3)>this->data_end) { - LOG_HINT(OS_TEXT("VertexAttribDataAccess3::Write(const Vector3f,")+OSString::valueOf(count)+OS_TEXT(") out")); + LOG_HINT(OS_TEXT("VertexAttribDataAccess3::Write(const Vector3f,")+OSString::numberOf(count)+OS_TEXT(") out")); return(false); } @@ -657,7 +657,7 @@ namespace hgl { if(!this->access||this->access+(count*3)>this->data_end) { - LOG_HINT(OS_TEXT("VertexAttribDataAccess3::Write(const Vector3f,")+OSString::valueOf(count)+OS_TEXT(") out")); + LOG_HINT(OS_TEXT("VertexAttribDataAccess3::Write(const Vector3f,")+OSString::numberOf(count)+OS_TEXT(") out")); return(false); } @@ -948,7 +948,7 @@ namespace hgl { if(!this->access||this->access+(count<<2)>this->data_end) { - LOG_HINT(OS_TEXT("VertexAttribDataAccess4::Write(const Vector4f,")+OSString::valueOf(count)+OS_TEXT(") out")); + LOG_HINT(OS_TEXT("VertexAttribDataAccess4::Write(const Vector4f,")+OSString::numberOf(count)+OS_TEXT(") out")); return(false); } @@ -973,7 +973,7 @@ namespace hgl { if(!this->access||this->access+(count<<2)>this->data_end) { - LOG_HINT(OS_TEXT("VertexAttribDataAccess4::Write(const Vector4f,")+OSString::valueOf(count)+OS_TEXT(") out")); + LOG_HINT(OS_TEXT("VertexAttribDataAccess4::Write(const Vector4f,")+OSString::numberOf(count)+OS_TEXT(") out")); return(false); } diff --git a/inc/hgl/graph/font/TextRender.h b/inc/hgl/graph/font/TextRender.h index f907a58b..932bd522 100644 --- a/inc/hgl/graph/font/TextRender.h +++ b/inc/hgl/graph/font/TextRender.h @@ -2,7 +2,7 @@ #define HGL_GRAPH_TEXT_RENDER_INCLUDE #include -#include +#include namespace hgl { diff --git a/src/SceneGraph/Vulkan/VKDevice.cpp b/src/SceneGraph/Vulkan/VKDevice.cpp index 22043ad1..a06904af 100644 --- a/src/SceneGraph/Vulkan/VKDevice.cpp +++ b/src/SceneGraph/Vulkan/VKDevice.cpp @@ -16,7 +16,7 @@ void LogSurfaceFormat(const List &surface_format_list) const uint32_t format_count=surface_format_list.GetCount(); const VkSurfaceFormatKHR *sf=surface_format_list.GetData(); - LOG_INFO(OS_TEXT("Current physics device support ")+OSString::valueOf(format_count)+OS_TEXT(" surface format")); + LOG_INFO(OS_TEXT("Current physics device support ")+OSString::numberOf(format_count)+OS_TEXT(" surface format")); const VulkanFormat *vf; const VulkanColorSpace *cs; @@ -26,7 +26,7 @@ void LogSurfaceFormat(const List &surface_format_list) vf=GetVulkanFormat(sf->format); cs=GetVulkanColorSpace(sf->colorSpace); - LOG_INFO(" "+AnsiString::valueOf(i)+": "+AnsiString(vf->name)+", "+AnsiString(cs->name)); + LOG_INFO(" "+AnsiString::numberOf(i)+": "+AnsiString(vf->name)+", "+AnsiString(cs->name)); ++sf; } diff --git a/src/SceneGraph/Vulkan/VKPipelineCache.cpp b/src/SceneGraph/Vulkan/VKPipelineCache.cpp index ed589790..b023796e 100644 --- a/src/SceneGraph/Vulkan/VKPipelineCache.cpp +++ b/src/SceneGraph/Vulkan/VKPipelineCache.cpp @@ -18,9 +18,9 @@ namespace sl.Add(app_data); sl.Add(OS_TEXT("VkPipelineCache.com")); - sl.Add(OSString::valueOf(VK_PIPELINE_CACHE_HEADER_VERSION_ONE)); - sl.Add(OSString::valueOf(pdp.vendorID)); - sl.Add(OSString::valueOf(pdp.deviceID)); + sl.Add(OSString::numberOf(VK_PIPELINE_CACHE_HEADER_VERSION_ONE)); + sl.Add(OSString::numberOf(pdp.vendorID)); + sl.Add(OSString::numberOf(pdp.deviceID)); return ComboFilename(sl); } diff --git a/src/SceneGraph/Vulkan/VKRenderable.cpp b/src/SceneGraph/Vulkan/VKRenderable.cpp index 673cda8d..b1ed17f8 100644 --- a/src/SceneGraph/Vulkan/VKRenderable.cpp +++ b/src/SceneGraph/Vulkan/VKRenderable.cpp @@ -79,8 +79,8 @@ Renderable *CreateRenderable(Primitive *r,MaterialInstance *mi,Pipeline *p) { LOG_ERROR( "[FATAL ERROR] VBO \""+**name_list+ UTF8String("\" stride can't match Renderable, Material(")+mtl_name+ - UTF8String(") stride(")+UTF8String::valueOf(bind_list->stride)+ - UTF8String("), VBO stride(")+UTF8String::valueOf(vbo->GetStride())+ + UTF8String(") stride(")+UTF8String::numberOf(bind_list->stride)+ + UTF8String("), VBO stride(")+UTF8String::numberOf(vbo->GetStride())+ ")"); return(nullptr); } diff --git a/src/SceneGraph/font/FontSourceWin.cpp b/src/SceneGraph/font/FontSourceWin.cpp index 3eb39936..fef23427 100644 --- a/src/SceneGraph/font/FontSourceWin.cpp +++ b/src/SceneGraph/font/FontSourceWin.cpp @@ -1,5 +1,5 @@ #include"FontSourceWin.h" -#include +#include namespace hgl { diff --git a/src/SceneGraph/font/TextRender.cpp b/src/SceneGraph/font/TextRender.cpp index 7f0dafa7..0215f91e 100644 --- a/src/SceneGraph/font/TextRender.cpp +++ b/src/SceneGraph/font/TextRender.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include namespace hgl {