hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

deleted hgl_cpy(T *,T *) function.

Browse Source
This commit is contained in:
hyzboy 2022-03-11 17:58:53 +08:00
parent 99fe88dff7
commit 3c449df4ca
6 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMCore

@ -1 +1 @@
Subproject commit afec00dc90aecfacd84450d65b09dacbe3828e5e Subproject commit f305b89cd3e3fe281635a67fba24c77e85242975

2
example/Vulkan/SkyColor.cpp
View File

@ -64,7 +64,7 @@ private:
//.1, .2, .01 //green //.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); ubo_sky_color=db->CreateUBO(sizeof(SkyColorConfig),&scc);

5
example/common/VulkanAppFramework.h
View File

@ -176,6 +176,11 @@ public:
clear_color=cc; clear_color=cc;
} }
void SetClearColor(const enum class COLOR &ce)
{
clear_color=GetColor4f(ce,1.0f);
}
void OnResize(uint w,uint h) override void OnResize(uint w,uint h) override
{ {
if(w>0&&h>0) if(w>0&&h>0)

2
inc/hgl/graph/font/TextLayout.h
View File

@ -158,7 +158,7 @@ namespace hgl
virtual ~TextLayout()=default; 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 SetFont ( FontSource * fs) {if(fs)font_source=fs;}
void SetTextDirection (const uint8 & td) {tla.text_direction=td;} void SetTextDirection (const uint8 & td) {tla.text_direction=td;}
void SetAlign (const TextAlign & ta) {tla.align=ta;} void SetAlign (const TextAlign & ta) {tla.align=ta;}

2
src/SceneGraph/Vulkan/VKDeviceMaterial.cpp
View File

@ -70,7 +70,7 @@ void CreateShaderStageList(List<VkPipelineShaderStageCreateInfo> &shader_stage_l
for(int i=0;i<shader_count;i++) for(int i=0;i<shader_count;i++)
{ {
sm=(*itp)->right; sm=(*itp)->right;
hgl_cpy(p,sm->GetCreateInfo()); hgl_cpy(p,sm->GetCreateInfo(),1);
++p; ++p;
++itp; ++itp;

4
src/SceneGraph/Vulkan/VKPhysicalDevice.cpp
View File

@ -80,7 +80,7 @@ GPUPhysicalDevice::GPUPhysicalDevice(VkInstance inst,VkPhysicalDevice pd)
func(physical_device,&features2); func(physical_device,&features2);
hgl_cpy(&features,&features2.features); hgl_cpy(features,features2.features);
} }
else else
{ {
@ -113,7 +113,7 @@ GPUPhysicalDevice::GPUPhysicalDevice(VkInstance inst,VkPhysicalDevice pd)
func(physical_device,&properties2); func(physical_device,&properties2);
hgl_cpy(&properties,&properties2.properties); hgl_cpy(properties,properties2.properties);
} }
else else
{ {