diff --git a/CMCore b/CMCore index afec00dc..f305b89c 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit afec00dc90aecfacd84450d65b09dacbe3828e5e +Subproject commit f305b89cd3e3fe281635a67fba24c77e85242975 diff --git a/example/Vulkan/SkyColor.cpp b/example/Vulkan/SkyColor.cpp index 4b8fdbd8..379cfc68 100644 --- a/example/Vulkan/SkyColor.cpp +++ b/example/Vulkan/SkyColor.cpp @@ -64,7 +64,7 @@ private: //.1, .2, .01 //green ); - scc.LowColor.Use(COLOR::DarkMidnightBlue,1.0f); + scc.LowColor=GetColor4f(COLOR::DarkMidnightBlue,1.0f); ubo_sky_color=db->CreateUBO(sizeof(SkyColorConfig),&scc); diff --git a/example/common/VulkanAppFramework.h b/example/common/VulkanAppFramework.h index a9136498..bc8e6d65 100644 --- a/example/common/VulkanAppFramework.h +++ b/example/common/VulkanAppFramework.h @@ -176,6 +176,11 @@ public: clear_color=cc; } + void SetClearColor(const enum class COLOR &ce) + { + clear_color=GetColor4f(ce,1.0f); + } + void OnResize(uint w,uint h) override { if(w>0&&h>0) diff --git a/inc/hgl/graph/font/TextLayout.h b/inc/hgl/graph/font/TextLayout.h index 7cf342c8..28a05ccc 100644 --- a/inc/hgl/graph/font/TextLayout.h +++ b/inc/hgl/graph/font/TextLayout.h @@ -158,7 +158,7 @@ namespace hgl virtual ~TextLayout()=default; - void Set (const TLA * _tla) {if(_tla)hgl_cpy(&tla,_tla);} + void Set (const TLA * _tla) {if(_tla)hgl_cpy(&tla,_tla,1);} void SetFont ( FontSource * fs) {if(fs)font_source=fs;} void SetTextDirection (const uint8 & td) {tla.text_direction=td;} void SetAlign (const TextAlign & ta) {tla.align=ta;} diff --git a/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp b/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp index 2ac6c18e..8c07833f 100644 --- a/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp +++ b/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp @@ -70,7 +70,7 @@ void CreateShaderStageList(List &shader_stage_l for(int i=0;iright; - hgl_cpy(p,sm->GetCreateInfo()); + hgl_cpy(p,sm->GetCreateInfo(),1); ++p; ++itp; diff --git a/src/SceneGraph/Vulkan/VKPhysicalDevice.cpp b/src/SceneGraph/Vulkan/VKPhysicalDevice.cpp index 157b0a60..818958bd 100644 --- a/src/SceneGraph/Vulkan/VKPhysicalDevice.cpp +++ b/src/SceneGraph/Vulkan/VKPhysicalDevice.cpp @@ -80,7 +80,7 @@ GPUPhysicalDevice::GPUPhysicalDevice(VkInstance inst,VkPhysicalDevice pd) func(physical_device,&features2); - hgl_cpy(&features,&features2.features); + hgl_cpy(features,features2.features); } else { @@ -113,7 +113,7 @@ GPUPhysicalDevice::GPUPhysicalDevice(VkInstance inst,VkPhysicalDevice pd) func(physical_device,&properties2); - hgl_cpy(&properties,&properties2.properties); + hgl_cpy(properties,properties2.properties); } else {