diff --git a/inc/hgl/graph/TextureLoader.h b/inc/hgl/graph/TextureLoader.h index 7382bb84..2f8f50f9 100644 --- a/inc/hgl/graph/TextureLoader.h +++ b/inc/hgl/graph/TextureLoader.h @@ -2,7 +2,7 @@ #define HGL_GRAPH_TEXTURE_LOADER_INCLUDE #include -#include +#include #include namespace hgl { diff --git a/inc/hgl/graph/VertexAttribDataAccess.h b/inc/hgl/graph/VertexAttribDataAccess.h index 123aa80c..ea493a0e 100644 --- a/inc/hgl/graph/VertexAttribDataAccess.h +++ b/inc/hgl/graph/VertexAttribDataAccess.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include namespace hgl diff --git a/inc/hgl/graph/font/TextLayout.h b/inc/hgl/graph/font/TextLayout.h index 1cdbef7e..3803ce21 100644 --- a/inc/hgl/graph/font/TextLayout.h +++ b/inc/hgl/graph/font/TextLayout.h @@ -122,9 +122,9 @@ namespace hgl int sl_v_r2l(); int sl_v_l2r(); - template int SimpleLayout(TextRenderable *,TileFont *,const BaseString &); ///<简易排版 + template int SimpleLayout(TextRenderable *,TileFont *,const String &); ///<简易排版 -// template int SimpleLayout(TileFont *,const StringList> &); ///<简易排版 +// template int SimpleLayout(TileFont *,const StringList> &); ///<简易排版 protected: diff --git a/inc/hgl/graph/material/Material.h b/inc/hgl/graph/material/Material.h index 2299f52e..5c0cf66b 100644 --- a/inc/hgl/graph/material/Material.h +++ b/inc/hgl/graph/material/Material.h @@ -2,7 +2,7 @@ #define HGL_GRAPH_MATERIAL_INCLUDE #include -#include +#include MATERIAL_NAMESPACE_BEGIN enum class BlendMode diff --git a/inc/hgl/graph/shader/ShaderResource.h b/inc/hgl/graph/shader/ShaderResource.h index 32a66c1b..f66b5a5b 100644 --- a/inc/hgl/graph/shader/ShaderResource.h +++ b/inc/hgl/graph/shader/ShaderResource.h @@ -1,5 +1,5 @@ #pragma once -#include +#include #include #include #include diff --git a/inc/hgl/graph/vulkan/VKDevice.h b/inc/hgl/graph/vulkan/VKDevice.h index 7b581277..ad6864bf 100644 --- a/inc/hgl/graph/vulkan/VKDevice.h +++ b/inc/hgl/graph/vulkan/VKDevice.h @@ -2,7 +2,7 @@ #define HGL_GRAPH_RENDER_SURFACE_INCLUDE #include -#include +#include #include #include #include diff --git a/inc/hgl/graph/vulkan/VKInstance.h b/inc/hgl/graph/vulkan/VKInstance.h index 42da92fa..dcb612a9 100644 --- a/inc/hgl/graph/vulkan/VKInstance.h +++ b/inc/hgl/graph/vulkan/VKInstance.h @@ -1,7 +1,7 @@ #ifndef HGL_GRAPH_VULKAN_INSTANCE_INCLUDE #define HGL_GRAPH_VULKAN_INSTANCE_INCLUDE -#include +#include #include #include #include diff --git a/inc/hgl/graph/vulkan/VKMaterial.h b/inc/hgl/graph/vulkan/VKMaterial.h index 76b942bd..8fa4353c 100644 --- a/inc/hgl/graph/vulkan/VKMaterial.h +++ b/inc/hgl/graph/vulkan/VKMaterial.h @@ -3,7 +3,7 @@ #include #include -#include +#include VK_NAMESPACE_BEGIN class DescriptorSetLayoutCreater; using ShaderModuleMap=hgl::Map; diff --git a/inc/hgl/graph/vulkan/VKMaterialInstance.h b/inc/hgl/graph/vulkan/VKMaterialInstance.h index a6c28be5..85613c0f 100644 --- a/inc/hgl/graph/vulkan/VKMaterialInstance.h +++ b/inc/hgl/graph/vulkan/VKMaterialInstance.h @@ -2,7 +2,7 @@ #define HGL_GRAPH_VULKAN_MATERIAL_INSTANCE_INCLUDE #include -#include +#include VK_NAMESPACE_BEGIN class MaterialInstance { diff --git a/inc/hgl/graph/vulkan/VKPhysicalDevice.h b/inc/hgl/graph/vulkan/VKPhysicalDevice.h index 98da688a..77e3b080 100644 --- a/inc/hgl/graph/vulkan/VKPhysicalDevice.h +++ b/inc/hgl/graph/vulkan/VKPhysicalDevice.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include VK_NAMESPACE_BEGIN diff --git a/inc/hgl/graph/vulkan/VKRenderable.h b/inc/hgl/graph/vulkan/VKRenderable.h index f65b34da..e343c266 100644 --- a/inc/hgl/graph/vulkan/VKRenderable.h +++ b/inc/hgl/graph/vulkan/VKRenderable.h @@ -3,7 +3,7 @@ #include #include -#include +#include #include VK_NAMESPACE_BEGIN /** diff --git a/inc/hgl/graph/vulkan/VKShaderModuleManage.h b/inc/hgl/graph/vulkan/VKShaderModuleManage.h index d1bf4d0c..c63ff0ea 100644 --- a/inc/hgl/graph/vulkan/VKShaderModuleManage.h +++ b/inc/hgl/graph/vulkan/VKShaderModuleManage.h @@ -3,7 +3,7 @@ #include #include -#include +#include VK_NAMESPACE_BEGIN class ShaderResource; diff --git a/inc/hgl/graph/vulkan/VKTexture.h b/inc/hgl/graph/vulkan/VKTexture.h index 7139a5a9..07af932b 100644 --- a/inc/hgl/graph/vulkan/VKTexture.h +++ b/inc/hgl/graph/vulkan/VKTexture.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include VK_NAMESPACE_BEGIN BitmapData *LoadBitmapFromFile(const OSString &filename); diff --git a/inc/hgl/graph/vulkan/VKVertexAttributeBinding.h b/inc/hgl/graph/vulkan/VKVertexAttributeBinding.h index 8412b047..b38e42b6 100644 --- a/inc/hgl/graph/vulkan/VKVertexAttributeBinding.h +++ b/inc/hgl/graph/vulkan/VKVertexAttributeBinding.h @@ -2,7 +2,7 @@ #define HGL_GRAPH_VULKAN_VERTEX_ATTRIBUTE_BINDING_INCLUDE #include -#include +#include VK_NAMESPACE_BEGIN /** * 顶点输入状态实例
@@ -10,7 +10,6 @@ VK_NAMESPACE_BEGIN */ class VertexAttributeBinding { - VertexShaderModule *vsm; uint32_t attr_count; VkVertexInputBindingDescription *binding_list; VkVertexInputAttributeDescription *attribute_list; @@ -19,24 +18,17 @@ private: friend class VertexShaderModule; - VertexAttributeBinding(VertexShaderModule *); + VertexAttributeBinding(const uint32_t,const VkVertexInputBindingDescription *,const VkVertexInputAttributeDescription *); public: ~VertexAttributeBinding(); - const uint GetStageInputBinding(const AnsiString &name); ///<取得一个变量的绑定点 - bool SetInstance(const uint binding,bool instance); bool SetStride (const uint binding,const uint32_t & stride); bool SetFormat (const uint binding,const VkFormat & format); bool SetOffset (const uint binding,const uint32_t offset); - bool SetInstance(const AnsiString &name,bool instance){return SetInstance(GetStageInputBinding(name),instance);} - bool SetStride (const AnsiString &name,const uint32_t &stride ){return SetStride (GetStageInputBinding(name),stride);} - bool SetFormat (const AnsiString &name,const VkFormat &format ){return SetFormat (GetStageInputBinding(name),format);} - bool SetOffset (const AnsiString &name,const uint32_t offset ){return SetOffset (GetStageInputBinding(name),offset);} - void Write(VkPipelineVertexInputStateCreateInfo &vis)const; };//class VertexAttributeBinding VK_NAMESPACE_END diff --git a/inc/hgl/util/JsonTool.h b/inc/hgl/util/JsonTool.h index d27b3349..06e9578a 100644 --- a/inc/hgl/util/JsonTool.h +++ b/inc/hgl/util/JsonTool.h @@ -1,7 +1,7 @@ #pragma once #include #include -#include +#include const std::string JsonToString(const Json::Value &jv_root); diff --git a/src/RenderDevice/Vulkan/POD/VKPipelineCreateInfo.POD.cpp b/src/RenderDevice/Vulkan/POD/VKPipelineCreateInfo.POD.cpp index c19d8907..73437def 100644 --- a/src/RenderDevice/Vulkan/POD/VKPipelineCreateInfo.POD.cpp +++ b/src/RenderDevice/Vulkan/POD/VKPipelineCreateInfo.POD.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include diff --git a/src/SceneGraph/font/TextLayout.cpp b/src/SceneGraph/font/TextLayout.cpp index 5f0cf392..cf72e6fe 100644 --- a/src/SceneGraph/font/TextLayout.cpp +++ b/src/SceneGraph/font/TextLayout.cpp @@ -129,7 +129,7 @@ namespace hgl return(true); } - //int TextLayout::Layout(const int mc,const BaseString &str) + //int TextLayout::Layout(const int mc,const String &str) //{ // if(mc<=0 // ||!str @@ -226,7 +226,7 @@ namespace hgl * 简易文本排版。无任何特殊处理，不支持任何转义符，不支持\r\n */ template - int TextLayout::SimpleLayout(TextRenderable *tr,TileFont *tf,const BaseString &str) + int TextLayout::SimpleLayout(TextRenderable *tr,TileFont *tf,const String &str) { if(!tr) return(-1); @@ -279,7 +279,7 @@ namespace hgl int TextLayout::SimpleLayout(TextRenderable *tr,TileFont *tf,const UTF32String &str){return this->SimpleLayout(tr,tf,str);} //template - //int TextLayout::SimpleLayout(TileFont *tf,const StringList> &sl) + //int TextLayout::SimpleLayout(TileFont *tf,const StringList> &sl) //{ //}