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

update String<> names

Browse Source
This commit is contained in:
hyzboy
2025-01-04 14:14:47 +08:00
parent 3337eb6652
commit 5738837008
13 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMAssetsManage

Submodule CMAssetsManage updated: cf6a54d484...878335ba9c

2
CMCore

Submodule CMCore updated: dbbd145f03...77a3a9d26e

2
CMPlatform

Submodule CMPlatform updated: 103b0d845d...aa7abe4763

2
CMSceneGraph

Submodule CMSceneGraph updated: b2f29ef0cf...4949c2e3e8

2
CMUtil

Submodule CMUtil updated: 5a05612f53...f330a6672e

2
example/GUI/DrawText.cpp
View File

@@ -28,7 +28,7 @@ private:
bool InitTextRenderable()
{
UTF16String str;
U16String str;
LoadStringFromTextFile(str,OS_TEXT("res/text/DaoDeBible.txt"));

4
inc/hgl/graph/font/TextRender.h
View File

@@ -54,9 +54,9 @@ namespace hgl
public:
TextPrimitive *CreatePrimitive();
TextPrimitive *CreatePrimitive(const UTF16String &str);
TextPrimitive *CreatePrimitive(const U16String &str);
bool Layout(TextPrimitive *tr,const UTF16String &str);
bool Layout(TextPrimitive *tr,const U16String &str);
Renderable *CreateRenderable(TextPrimitive *text_primitive);

2
inc/hgl/shadergen/ShaderCreateInfo.h
View File

@@ -96,7 +96,7 @@ public:
void SetMain(const AnsiString &str){main_function=str;}
void SetMain(const char *str,const int len)
{
main_function.SetString(str,len);
main_function.fromString(str,len);
}
const AnsiString &GetOutputStruct()const{return output_struct;}

2
res

Submodule res updated: 475d8ad43c...e1a36d78f0

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

@@ -48,9 +48,9 @@ MaterialParameters *GPUDevice::CreateMP(const MaterialDescriptorManager *desc_ma
if(!ds)return(nullptr);
#ifdef _DEBUG
const UTF8String addr_string=HexToString<u8char,uint64_t>((uint64_t)(ds->GetDescriptorSet()));
const U8String addr_string=HexToString<u8char,uint64_t>((uint64_t)(ds->GetDescriptorSet()));
LOG_INFO(U8_TEXT("Create [DescriptSets:")+addr_string+U8_TEXT("] OK! Material Name: \"")+(const UTF8String &)(desc_manager->GetMaterialName())+U8_TEXT("\" Type: ")+(u8char *)(GetDescriptorSetTypeName(desc_set_type)));
LOG_INFO(U8_TEXT("Create [DescriptSets:")+addr_string+U8_TEXT("] OK! Material Name: \"")+(const U8String &)(desc_manager->GetMaterialName())+U8_TEXT("\" Type: ")+(u8char *)(GetDescriptorSetTypeName(desc_set_type)));
#endif//_DEBUG
return(new MaterialParameters(desc_manager,desc_set_type,ds));

2
src/SceneGraph/manager/TextureManager.cpp
View File

@@ -114,7 +114,7 @@ Texture2D *TextureManager::LoadTexture2D(const OSString &filename,bool auto_mipm
// if(du)
// {
// const UTF8String name=U8_TEXT("Tex2D:")+ToUTF8String(filename);
// const U8String name=U8_TEXT("Tex2D:")+ToUTF8String(filename);
//
// du->SetImage(tex->GetImage(),(char *)(name.c_str()));
// }

1
src/SceneGraph/module/GraphModule.cpp
View File

@@ -15,7 +15,6 @@ bool GraphModulesMap::Add(GraphModule *gm)
gm_set.Add(gm);
gm_map_by_name.Add(gm->GetName(),gm);
}
GraphModule::GraphModule(GraphModuleManager *gmm,const AnsiIDName &name)

2
src/ShaderGen/ShaderLibrary.cpp
View File

@@ -35,7 +35,7 @@ const AnsiString *LoadShader(const AnsiString &shader_name)
shader=new AnsiString;
if(LoadStringFromTextFile((UTF8String &)*shader,os_fn)<=0)
if(LoadStringFromTextFile((U8String &)*shader,os_fn)<=0)
{
delete shader;
shader=nullptr;