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

used newly GetColor3f/4f

Browse Source
This commit is contained in:
hyzboy 2022-03-11 17:38:21 +08:00
parent 59858360da
commit 07092da047
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMCore

@ -1 +1 @@
Subproject commit 716407fa2d16b17efa51c70396e6518fc7275676 Subproject commit 1aa976a30aaf9108a8e9ecb1ea1e68da24cac4d4

2
CMPlatform

@ -1 +1 @@
Subproject commit 4f63548fc234d2dd4b2d9bdd2a70cd42cb66fa63 Subproject commit afd66d8f400eab3858efea22b5862194995ef642

2
CMSceneGraph

@ -1 +1 @@
Subproject commit 4eaa9c9f5b9ae1aa3dcae63b239000113c84d1c8 Subproject commit 846113e0fbb9f354300c21052c2c4ff0440c6dc6

5
example/common/VulkanAppFramework.h
View File

@ -20,6 +20,7 @@
#include<hgl/graph/VKRenderTarget.h> #include<hgl/graph/VKRenderTarget.h>
#include<hgl/graph/VKRenderResource.h> #include<hgl/graph/VKRenderResource.h>
#include<hgl/graph/RenderList.h> #include<hgl/graph/RenderList.h>
#include<hgl/type/Color.h>
#include<hgl/Time.h> #include<hgl/Time.h>
//#include<hgl/graph/LookAtCameraControl.h> //#include<hgl/graph/LookAtCameraControl.h>
@ -170,9 +171,9 @@ public:
ubo_camera_info->Write(&camera->info); ubo_camera_info->Write(&camera->info);
} }
void SetClearColor(COLOR cc) void SetClearColor(const Color4f &cc)
{ {
clear_color.Use(cc,1.0); clear_color=cc;
} }
void OnResize(uint w,uint h) override void OnResize(uint w,uint h) override

5
src/SceneGraph/font/TextRender.cpp
View File

@ -4,6 +4,7 @@
#include<hgl/graph/font/TextLayout.h> #include<hgl/graph/font/TextLayout.h>
#include<hgl/graph/font/TextRenderable.h> #include<hgl/graph/font/TextRenderable.h>
#include<hgl/graph/VKDevice.h> #include<hgl/graph/VKDevice.h>
#include<hgl/type/Color.h>
namespace hgl namespace hgl
{ {
@ -50,8 +51,8 @@ namespace hgl
CharLayoutAttr cla; CharLayoutAttr cla;
TextLayoutAttribute tla; TextLayoutAttribute tla;
cla.CharColor=Color4f(COLOR::White); cla.CharColor=GetColor4f(COLOR::White,1.0);
cla.BackgroundColor=Color4f(COLOR::Black); cla.BackgroundColor.Zero();
tla.char_layout_attr=&cla; tla.char_layout_attr=&cla;
tla.line_gap=0.1f; tla.line_gap=0.1f;