diff --git a/CMAssetsManage b/CMAssetsManage index cf6a54d4..878335ba 160000 --- a/CMAssetsManage +++ b/CMAssetsManage @@ -1 +1 @@ -Subproject commit cf6a54d484436eea700bc4f4ea002ed23eed6dc8 +Subproject commit 878335ba9c4159d558f41c47783447092e0602c9 diff --git a/CMCore b/CMCore index dbbd145f..77a3a9d2 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit dbbd145f03cd3d56c8535b9291b710e595d3b625 +Subproject commit 77a3a9d26e0f3b38c8d8b46b24aff22b1738d10e diff --git a/CMPlatform b/CMPlatform index 103b0d84..aa7abe47 160000 --- a/CMPlatform +++ b/CMPlatform @@ -1 +1 @@ -Subproject commit 103b0d845dc9fdbc10e2e40ab0fa346d133dc1ae +Subproject commit aa7abe47631cdb687528400409ef295fd2c050b8 diff --git a/CMSceneGraph b/CMSceneGraph index b2f29ef0..4949c2e3 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit b2f29ef0cfaed232226f5c8460b1694b98fc25bd +Subproject commit 4949c2e3e82c8a88a783579aff120617c4ecfdab diff --git a/CMUtil b/CMUtil index 5a05612f..f330a667 160000 --- a/CMUtil +++ b/CMUtil @@ -1 +1 @@ -Subproject commit 5a05612f537391db5cbf4001b93ecbef591e4c2e +Subproject commit f330a6672e9b3124e83ce527d2db747b6ee3226b diff --git a/example/GUI/DrawText.cpp b/example/GUI/DrawText.cpp index 31ab7cf1..84280690 100644 --- a/example/GUI/DrawText.cpp +++ b/example/GUI/DrawText.cpp @@ -28,7 +28,7 @@ private: bool InitTextRenderable() { - UTF16String str; + U16String str; LoadStringFromTextFile(str,OS_TEXT("res/text/DaoDeBible.txt")); diff --git a/inc/hgl/graph/font/TextRender.h b/inc/hgl/graph/font/TextRender.h index 932bd522..6322f7ba 100644 --- a/inc/hgl/graph/font/TextRender.h +++ b/inc/hgl/graph/font/TextRender.h @@ -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); diff --git a/inc/hgl/shadergen/ShaderCreateInfo.h b/inc/hgl/shadergen/ShaderCreateInfo.h index 215495d7..d5f530a1 100644 --- a/inc/hgl/shadergen/ShaderCreateInfo.h +++ b/inc/hgl/shadergen/ShaderCreateInfo.h @@ -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;} diff --git a/res b/res index 475d8ad4..e1a36d78 160000 --- a/res +++ b/res @@ -1 +1 @@ -Subproject commit 475d8ad43ceee084cd24f5d0bed59de9f6aa36fd +Subproject commit e1a36d78f0eead5f6bb65493432c4690637b991d diff --git a/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp b/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp index bb42f89a..bbd4ba72 100644 --- a/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp +++ b/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp @@ -48,9 +48,9 @@ MaterialParameters *GPUDevice::CreateMP(const MaterialDescriptorManager *desc_ma if(!ds)return(nullptr); #ifdef _DEBUG - const UTF8String addr_string=HexToString((uint64_t)(ds->GetDescriptorSet())); + const U8String addr_string=HexToString((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)); diff --git a/src/SceneGraph/manager/TextureManager.cpp b/src/SceneGraph/manager/TextureManager.cpp index 11723323..6c3ba9c1 100644 --- a/src/SceneGraph/manager/TextureManager.cpp +++ b/src/SceneGraph/manager/TextureManager.cpp @@ -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())); // } diff --git a/src/SceneGraph/module/GraphModule.cpp b/src/SceneGraph/module/GraphModule.cpp index cb22c91f..1ee7f167 100644 --- a/src/SceneGraph/module/GraphModule.cpp +++ b/src/SceneGraph/module/GraphModule.cpp @@ -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) diff --git a/src/ShaderGen/ShaderLibrary.cpp b/src/ShaderGen/ShaderLibrary.cpp index 1dbe02fb..8fffd0cc 100644 --- a/src/ShaderGen/ShaderLibrary.cpp +++ b/src/ShaderGen/ShaderLibrary.cpp @@ -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;