From c8955b6f35950c7e38264a758e6fdad263706852 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Wed, 21 Oct 2020 12:47:06 +0800 Subject: [PATCH] remove vulkan namespace --- CMSceneGraph | 2 +- example/2dVector/line.cpp | 18 ++++----- example/Vulkan/Atomsphere.cpp | 12 +++--- example/Vulkan/DeferredModel.cpp | 30 +++++++------- example/Vulkan/DrawText.cpp | 12 +++--- example/Vulkan/DrawTile.cpp | 14 +++---- example/Vulkan/FragCoordTest.cpp | 10 ++--- example/Vulkan/Geometry2D.cpp | 18 ++++----- example/Vulkan/Geometry3D.cpp | 16 ++++---- example/Vulkan/HQFilterTexture.cpp | 36 ++++++++--------- example/Vulkan/InlineGeometryScene.cpp | 20 ++++----- example/Vulkan/OffscreenRender.cpp | 24 +++++------ example/Vulkan/RectanglePrimitive.cpp | 18 ++++----- example/Vulkan/TextureFormat.cpp | 10 ++--- example/Vulkan/first_triangle.cpp | 12 +++--- example/Vulkan/indices_rect.cpp | 12 +++--- example/Vulkan/texture_rect.cpp | 18 ++++----- example/common/VulkanAppFramework.h | 54 ++++++++++++------------- inc/hgl/graph/InlineGeometry.h | 28 ++++++------- inc/hgl/graph/RenderList.h | 16 ++++---- inc/hgl/graph/RenderableCreater.h | 18 ++++----- inc/hgl/graph/SceneNode.h | 6 +-- inc/hgl/graph/SceneOrient.h | 4 +- inc/hgl/graph/TileData.h | 2 +- inc/hgl/graph/VKDevice.h | 2 +- inc/hgl/graph/VKMaterialInstance.h | 2 +- inc/hgl/graph/VKQueue.h | 4 +- inc/hgl/graph/VKRenderableInstance.h | 6 +-- inc/hgl/graph/font/TextRenderable.h | 14 +++---- inc/hgl/gui/ThemeEngine.h | 4 +- inc/hgl/gui/ThemeForm.h | 4 +- src/GUI/DefaultThemeEngine.cpp | 2 +- src/GUI/DefaultThemeEngine.h | 6 +-- src/GUI/ThemeEngine.cpp | 6 +-- src/RenderDevice/VKDevice.cpp | 4 +- src/RenderDevice/VKDeviceCreater.cpp | 2 +- src/RenderDevice/VKMaterialInstance.cpp | 2 +- src/RenderDevice/VKQueue.cpp | 4 +- src/RenderDevice/VKRenderResource.cpp | 2 +- src/RenderDevice/VKTextureLoader.cpp | 2 +- src/SceneGraph/InlineGeometry.cpp | 28 ++++++------- src/SceneGraph/RenderList.cpp | 12 +++--- src/SceneGraph/RenderableCreater.cpp | 12 +++--- src/SceneGraph/VertexAttribData.cpp | 2 +- src/SceneGraph/font/TextRenderable.cpp | 2 +- 45 files changed, 266 insertions(+), 266 deletions(-) diff --git a/CMSceneGraph b/CMSceneGraph index 0f92de76..8d75c2db 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit 0f92de76507348b9a5a5cdd80a51406bfae00ddd +Subproject commit 8d75c2dbfde480c2e8e736c66d9864ca44f64392 diff --git a/example/2dVector/line.cpp b/example/2dVector/line.cpp index 55437739..84fa9ec2 100644 --- a/example/2dVector/line.cpp +++ b/example/2dVector/line.cpp @@ -35,13 +35,13 @@ private: Camera cam; - vulkan::MaterialInstance * material_instance =nullptr; - vulkan::RenderableInstance *render_instance =nullptr; - vulkan::GPUBuffer * ubo_world_matrix =nullptr; - vulkan::GPUBuffer * ubo_color_material =nullptr; - vulkan::GPUBuffer * ubo_line_config =nullptr; + MaterialInstance * material_instance =nullptr; + RenderableInstance *render_instance =nullptr; + GPUBuffer * ubo_world_matrix =nullptr; + GPUBuffer * ubo_color_material =nullptr; + GPUBuffer * ubo_line_config =nullptr; - vulkan::Pipeline * pipeline =nullptr; + Pipeline * pipeline =nullptr; private: @@ -61,9 +61,9 @@ private: return(true); } - vulkan::GPUBuffer *CreateUBO(const AnsiString &name,const VkDeviceSize size,void *data) + GPUBuffer *CreateUBO(const AnsiString &name,const VkDeviceSize size,void *data) { - vulkan::GPUBuffer *ubo=db->CreateUBO(size,data); + GPUBuffer *ubo=db->CreateUBO(size,data); if(!ubo) return(nullptr); @@ -97,7 +97,7 @@ private: bool InitVBO() { - vulkan::Renderable *render_obj=db->CreateRenderable(VERTEX_COUNT); + Renderable *render_obj=db->CreateRenderable(VERTEX_COUNT); if(!render_obj)return(false); if(!render_obj->Set(VAN::Position, db->CreateVAB(VAF_VEC2,VERTEX_COUNT,vertex_data)))return(false); diff --git a/example/Vulkan/Atomsphere.cpp b/example/Vulkan/Atomsphere.cpp index b070957f..57c218b0 100644 --- a/example/Vulkan/Atomsphere.cpp +++ b/example/Vulkan/Atomsphere.cpp @@ -37,13 +37,13 @@ private: SceneNode render_root; RenderList render_list; - vulkan::MaterialInstance * material_instance =nullptr; - vulkan::Pipeline * pipeline_solid =nullptr; + MaterialInstance * material_instance =nullptr; + Pipeline * pipeline_solid =nullptr; - vulkan::GPUBuffer * ubo_atomsphere =nullptr; - AtmosphereData atomsphere_data; + GPUBuffer * ubo_atomsphere =nullptr; + AtmosphereData atomsphere_data; - vulkan::Renderable * ro_sphere =nullptr; + Renderable * ro_sphere =nullptr; private: @@ -53,7 +53,7 @@ private: if(!material_instance)return(false); // pipeline_solid=db->CreatePipeline(material_instance,sc_render_target,OS_TEXT("res/pipeline/sky")); - pipeline_solid=CreatePipeline(material_instance,vulkan::InlinePipeline::Sky); //等同上一行，为Framework重载，默认使用swapchain的render target + pipeline_solid=CreatePipeline(material_instance,InlinePipeline::Sky); //等同上一行，为Framework重载，默认使用swapchain的render target if(!pipeline_solid)return(false); return(true); diff --git a/example/Vulkan/DeferredModel.cpp b/example/Vulkan/DeferredModel.cpp index ac0c0b85..ae965d2a 100644 --- a/example/Vulkan/DeferredModel.cpp +++ b/example/Vulkan/DeferredModel.cpp @@ -22,7 +22,7 @@ VK_NAMESPACE_END constexpr uint32_t SCREEN_WIDTH=512; constexpr uint32_t SCREEN_HEIGHT=512; -using Texture2DPointer=vulkan::Texture2D *; +using Texture2DPointer=Texture2D *; class TestApp:public CameraAppFramework { @@ -31,20 +31,20 @@ private: SceneNode render_root; RenderList render_list; - vulkan::RenderTarget *gbuffer_rt; + RenderTarget *gbuffer_rt; struct SubpassParam { - vulkan::Material * material; - vulkan::MaterialInstance * material_instance; - vulkan::Pipeline * pipeline_fan; - vulkan::Pipeline * pipeline_triangles; + Material * material; + MaterialInstance * material_instance; + Pipeline * pipeline_fan; + Pipeline * pipeline_triangles; };// SubpassParam sp_gbuffer; SubpassParam sp_composition; - vulkan::Renderable *ro_plane, + Renderable *ro_plane, *ro_cube, *ro_sphere, *ro_torus, @@ -53,7 +53,7 @@ private: *ro_gbc_plane; - vulkan::Sampler * sampler=nullptr; + Sampler * sampler=nullptr; struct { @@ -61,7 +61,7 @@ private: Texture2DPointer normal=nullptr; }texture; - vulkan::GPUCmdBuffer *gbuffer_cmd=nullptr; + GPUCmdBuffer *gbuffer_cmd=nullptr; public: @@ -101,18 +101,18 @@ private: bool InitGBufferPipeline(SubpassParam *sp) { - sp->pipeline_triangles =db->CreatePipeline(sp->material,gbuffer_rt,vulkan::InlinePipeline::Solid3D,Prim::Triangles); + sp->pipeline_triangles =db->CreatePipeline(sp->material,gbuffer_rt,InlinePipeline::Solid3D,Prim::Triangles); if(!sp->pipeline_triangles) return(false); - sp->pipeline_fan =db->CreatePipeline(sp->material,gbuffer_rt,vulkan::InlinePipeline::Solid3D,Prim::Fan); + sp->pipeline_fan =db->CreatePipeline(sp->material,gbuffer_rt,InlinePipeline::Solid3D,Prim::Fan); return sp->pipeline_fan; } bool InitCompositionPipeline(SubpassParam *sp) { - sp->pipeline_fan=db->CreatePipeline(sp->material,gbuffer_rt,vulkan::InlinePipeline::Solid2D,Prim::Fan); + sp->pipeline_fan=db->CreatePipeline(sp->material,gbuffer_rt,InlinePipeline::Solid2D,Prim::Fan); return sp->pipeline_fan; } @@ -125,8 +125,8 @@ private: if(!InitGBufferPipeline(&sp_gbuffer))return(false); if(!InitCompositionPipeline(&sp_composition))return(false); - texture.color =vulkan::CreateTextureFromFile(device,OS_TEXT("res/image/Brickwall/Albedo.Tex2D")); - texture.normal =vulkan::CreateTextureFromFile(device,OS_TEXT("res/image/Brickwall/Normal.Tex2D")); + texture.color =CreateTextureFromFile(device,OS_TEXT("res/image/Brickwall/Albedo.Tex2D")); + texture.normal =CreateTextureFromFile(device,OS_TEXT("res/image/Brickwall/Normal.Tex2D")); sampler=device->CreateSampler(); @@ -144,7 +144,7 @@ private: return(true); } - void CreateRenderObject(vulkan::Material *mtl) + void CreateRenderObject(Material *mtl) { { struct PlaneCreateInfo pci; diff --git a/example/Vulkan/DrawText.cpp b/example/Vulkan/DrawText.cpp index a291d599..5b1e3790 100644 --- a/example/Vulkan/DrawText.cpp +++ b/example/Vulkan/DrawText.cpp @@ -26,12 +26,12 @@ class TestApp:public VulkanApplicationFramework private: - vulkan::Sampler * sampler =nullptr; - vulkan::MaterialInstance * material_instance =nullptr; - vulkan::GPUBuffer * ubo_world_matrix =nullptr; - vulkan::GPUBuffer * ubo_color =nullptr; + Sampler * sampler =nullptr; + MaterialInstance * material_instance =nullptr; + GPUBuffer * ubo_world_matrix =nullptr; + GPUBuffer * ubo_color =nullptr; - vulkan::Pipeline * pipeline =nullptr; + Pipeline * pipeline =nullptr; private: @@ -59,7 +59,7 @@ private: material_instance=db->CreateMaterialInstance(OS_TEXT("res/material/LumTextureRect2D")); if(!material_instance)return(false); - pipeline=CreatePipeline(material_instance,vulkan::InlinePipeline::Solid2D,Prim::Rectangles); + pipeline=CreatePipeline(material_instance,InlinePipeline::Solid2D,Prim::Rectangles); if(!pipeline)return(false); sampler=db->CreateSampler(); diff --git a/example/Vulkan/DrawTile.cpp b/example/Vulkan/DrawTile.cpp index d1e719ca..4389aac4 100644 --- a/example/Vulkan/DrawTile.cpp +++ b/example/Vulkan/DrawTile.cpp @@ -38,13 +38,13 @@ class TestApp:public VulkanApplicationFramework private: - vulkan::Sampler * sampler =nullptr; - vulkan::MaterialInstance * material_instance =nullptr; - vulkan::Renderable * render_obj =nullptr; - vulkan::RenderableInstance *render_instance =nullptr; - vulkan::GPUBuffer * ubo_world_matrix =nullptr; + Sampler * sampler =nullptr; + MaterialInstance * material_instance =nullptr; + Renderable * render_obj =nullptr; + RenderableInstance *render_instance =nullptr; + GPUBuffer * ubo_world_matrix =nullptr; - vulkan::Pipeline * pipeline =nullptr; + Pipeline * pipeline =nullptr; public: @@ -150,7 +150,7 @@ private: if(!material_instance) return(false); - pipeline=CreatePipeline(material_instance,vulkan::InlinePipeline::Solid2D,Prim::Rectangles); + pipeline=CreatePipeline(material_instance,InlinePipeline::Solid2D,Prim::Rectangles); sampler=db->CreateSampler(); diff --git a/example/Vulkan/FragCoordTest.cpp b/example/Vulkan/FragCoordTest.cpp index 5e4e653b..47bf8580 100644 --- a/example/Vulkan/FragCoordTest.cpp +++ b/example/Vulkan/FragCoordTest.cpp @@ -26,11 +26,11 @@ private: Camera cam; - vulkan::MaterialInstance * material_instance =nullptr; - vulkan::RenderableInstance *renderable_instance =nullptr; - vulkan::GPUBuffer * ubo_world_matrix =nullptr; + MaterialInstance * material_instance =nullptr; + RenderableInstance *renderable_instance =nullptr; + GPUBuffer * ubo_world_matrix =nullptr; - vulkan::Pipeline * pipeline =nullptr; + Pipeline * pipeline =nullptr; private: @@ -41,7 +41,7 @@ private: if(!material_instance) return(false); - pipeline=CreatePipeline(material_instance,vulkan::InlinePipeline::Solid2D,Prim::TriangleStrip); + pipeline=CreatePipeline(material_instance,InlinePipeline::Solid2D,Prim::TriangleStrip); if(!pipeline) return(false); diff --git a/example/Vulkan/Geometry2D.cpp b/example/Vulkan/Geometry2D.cpp index 1f61f702..34472d4a 100644 --- a/example/Vulkan/Geometry2D.cpp +++ b/example/Vulkan/Geometry2D.cpp @@ -28,17 +28,17 @@ private: SceneNode render_root; RenderList render_list; - vulkan::Material * material =nullptr; - vulkan::MaterialInstance * material_instance =nullptr; + Material * material =nullptr; + MaterialInstance * material_instance =nullptr; - vulkan::Renderable *ro_rectangle =nullptr, + Renderable *ro_rectangle =nullptr, *ro_circle =nullptr, *ro_round_rectangle =nullptr; - vulkan::GPUBuffer * ubo_world_matrix =nullptr; - vulkan::GPUBuffer * ubo_color_material =nullptr; + GPUBuffer * ubo_world_matrix =nullptr; + GPUBuffer * ubo_color_material =nullptr; - vulkan::Pipeline * pipeline =nullptr; + Pipeline * pipeline =nullptr; private: @@ -52,7 +52,7 @@ private: if(!material_instance)return(false); - pipeline=CreatePipeline(material,vulkan::InlinePipeline::Solid2D,Prim::Fan); + pipeline=CreatePipeline(material,InlinePipeline::Solid2D,Prim::Fan); return pipeline; } @@ -92,9 +92,9 @@ private: } } - vulkan::GPUBuffer *CreateUBO(const AnsiString &name,const VkDeviceSize size,void *data) + GPUBuffer *CreateUBO(const AnsiString &name,const VkDeviceSize size,void *data) { - vulkan::GPUBuffer *ubo=db->CreateUBO(size,data); + GPUBuffer *ubo=db->CreateUBO(size,data); if(!ubo) return(nullptr); diff --git a/example/Vulkan/Geometry3D.cpp b/example/Vulkan/Geometry3D.cpp index 177074d3..ce33da4b 100644 --- a/example/Vulkan/Geometry3D.cpp +++ b/example/Vulkan/Geometry3D.cpp @@ -16,7 +16,7 @@ class TestApp:public CameraAppFramework { Color4f color; - vulkan::GPUBuffer *ubo_color=nullptr; + GPUBuffer *ubo_color=nullptr; private: @@ -25,12 +25,12 @@ private: struct MDP { - vulkan::Material * material =nullptr; - vulkan::MaterialInstance * material_instance =nullptr; - vulkan::Pipeline * pipeline =nullptr; + Material * material =nullptr; + MaterialInstance * material_instance =nullptr; + Pipeline * pipeline =nullptr; }m3d,m2d; - vulkan::Renderable *ro_plane_grid[3], + Renderable *ro_plane_grid[3], *ro_round_rectangle =nullptr; private: @@ -43,7 +43,7 @@ private: mdp->material_instance=db->CreateMaterialInstance(mdp->material); if(!mdp->material_instance)return(false); - mdp->pipeline=CreatePipeline(mdp->material_instance,vulkan::InlinePipeline::Solid3D,primitive); + mdp->pipeline=CreatePipeline(mdp->material_instance,InlinePipeline::Solid3D,primitive); if(!mdp->material_instance->BindUBO("world",GetCameraMatrixBuffer())) return(false); @@ -52,14 +52,14 @@ private: return(true); } - void Add(vulkan::Renderable *r,MDP &mdp) + void Add(Renderable *r,MDP &mdp) { auto ri=db->CreateRenderableInstance(r,mdp.material_instance,mdp.pipeline); render_root.Add(ri); } - void Add(vulkan::Renderable *r,MDP &mdp,const Matrix4f &mat) + void Add(Renderable *r,MDP &mdp,const Matrix4f &mat) { auto ri=db->CreateRenderableInstance(r,mdp.material_instance,mdp.pipeline); diff --git a/example/Vulkan/HQFilterTexture.cpp b/example/Vulkan/HQFilterTexture.cpp index b7744402..192bb33a 100644 --- a/example/Vulkan/HQFilterTexture.cpp +++ b/example/Vulkan/HQFilterTexture.cpp @@ -45,28 +45,28 @@ class TestApp:public VulkanApplicationFramework { private: - vulkan::PipelineData * pipeline_data =nullptr; - vulkan::Renderable * render_obj =nullptr; - vulkan::Sampler * sampler_linear =nullptr; - vulkan::Sampler * sampler_nearest =nullptr; + PipelineData * pipeline_data =nullptr; + Renderable * render_obj =nullptr; + Sampler * sampler_linear =nullptr; + Sampler * sampler_nearest =nullptr; struct MP { - vulkan::Material * material =nullptr; - vulkan::Pipeline * pipeline =nullptr; + Material * material =nullptr; + Pipeline * pipeline =nullptr; }mp_normal,mp_hq; struct MIR { - vulkan::MaterialInstance * material_instance =nullptr; - vulkan::RenderableInstance *renderable_instance =nullptr; + MaterialInstance * material_instance =nullptr; + RenderableInstance *renderable_instance =nullptr; }mir_nearest,mir_linear,mir_nearest_hq,mir_linear_hq; - vulkan::Texture2D * texture =nullptr; + Texture2D * texture =nullptr; - vulkan::VAB * vertex_buffer =nullptr; - vulkan::VAB * tex_coord_buffer =nullptr; - vulkan::IndexBuffer * index_buffer =nullptr; + VAB * vertex_buffer =nullptr; + VAB * tex_coord_buffer =nullptr; + IndexBuffer * index_buffer =nullptr; SceneNode render_root; RenderList render_list; @@ -110,9 +110,9 @@ private: return(true); } - vulkan::Sampler *InitSampler(VkFilter filter) + Sampler *InitSampler(VkFilter filter) { - vulkan::SamplerCreateInfo sampler_create_info; + SamplerCreateInfo sampler_create_info; sampler_create_info.magFilter = filter; sampler_create_info.minFilter = filter; @@ -135,7 +135,7 @@ private: bool InitTexture() { - texture=vulkan::CreateTextureFromFile(device,OS_TEXT("res/image/heightmap.Tex2D")); + texture=CreateTextureFromFile(device,OS_TEXT("res/image/heightmap.Tex2D")); return texture; } @@ -152,7 +152,7 @@ private: bool InitMaterial() { - pipeline_data=vulkan::GetPipelineData(vulkan::InlinePipeline::Solid2D); + pipeline_data=GetPipelineData(InlinePipeline::Solid2D); if(!pipeline_data)return(false); if(!InitMaterial(&mp_normal,OS_TEXT("res/material/Texture2DPC")))return(false); @@ -161,7 +161,7 @@ private: return(true); } - bool InitMIR(struct MIR *mir,vulkan::Sampler *sampler,MP *mp) + bool InitMIR(struct MIR *mir,Sampler *sampler,MP *mp) { mir->material_instance=db->CreateMaterialInstance(mp->material); if(!mir->material_instance)return(false); @@ -239,7 +239,7 @@ public: int main(int,char **) { #ifdef _DEBUG - if(!vulkan::CheckStrideBytesByFormat()) + if(!CheckStrideBytesByFormat()) return 0xff; #endif// diff --git a/example/Vulkan/InlineGeometryScene.cpp b/example/Vulkan/InlineGeometryScene.cpp index 4d2ffcba..df1b5c4f 100644 --- a/example/Vulkan/InlineGeometryScene.cpp +++ b/example/Vulkan/InlineGeometryScene.cpp @@ -23,16 +23,16 @@ private: SceneNode render_root; RenderList render_list; - vulkan::Material * material =nullptr; - vulkan::MaterialInstance * material_instance =nullptr; + Material * material =nullptr; + MaterialInstance * material_instance =nullptr; - vulkan::PipelineData * pipeline_data =nullptr; - vulkan::Pipeline * pipeline_line =nullptr; - vulkan::Pipeline * pipeline_solid =nullptr; + PipelineData * pipeline_data =nullptr; + Pipeline * pipeline_line =nullptr; + Pipeline * pipeline_solid =nullptr; - vulkan::GPUBuffer * ubo_color =nullptr; + GPUBuffer * ubo_color =nullptr; - vulkan::Renderable *ro_plane_grid, + Renderable *ro_plane_grid, *ro_cube, *ro_sphere, *ro_dome, @@ -50,7 +50,7 @@ private: material_instance=db->CreateMaterialInstance(material); if(!material_instance)return(false); - pipeline_data=vulkan::GetPipelineData(vulkan::InlinePipeline::Solid3D); + pipeline_data=GetPipelineData(InlinePipeline::Solid3D); if(!pipeline_data)return(false); pipeline_line=CreatePipeline(material,pipeline_data,Prim::Lines); @@ -155,14 +155,14 @@ private: return(true); } - void Add(vulkan::Renderable *r,vulkan::Pipeline *pl) + void Add(Renderable *r,Pipeline *pl) { auto ri=db->CreateRenderableInstance(r,material_instance,pl); render_root.Add(ri); } - void Add(vulkan::Renderable *r,vulkan::Pipeline *pl,const Matrix4f &mat) + void Add(Renderable *r,Pipeline *pl,const Matrix4f &mat) { auto ri=db->CreateRenderableInstance(r,material_instance,pl); diff --git a/example/Vulkan/OffscreenRender.cpp b/example/Vulkan/OffscreenRender.cpp index 7310ee5a..d51c8965 100644 --- a/example/Vulkan/OffscreenRender.cpp +++ b/example/Vulkan/OffscreenRender.cpp @@ -15,24 +15,24 @@ class TestApp:public CameraAppFramework { Camera cam; - vulkan::MaterialInstance * material_instance =nullptr; - vulkan::GPUBuffer * ubo_world_matrix =nullptr; + MaterialInstance * material_instance =nullptr; + GPUBuffer * ubo_world_matrix =nullptr; }; struct:public RenderObject { - vulkan::RenderTarget * render_taget =nullptr; + RenderTarget * render_taget =nullptr; - vulkan::Pipeline * pipeline =nullptr; - vulkan::RenderableInstance *renderable_instance =nullptr; + Pipeline * pipeline =nullptr; + RenderableInstance *renderable_instance =nullptr; }os; struct:public RenderObject { - vulkan::Sampler * sampler =nullptr; + Sampler * sampler =nullptr; - vulkan::Pipeline * pipeline =nullptr; - vulkan::RenderableInstance *renderable_instance =nullptr; + Pipeline * pipeline =nullptr; + RenderableInstance *renderable_instance =nullptr; SceneNode scene_root; RenderList render_list; @@ -70,7 +70,7 @@ public: os.material_instance=db->CreateMaterialInstance(OS_TEXT("res/material/VertexColor2D")); if(!os.material_instance)return(false); - os.pipeline=db->CreatePipeline(os.material_instance,os.render_taget,vulkan::InlinePipeline::Solid2D,Prim::Fan); + os.pipeline=db->CreatePipeline(os.material_instance,os.render_taget,InlinePipeline::Solid2D,Prim::Fan); if(!os.pipeline)return(false); if(!InitUBO(&os,os.render_taget->GetExtent())) @@ -86,7 +86,7 @@ public: cci.center_color.Set(1,1,1,1); cci.border_color.Set(1,1,1,0); - vulkan::Renderable *render_obj=CreateRenderableCircle(db,os.material_instance->GetMaterial(),&cci); + Renderable *render_obj=CreateRenderableCircle(db,os.material_instance->GetMaterial(),&cci); if(!render_obj)return(false); os.renderable_instance=db->CreateRenderableInstance(render_obj,os.material_instance,os.pipeline); @@ -107,7 +107,7 @@ public: cube.material_instance=db->CreateMaterialInstance(OS_TEXT("res/material/TextureMask3D")); if(!cube.material_instance)return(false); - cube.pipeline=CreatePipeline(cube.material_instance,vulkan::InlinePipeline::Solid3D); + cube.pipeline=CreatePipeline(cube.material_instance,InlinePipeline::Solid3D); if(!cube.pipeline)return(false); cube.sampler=db->CreateSampler(); @@ -120,7 +120,7 @@ public: { CubeCreateInfo cci; - vulkan::Renderable *render_obj=CreateRenderableCube(db,cube.material_instance->GetMaterial(),&cci); + Renderable *render_obj=CreateRenderableCube(db,cube.material_instance->GetMaterial(),&cci); if(!render_obj)return(false); cube.renderable_instance=db->CreateRenderableInstance(render_obj,cube.material_instance,cube.pipeline); diff --git a/example/Vulkan/RectanglePrimitive.cpp b/example/Vulkan/RectanglePrimitive.cpp index 0adbff37..2a80a48b 100644 --- a/example/Vulkan/RectanglePrimitive.cpp +++ b/example/Vulkan/RectanglePrimitive.cpp @@ -36,14 +36,14 @@ class TestApp:public VulkanApplicationFramework private: - vulkan::Texture2D * texture =nullptr; - vulkan::Sampler * sampler =nullptr; - vulkan::MaterialInstance * material_instance =nullptr; - vulkan::Renderable * render_obj =nullptr; - vulkan::RenderableInstance *render_instance =nullptr; - vulkan::GPUBuffer * ubo_world_matrix =nullptr; + Texture2D * texture =nullptr; + Sampler * sampler =nullptr; + MaterialInstance * material_instance =nullptr; + Renderable * render_obj =nullptr; + RenderableInstance *render_instance =nullptr; + GPUBuffer * ubo_world_matrix =nullptr; - vulkan::Pipeline * pipeline =nullptr; + Pipeline * pipeline =nullptr; private: @@ -52,10 +52,10 @@ private: material_instance=db->CreateMaterialInstance(OS_TEXT("res/material/TextureRect2D")); if(!material_instance)return(false); - pipeline=CreatePipeline(material_instance,vulkan::InlinePipeline::Solid2D,Prim::Rectangles); + pipeline=CreatePipeline(material_instance,InlinePipeline::Solid2D,Prim::Rectangles); if(!pipeline)return(false); - texture=vulkan::CreateTextureFromFile(device,OS_TEXT("res/image/lena.Tex2D")); + texture=CreateTextureFromFile(device,OS_TEXT("res/image/lena.Tex2D")); if(!texture)return(false); sampler=db->CreateSampler(); diff --git a/example/Vulkan/TextureFormat.cpp b/example/Vulkan/TextureFormat.cpp index b6fed980..92513ea6 100644 --- a/example/Vulkan/TextureFormat.cpp +++ b/example/Vulkan/TextureFormat.cpp @@ -35,7 +35,7 @@ constexpr char *data_type_name[] "SRGB" };// -vulkan::VulkanInstance *InitVulkanInstance() +VulkanInstance *InitVulkanInstance() { #ifdef _DEBUG if(!CheckStrideBytesByFormat()) @@ -56,15 +56,15 @@ vulkan::VulkanInstance *InitVulkanInstance() cili.lunarg.standard_validation=true; cili.khronos.validation=true; - return vulkan::CreateInstance("VulkanTest",nullptr,&cili); + return CreateInstance("VulkanTest",nullptr,&cili); } int main(int,char **) { Window * win =nullptr; - vulkan::VulkanInstance * inst =nullptr; - vulkan::GPUDevice * device =nullptr; - const vulkan::GPUPhysicalDevice *physical_device =nullptr; + VulkanInstance * inst =nullptr; + GPUDevice * device =nullptr; + const GPUPhysicalDevice *physical_device =nullptr; inst=InitVulkanInstance(); diff --git a/example/Vulkan/first_triangle.cpp b/example/Vulkan/first_triangle.cpp index 8a8cec3f..712ab251 100644 --- a/example/Vulkan/first_triangle.cpp +++ b/example/Vulkan/first_triangle.cpp @@ -32,11 +32,11 @@ private: Camera cam; - vulkan::MaterialInstance * material_instance =nullptr; - vulkan::RenderableInstance *render_instance =nullptr; - vulkan::GPUBuffer * ubo_world_matrix =nullptr; + MaterialInstance * material_instance =nullptr; + RenderableInstance *render_instance =nullptr; + GPUBuffer * ubo_world_matrix =nullptr; - vulkan::Pipeline * pipeline =nullptr; + Pipeline * pipeline =nullptr; private: @@ -48,7 +48,7 @@ private: return(false); // pipeline=db->CreatePipeline(material_instance,sc_render_target,OS_TEXT("res/pipeline/solid2d")); - pipeline=CreatePipeline(material_instance,vulkan::InlinePipeline::Solid2D); //等同上一行，为Framework重载，默认使用swapchain的render target + pipeline=CreatePipeline(material_instance,InlinePipeline::Solid2D); //等同上一行，为Framework重载，默认使用swapchain的render target return pipeline; } @@ -74,7 +74,7 @@ private: bool InitVBO() { - vulkan::Renderable *render_obj=db->CreateRenderable(VERTEX_COUNT); + Renderable *render_obj=db->CreateRenderable(VERTEX_COUNT); if(!render_obj)return(false); if(!render_obj->Set(VAN::Position, db->CreateVAB(VAF_VEC2,VERTEX_COUNT,vertex_data)))return(false); diff --git a/example/Vulkan/indices_rect.cpp b/example/Vulkan/indices_rect.cpp index 574d8183..0fe8e93d 100644 --- a/example/Vulkan/indices_rect.cpp +++ b/example/Vulkan/indices_rect.cpp @@ -36,11 +36,11 @@ private: Camera cam; - vulkan::MaterialInstance * material_instance =nullptr; - vulkan::RenderableInstance *renderable_instance =nullptr; - vulkan::GPUBuffer * ubo_world_matrix =nullptr; + MaterialInstance * material_instance =nullptr; + RenderableInstance *renderable_instance =nullptr; + GPUBuffer * ubo_world_matrix =nullptr; - vulkan::Pipeline * pipeline =nullptr; + Pipeline * pipeline =nullptr; private: @@ -49,7 +49,7 @@ private: material_instance=db->CreateMaterialInstance(OS_TEXT("res/material/FragColor")); if(!material_instance)return(false); - pipeline=CreatePipeline(material_instance,vulkan::InlinePipeline::Solid2D); + pipeline=CreatePipeline(material_instance,InlinePipeline::Solid2D); return(true); } @@ -124,7 +124,7 @@ public: int main(int,char **) { #ifdef _DEBUG - if(!vulkan::CheckStrideBytesByFormat()) + if(!CheckStrideBytesByFormat()) return 0xff; #endif// diff --git a/example/Vulkan/texture_rect.cpp b/example/Vulkan/texture_rect.cpp index 1557d76c..71b77dfc 100644 --- a/example/Vulkan/texture_rect.cpp +++ b/example/Vulkan/texture_rect.cpp @@ -49,12 +49,12 @@ class TestApp:public VulkanApplicationFramework private: - vulkan::Texture2D * texture =nullptr; - vulkan::Sampler * sampler =nullptr; - vulkan::MaterialInstance * material_instance =nullptr; - vulkan::RenderableInstance *renderable_instance =nullptr; - vulkan::GPUBuffer * ubo_world_matrix =nullptr; - vulkan::Pipeline * pipeline =nullptr; + Texture2D * texture =nullptr; + Sampler * sampler =nullptr; + MaterialInstance * material_instance =nullptr; + RenderableInstance *renderable_instance =nullptr; + GPUBuffer * ubo_world_matrix =nullptr; + Pipeline * pipeline =nullptr; private: @@ -63,10 +63,10 @@ private: material_instance=db->CreateMaterialInstance(OS_TEXT("res/material/Texture2D")); if(!material_instance)return(false); - pipeline=CreatePipeline(material_instance,vulkan::InlinePipeline::Solid2D); + pipeline=CreatePipeline(material_instance,InlinePipeline::Solid2D); if(!pipeline)return(false); - texture=vulkan::CreateTextureFromFile(device,OS_TEXT("res/image/lena.Tex2D")); + texture=CreateTextureFromFile(device,OS_TEXT("res/image/lena.Tex2D")); if(!texture)return(false); db->Add(texture); @@ -148,7 +148,7 @@ public: int main(int,char **) { #ifdef _DEBUG - if(!vulkan::CheckStrideBytesByFormat()) + if(!CheckStrideBytesByFormat()) return 0xff; #endif// diff --git a/example/common/VulkanAppFramework.h b/example/common/VulkanAppFramework.h index 372b127c..6aa13f48 100644 --- a/example/common/VulkanAppFramework.h +++ b/example/common/VulkanAppFramework.h @@ -27,8 +27,8 @@ class VulkanApplicationFramework { private: - Window * win =nullptr; - vulkan::VulkanInstance * inst =nullptr; + Window * win =nullptr; + VulkanInstance * inst =nullptr; void OnKeyDown (KeyboardButton kb){key_status[kb]=true;} void OnKeyUp (KeyboardButton kb){key_status[kb]=false;} @@ -46,20 +46,20 @@ protected: protected: - vulkan::GPUDevice * device =nullptr; - vulkan::SwapchainRenderTarget * sc_render_target =nullptr; + GPUDevice * device =nullptr; + SwapchainRenderTarget * sc_render_target =nullptr; protected: int32_t swap_chain_count =0; - vulkan::GPUCmdBuffer ** cmd_buf =nullptr; + GPUCmdBuffer ** cmd_buf =nullptr; Color4f clear_color; protected: - vulkan::RenderResource * db =nullptr; + RenderResource * db =nullptr; bool key_status[kbRangeSize]; @@ -82,7 +82,7 @@ public: clear_color.Zero(); #ifdef _DEBUG - if(!vulkan::CheckStrideBytesByFormat()) + if(!CheckStrideBytesByFormat()) return(false); #endif// @@ -106,7 +106,7 @@ public: cili.khronos.validation = true; cili.RenderDoc.Capture = true; - inst=vulkan::CreateInstance("VulkanTest",nullptr,&cili); + inst=CreateInstance("VulkanTest",nullptr,&cili); if(!inst) return(false); @@ -117,7 +117,7 @@ public: if(!device) return(false); - db=new vulkan::RenderResource(device); + db=new RenderResource(device); InitCommandBuffer(); @@ -161,20 +161,20 @@ public: { const VkExtent2D extent=sc_render_target->GetExtent(); - cmd_buf=hgl_zero_new(swap_chain_count); + cmd_buf=hgl_zero_new(swap_chain_count); for(int32_t i=0;iCreateCommandBuffer(extent,2); } } - void BuildCommandBuffer(vulkan::RenderTarget *rt,vulkan::RenderableInstance *ri) + void BuildCommandBuffer(RenderTarget *rt,RenderableInstance *ri) { if(!rt||!ri) return; - vulkan::GPUCmdBuffer *cb=rt->GetCommandBuffer(); - const vulkan::IndexBuffer *ib=ri->GetIndexBuffer(); + GPUCmdBuffer *cb=rt->GetCommandBuffer(); + const IndexBuffer *ib=ri->GetIndexBuffer(); cb->Begin(); cb->BindFramebuffer(rt); @@ -196,14 +196,14 @@ public: clear_color.Use(cc,1.0); } - void BuildCommandBuffer(uint32_t index,vulkan::RenderableInstance *ri) + void BuildCommandBuffer(uint32_t index,RenderableInstance *ri) { if(!ri) return; - const vulkan::IndexBuffer *ib=ri->GetIndexBuffer(); + const IndexBuffer *ib=ri->GetIndexBuffer(); - vulkan::GPUCmdBuffer *cb=cmd_buf[index]; + GPUCmdBuffer *cb=cmd_buf[index]; cb->SetClearColor(0,clear_color.r,clear_color.g,clear_color.b); @@ -222,13 +222,13 @@ public: cb->End(); } - void BuildCommandBuffer(vulkan::RenderableInstance *ri) + void BuildCommandBuffer(RenderableInstance *ri) { for(int32_t i=0;iGetCurrentFrameIndices(),ri); } @@ -237,7 +237,7 @@ public: { if(!rl)return; - vulkan::GPUCmdBuffer *cb=cmd_buf[index]; + GPUCmdBuffer *cb=cmd_buf[index]; cb->SetClearColor(0,clear_color.r,clear_color.g,clear_color.b); @@ -297,32 +297,32 @@ public: public: //pipeline - vulkan::Pipeline *CreatePipeline(vulkan::Material *mtl,const vulkan::InlinePipeline &ip,const Prim &prim=Prim::Triangles,const bool prim_restart=false) + Pipeline *CreatePipeline(Material *mtl,const InlinePipeline &ip,const Prim &prim=Prim::Triangles,const bool prim_restart=false) { return db->CreatePipeline(mtl,sc_render_target,ip,prim,prim_restart); } - vulkan::Pipeline *CreatePipeline(vulkan::MaterialInstance *mi,const vulkan::InlinePipeline &ip,const Prim &prim=Prim::Triangles,const bool prim_restart=false) + Pipeline *CreatePipeline(MaterialInstance *mi,const InlinePipeline &ip,const Prim &prim=Prim::Triangles,const bool prim_restart=false) { return db->CreatePipeline(mi,sc_render_target,ip,prim,prim_restart); } - vulkan::Pipeline *CreatePipeline(vulkan::Material *mtl,vulkan::PipelineData *pd,const Prim &prim=Prim::Triangles,const bool prim_restart=false) + Pipeline *CreatePipeline(Material *mtl,PipelineData *pd,const Prim &prim=Prim::Triangles,const bool prim_restart=false) { return db->CreatePipeline(mtl,sc_render_target,pd,prim,prim_restart); } - vulkan::Pipeline *CreatePipeline(vulkan::MaterialInstance *mi,vulkan::PipelineData *pd,const Prim &prim=Prim::Triangles,const bool prim_restart=false) + Pipeline *CreatePipeline(MaterialInstance *mi,PipelineData *pd,const Prim &prim=Prim::Triangles,const bool prim_restart=false) { return db->CreatePipeline(mi,sc_render_target,pd,prim,prim_restart); } - vulkan::Pipeline *CreatePipeline(vulkan::Material *mtl,const OSString &pipeline_name,const Prim &prim=Prim::Triangles,const bool prim_restart=false) + Pipeline *CreatePipeline(Material *mtl,const OSString &pipeline_name,const Prim &prim=Prim::Triangles,const bool prim_restart=false) { return db->CreatePipeline(mtl,sc_render_target,pipeline_name,prim,prim_restart); } - vulkan::Pipeline *CreatePipeline(vulkan::MaterialInstance *mi,const OSString &pipeline_name,const Prim &prim=Prim::Triangles,const bool prim_restart=false) + Pipeline *CreatePipeline(MaterialInstance *mi,const OSString &pipeline_name,const Prim &prim=Prim::Triangles,const bool prim_restart=false) { return db->CreatePipeline(mi,sc_render_target,pipeline_name,prim,prim_restart); } @@ -332,7 +332,7 @@ class CameraAppFramework:public VulkanApplicationFramework { private: - vulkan::GPUBuffer * ubo_world_matrix =nullptr; + GPUBuffer * ubo_world_matrix =nullptr; protected: @@ -375,7 +375,7 @@ public: camera.height=h; } - vulkan::GPUBuffer *GetCameraMatrixBuffer() + GPUBuffer *GetCameraMatrixBuffer() { return ubo_world_matrix; } diff --git a/inc/hgl/graph/InlineGeometry.h b/inc/hgl/graph/InlineGeometry.h index 4c36d6fa..b433111e 100644 --- a/inc/hgl/graph/InlineGeometry.h +++ b/inc/hgl/graph/InlineGeometry.h @@ -17,12 +17,12 @@ namespace hgl RectScope2f scope; };//struct RectangleCreateInfo - vulkan::Renderable *CreateRenderableRectangle(vulkan::RenderResource *db,vulkan::Material *mtl,const RectangleCreateInfo *rci); + Renderable *CreateRenderableRectangle(RenderResource *db,Material *mtl,const RectangleCreateInfo *rci); /** * 创建延迟渲染用全屏平面 */ - vulkan::Renderable *CreateRenderableGBufferComposition(vulkan::RenderResource *db,vulkan::Material *mtl); + Renderable *CreateRenderableGBufferComposition(RenderResource *db,Material *mtl); /** * 圆角矩形创建信息(扇形/线圈) @@ -33,7 +33,7 @@ namespace hgl uint32_t round_per; ///<圆角精度 };//struct RoundRectangleCreateInfo:public RectangleCreateInfo - vulkan::Renderable *CreateRenderableRoundRectangle(vulkan::RenderResource *db,vulkan::Material *mtl,const RoundRectangleCreateInfo *rci); + Renderable *CreateRenderableRoundRectangle(RenderResource *db,Material *mtl,const RoundRectangleCreateInfo *rci); /** * 圆形创建信息 @@ -53,7 +53,7 @@ namespace hgl /** * 创建一个2D圆形(扇形/线圈) */ - vulkan::Renderable *CreateRenderableCircle(vulkan::RenderResource *db,vulkan::Material *mtl,const CircleCreateInfo *cci); + Renderable *CreateRenderableCircle(RenderResource *db,Material *mtl,const CircleCreateInfo *cci); /** * 平面网格创建信息 @@ -72,7 +72,7 @@ namespace hgl /** * 创建一个平面网格(线条) */ - vulkan::Renderable *CreateRenderablePlaneGrid(vulkan::RenderResource *db,vulkan::Material *mtl,const PlaneGridCreateInfo *pgci); + Renderable *CreateRenderablePlaneGrid(RenderResource *db,Material *mtl,const PlaneGridCreateInfo *pgci); struct PlaneCreateInfo { @@ -89,7 +89,7 @@ namespace hgl /** * 创建一个平面(三角形) */ - vulkan::Renderable *CreateRenderablePlane(vulkan::RenderResource *db,vulkan::Material *mtl,const PlaneCreateInfo *pci); + Renderable *CreateRenderablePlane(RenderResource *db,Material *mtl,const PlaneCreateInfo *pci); struct CubeCreateInfo { @@ -129,17 +129,17 @@ namespace hgl /** * 创建一个立方体(三角形) */ - vulkan::Renderable *CreateRenderableCube(vulkan::RenderResource *db,vulkan::Material *mtl,const CubeCreateInfo *cci); + Renderable *CreateRenderableCube(RenderResource *db,Material *mtl,const CubeCreateInfo *cci); /** * 创建一个绑定盒(线条) */ - vulkan::Renderable *CreateRenderableBoundingBox(vulkan::RenderResource *db,vulkan::Material *mtl,const CubeCreateInfo *cci); + Renderable *CreateRenderableBoundingBox(RenderResource *db,Material *mtl,const CubeCreateInfo *cci); /** * 创建一个球心坐标为0,0,0，半径为1的球体(三角形) */ - vulkan::Renderable *CreateRenderableSphere(vulkan::RenderResource *db,vulkan::Material *mtl,const uint numberSlices); + Renderable *CreateRenderableSphere(RenderResource *db,Material *mtl,const uint numberSlices); struct DomeCreateInfo { @@ -150,7 +150,7 @@ namespace hgl /** * 创建一个穹顶(三角形) */ - vulkan::Renderable *CreateRenderableDome(vulkan::RenderResource *db,vulkan::Material *mtl, const DomeCreateInfo *); + Renderable *CreateRenderableDome(RenderResource *db,Material *mtl, const DomeCreateInfo *); struct TorusCreateInfo { @@ -164,7 +164,7 @@ namespace hgl /** * 创建一个圆环(三角形) */ - vulkan::Renderable *CreateRenderableTorus(vulkan::RenderResource *db,vulkan::Material *mtl,const TorusCreateInfo *tci); + Renderable *CreateRenderableTorus(RenderResource *db,Material *mtl,const TorusCreateInfo *tci); struct CylinderCreateInfo { @@ -176,7 +176,7 @@ namespace hgl /** * 创建一个圆柱(三角形) */ - vulkan::Renderable *CreateRenderableCylinder(vulkan::RenderResource *db,vulkan::Material *mtl,const CylinderCreateInfo *cci); + Renderable *CreateRenderableCylinder(RenderResource *db,Material *mtl,const CylinderCreateInfo *cci); struct ConeCreateInfo { @@ -189,7 +189,7 @@ namespace hgl /** * 创建一个圆锥(三角形) */ - vulkan::Renderable *CreateRenderableCone(vulkan::RenderResource *db,vulkan::Material *mtl,const ConeCreateInfo *cci); + Renderable *CreateRenderableCone(RenderResource *db,Material *mtl,const ConeCreateInfo *cci); struct AxisCreateInfo { @@ -229,7 +229,7 @@ namespace hgl /** * 创建一个坐标线(线条) */ - vulkan::Renderable *CreateRenderableAxis(vulkan::RenderResource *db,vulkan::Material *mtl,const AxisCreateInfo *aci); + Renderable *CreateRenderableAxis(RenderResource *db,Material *mtl,const AxisCreateInfo *aci); }//namespace graph };//namespace hgl #endif//HGL_GRAPH_INLINE_GEOMETRY_INCLUDE diff --git a/inc/hgl/graph/RenderList.h b/inc/hgl/graph/RenderList.h index 11a7e3fd..dedc4c94 100644 --- a/inc/hgl/graph/RenderList.h +++ b/inc/hgl/graph/RenderList.h @@ -11,19 +11,19 @@ namespace hgl { class RenderList { - vulkan::GPUCmdBuffer *cmd_buf; + GPUCmdBuffer *cmd_buf; private: List scene_node_list; - vulkan::PushConstant * last_pc; - vulkan::Pipeline * last_pipeline; - vulkan::MaterialInstance * last_mat_inst; - vulkan::RenderableInstance *last_ri; + PushConstant * last_pc; + Pipeline * last_pipeline; + MaterialInstance * last_mat_inst; + RenderableInstance *last_ri; - void Render(SceneNode *,vulkan::RenderableInstance *); - void Render(SceneNode *,List &); + void Render(SceneNode *,RenderableInstance *); + void Render(SceneNode *,List &); public: @@ -41,7 +41,7 @@ namespace hgl void Add (SceneNode *node) {if(node)scene_node_list.Add(node);} void Clear () {scene_node_list.ClearData();} - bool Render(vulkan::GPUCmdBuffer *); + bool Render(GPUCmdBuffer *); };//class RenderList }//namespace graph }//namespace hgl diff --git a/inc/hgl/graph/RenderableCreater.h b/inc/hgl/graph/RenderableCreater.h index 75dbfc26..6a76e2df 100644 --- a/inc/hgl/graph/RenderableCreater.h +++ b/inc/hgl/graph/RenderableCreater.h @@ -13,7 +13,7 @@ namespace hgl AnsiString name; uint binding; VAD * data =nullptr; - vulkan::VAB * vab =nullptr; + VAB * vab =nullptr; public: @@ -32,25 +32,25 @@ namespace hgl { protected: - vulkan::RenderResource *db; - vulkan::Material *mtl; + RenderResource *db; + Material *mtl; - const vulkan::VertexShaderModule *vsm; + const VertexShaderModule *vsm; protected: uint32 vertices_number; - vulkan::IndexBuffer * ibo; + IndexBuffer * ibo; VADMaps vab_maps; protected: - virtual VAD *CreateVAD(const AnsiString &name,const vulkan::ShaderStage *ss); ///<创建一个顶点属性缓冲区 + virtual VAD *CreateVAD(const AnsiString &name,const ShaderStage *ss); ///<创建一个顶点属性缓冲区 public: - RenderableCreater(vulkan::RenderResource *sdb,vulkan::Material *m); + RenderableCreater(RenderResource *sdb,Material *m); virtual ~RenderableCreater()=default; virtual bool Init(const uint32 count); ///<初始化，参数为顶点数量 @@ -60,7 +60,7 @@ namespace hgl template T * CreateVADA(const AnsiString &name) ///<创建一个顶点属性缓冲区以及访问器 { - const vulkan::ShaderStage *ss=vsm->GetStageInput(name); + const ShaderStage *ss=vsm->GetStageInput(name); if(!ss) return(nullptr); @@ -85,7 +85,7 @@ namespace hgl uint16 * CreateIBO16(uint count,const uint16 *data=nullptr); ///<创建16位的索引缓冲区 uint32 * CreateIBO32(uint count,const uint32 *data=nullptr); ///<创建32位的索引缓冲区 - virtual vulkan::Renderable * Finish(); ///<结束并创建可渲染对象 + virtual Renderable * Finish(); ///<结束并创建可渲染对象 };//class RenderableCreater }//namespace graph }//namespace hgl diff --git a/inc/hgl/graph/SceneNode.h b/inc/hgl/graph/SceneNode.h index a05b41a8..b58fe19a 100644 --- a/inc/hgl/graph/SceneNode.h +++ b/inc/hgl/graph/SceneNode.h @@ -40,7 +40,7 @@ namespace hgl ObjectList SubNode; ///<子节点 - List renderable_instances; ///<可渲染实例 + List renderable_instances; ///<可渲染实例 public: @@ -74,9 +74,9 @@ namespace hgl void Add(SceneNode *n){if(n)SubNode.Add(n);} ///<增加一个子节点 void ClearSubNode(){SubNode.ClearData();} ///<清除子节点 - void Add(vulkan::RenderableInstance *ri){if(ri)renderable_instances.Add(ri);} ///<增加渲染实例 + void Add(RenderableInstance *ri){if(ri)renderable_instances.Add(ri);} ///<增加渲染实例 - void Add(vulkan::RenderableInstance *ri,const Matrix4f &mat) + void Add(RenderableInstance *ri,const Matrix4f &mat) { SceneNode *sn=new SceneNode(mat); diff --git a/inc/hgl/graph/SceneOrient.h b/inc/hgl/graph/SceneOrient.h index a2547b6c..033a1c77 100644 --- a/inc/hgl/graph/SceneOrient.h +++ b/inc/hgl/graph/SceneOrient.h @@ -24,14 +24,14 @@ namespace hgl Matrix4f InverseLocalMatrix; ///<反向当前矩阵 Matrix4f InverseLocalToWorldMatrix; ///<反向当前到世界矩阵 - vulkan::PushConstant pc; + PushConstant pc; public: SceneOrient(); virtual ~SceneOrient()=default; - vulkan::PushConstant *GetPushConstant(){return &pc;} + PushConstant *GetPushConstant(){return &pc;} Matrix4f & SetLocalMatrix (const Matrix4f &); ///<设定当前节点矩阵 Matrix4f & SetLocalToWorldMatrix (const Matrix4f &); ///<设定当前节点到世界矩阵 diff --git a/inc/hgl/graph/TileData.h b/inc/hgl/graph/TileData.h index d87c9102..5b093e4b 100644 --- a/inc/hgl/graph/TileData.h +++ b/inc/hgl/graph/TileData.h @@ -48,7 +48,7 @@ namespace hgl protected: - vulkan::GPUBuffer *tile_buffer; /// commit_list; uint8 *commit_ptr; diff --git a/inc/hgl/graph/VKDevice.h b/inc/hgl/graph/VKDevice.h index 953fc8b5..f9f8d79a 100644 --- a/inc/hgl/graph/VKDevice.h +++ b/inc/hgl/graph/VKDevice.h @@ -261,7 +261,7 @@ public: //Command GPUBuffer 相关 const VkImageLayout depth_final_layout=VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL); GPUFence * CreateFence(bool); - vulkan::GPUSemaphore * CreateSemaphore(); + GPUSemaphore * CreateSemaphore(); public: //FrameBuffer相关 diff --git a/inc/hgl/graph/VKMaterialInstance.h b/inc/hgl/graph/VKMaterialInstance.h index 18a7ea74..0b6369dc 100644 --- a/inc/hgl/graph/VKMaterialInstance.h +++ b/inc/hgl/graph/VKMaterialInstance.h @@ -25,7 +25,7 @@ public: ~MaterialInstance(); - bool BindUBO(const AnsiString &name,vulkan::GPUBuffer *ubo); + bool BindUBO(const AnsiString &name,GPUBuffer *ubo); bool BindSampler(const AnsiString &name,Texture *tex,Sampler *sampler); void Update(); diff --git a/inc/hgl/graph/VKQueue.h b/inc/hgl/graph/VKQueue.h index eeb474f6..2d841dc8 100644 --- a/inc/hgl/graph/VKQueue.h +++ b/inc/hgl/graph/VKQueue.h @@ -23,8 +23,8 @@ public: bool WaitQueue(); bool WaitFence(const bool wait_all=true,const uint64_t time_out=HGL_NANO_SEC_PER_SEC); - bool Submit(const VkCommandBuffer &cmd_buf,vulkan::GPUSemaphore *wait_sem,vulkan::GPUSemaphore *complete_sem); - bool Submit(const VkCommandBuffer *cmd_buf,const uint32_t count,vulkan::GPUSemaphore *wait_sem,vulkan::GPUSemaphore *complete_sem); + bool Submit(const VkCommandBuffer &cmd_buf,GPUSemaphore *wait_sem,GPUSemaphore *complete_sem); + bool Submit(const VkCommandBuffer *cmd_buf,const uint32_t count,GPUSemaphore *wait_sem,GPUSemaphore *complete_sem); };//class SumbitQueue VK_NAMESPACE_END #endif//HGL_GRAPH_VULKAN_SUBMIT_QUEUE_INCLUDE diff --git a/inc/hgl/graph/VKRenderableInstance.h b/inc/hgl/graph/VKRenderableInstance.h index 79e8256c..eb4e6ec0 100644 --- a/inc/hgl/graph/VKRenderableInstance.h +++ b/inc/hgl/graph/VKRenderableInstance.h @@ -29,9 +29,9 @@ public: virtual ~RenderableInstance(); - vulkan::Pipeline * GetPipeline (){return pipeline;} - vulkan::MaterialInstance * GetMaterialInstance (){return mat_inst;} - vulkan::Renderable * GetRenderable (){return render_obj;} + Pipeline * GetPipeline (){return pipeline;} + MaterialInstance * GetMaterialInstance (){return mat_inst;} + Renderable * GetRenderable (){return render_obj;} const AABB & GetBoundingBox ()const{return render_obj->GetBoundingBox();} const uint32_t GetBufferCount ()const{return buffer_count;} diff --git a/inc/hgl/graph/font/TextRenderable.h b/inc/hgl/graph/font/TextRenderable.h index e3cb441a..66a21b6d 100644 --- a/inc/hgl/graph/font/TextRenderable.h +++ b/inc/hgl/graph/font/TextRenderable.h @@ -9,19 +9,19 @@ namespace hgl /** * 文本可渲染对象 */ - class TextRenderable:public vulkan::Renderable + class TextRenderable:public Renderable { - vulkan::GPUDevice * device; - vulkan::Material * mtl; + GPUDevice * device; + Material * mtl; uint max_count; ///<缓冲区最大容量 - vulkan::VAB * vab_position; - vulkan::VAB * vab_tex_coord; + VAB * vab_position; + VAB * vab_tex_coord; public: - TextRenderable(vulkan::GPUDevice *,vulkan::Material *,uint mc=1024); + TextRenderable(GPUDevice *,Material *,uint mc=1024); virtual ~TextRenderable(); public: @@ -30,7 +30,7 @@ namespace hgl bool WriteVertex (const float *fp); bool WriteTexCoord (const float *fp); - };//class TextRenderable:public vulkan::Renderable + };//class TextRenderable:public Renderable }//namespace graph }//namespace hgl #endif//HGL_GRAPH_TEXT_RENDERABLE_INCLUDE diff --git a/inc/hgl/gui/ThemeEngine.h b/inc/hgl/gui/ThemeEngine.h index 4f46b9f9..ecad81a9 100644 --- a/inc/hgl/gui/ThemeEngine.h +++ b/inc/hgl/gui/ThemeEngine.h @@ -17,13 +17,13 @@ namespace hgl { protected: - vulkan::GPUDevice *device; + GPUDevice *device; MapObject
form_list; public: - ThemeEngine(vulkan::GPUDevice *dev){device=dev;} + ThemeEngine(GPUDevice *dev){device=dev;} virtual ~ThemeEngine()=default; virtual bool Init()=0; diff --git a/inc/hgl/gui/ThemeForm.h b/inc/hgl/gui/ThemeForm.h index ee4ef54a..4909e3e0 100644 --- a/inc/hgl/gui/ThemeForm.h +++ b/inc/hgl/gui/ThemeForm.h @@ -13,13 +13,13 @@ namespace hgl protected: Form *form; - hgl::graph::vulkan::RenderTarget *render_target; + hgl::graph::RenderTarget *render_target; public: ThemeForm(Form *); - void SetRenderTarget(hgl::graph::vulkan::RenderTarget *); + void SetRenderTarget(hgl::graph::RenderTarget *); };//class ThemeForm }//namespace gui }//namespace hgl diff --git a/src/GUI/DefaultThemeEngine.cpp b/src/GUI/DefaultThemeEngine.cpp index c81c2fa7..bf9556ec 100644 --- a/src/GUI/DefaultThemeEngine.cpp +++ b/src/GUI/DefaultThemeEngine.cpp @@ -4,7 +4,7 @@ namespace hgl { namespace gui { - ThemeEngine *CreateDefaultThemeEngine(vulkan::GPUDevice *dev) + ThemeEngine *CreateDefaultThemeEngine(GPUDevice *dev) { return(new default_theme::DefaultThemeEngine(dev)); } diff --git a/src/GUI/DefaultThemeEngine.h b/src/GUI/DefaultThemeEngine.h index 15cb2c0c..0070c8f2 100644 --- a/src/GUI/DefaultThemeEngine.h +++ b/src/GUI/DefaultThemeEngine.h @@ -23,13 +23,13 @@ namespace hgl //struct //{ - // vulkan::Material * m; - // vulkan::MaterialInstance * mi; + // Material * m; + // MaterialInstance * mi; //}panel; public: - DefaultThemeEngine(vulkan::GPUDevice *dev):ThemeEngine(dev){} + DefaultThemeEngine(GPUDevice *dev):ThemeEngine(dev){} virtual ~DefaultThemeEngine() override; bool Init() override; diff --git a/src/GUI/ThemeEngine.cpp b/src/GUI/ThemeEngine.cpp index 735509da..b0a7eb60 100644 --- a/src/GUI/ThemeEngine.cpp +++ b/src/GUI/ThemeEngine.cpp @@ -10,9 +10,9 @@ namespace hgl ThemeEngine *default_theme_engine=nullptr; }//namespace - ThemeEngine *CreateDefaultThemeEngine(vulkan::GPUDevice *dev); + ThemeEngine *CreateDefaultThemeEngine(GPUDevice *dev); - ThemeEngine *GetDefaultThemeEngine(vulkan::GPUDevice *dev) + ThemeEngine *GetDefaultThemeEngine(GPUDevice *dev) { if(!default_theme_engine) default_theme_engine=CreateDefaultThemeEngine(dev); @@ -20,7 +20,7 @@ namespace hgl return default_theme_engine; } - ThemeEngine *CreateThemeEngine(vulkan::GPUDevice *dev) + ThemeEngine *CreateThemeEngine(GPUDevice *dev) { return GetDefaultThemeEngine(); } diff --git a/src/RenderDevice/VKDevice.cpp b/src/RenderDevice/VKDevice.cpp index bb343030..939b394e 100644 --- a/src/RenderDevice/VKDevice.cpp +++ b/src/RenderDevice/VKDevice.cpp @@ -92,7 +92,7 @@ GPUFence *GPUDevice::CreateFence(bool create_signaled) return(new GPUFence(attr->device,fence)); } -vulkan::GPUSemaphore *GPUDevice::CreateSemaphore() +GPUSemaphore *GPUDevice::CreateSemaphore() { SemaphoreCreateInfo SemaphoreCreateInfo; @@ -101,6 +101,6 @@ vulkan::GPUSemaphore *GPUDevice::CreateSemaphore() if(vkCreateSemaphore(attr->device, &SemaphoreCreateInfo, nullptr, &sem)!=VK_SUCCESS) return(nullptr); - return(new vulkan::GPUSemaphore(attr->device,sem)); + return(new GPUSemaphore(attr->device,sem)); } VK_NAMESPACE_END diff --git a/src/RenderDevice/VKDeviceCreater.cpp b/src/RenderDevice/VKDeviceCreater.cpp index 1c7d3d39..c7ec80fc 100644 --- a/src/RenderDevice/VKDeviceCreater.cpp +++ b/src/RenderDevice/VKDeviceCreater.cpp @@ -431,7 +431,7 @@ GPUDevice *CreateRenderDevice(VkInstance inst,const GPUPhysicalDevice *physical_ return(new GPUDevice(device_attr)); } -GPUDevice *CreateRenderDevice(vulkan::VulkanInstance *inst,Window *win,const vulkan::GPUPhysicalDevice *pd) +GPUDevice *CreateRenderDevice(VulkanInstance *inst,Window *win,const GPUPhysicalDevice *pd) { if(!inst) return(nullptr); diff --git a/src/RenderDevice/VKMaterialInstance.cpp b/src/RenderDevice/VKMaterialInstance.cpp index 67bd1ed9..c7d3ce04 100644 --- a/src/RenderDevice/VKMaterialInstance.cpp +++ b/src/RenderDevice/VKMaterialInstance.cpp @@ -15,7 +15,7 @@ MaterialInstance::~MaterialInstance() delete descriptor_sets; } -bool MaterialInstance::BindUBO(const AnsiString &name,vulkan::GPUBuffer *ubo) +bool MaterialInstance::BindUBO(const AnsiString &name,GPUBuffer *ubo) { if(name.IsEmpty()||!ubo) return(false); diff --git a/src/RenderDevice/VKQueue.cpp b/src/RenderDevice/VKQueue.cpp index c6838d59..adfc11cf 100644 --- a/src/RenderDevice/VKQueue.cpp +++ b/src/RenderDevice/VKQueue.cpp @@ -50,7 +50,7 @@ bool GPUQueue::WaitFence(const bool wait_all,uint64_t time_out) return(true); } -bool GPUQueue::Submit(const VkCommandBuffer *cmd_buf,const uint32_t cb_count,vulkan::GPUSemaphore *wait_sem,vulkan::GPUSemaphore *complete_sem) +bool GPUQueue::Submit(const VkCommandBuffer *cmd_buf,const uint32_t cb_count,GPUSemaphore *wait_sem,GPUSemaphore *complete_sem) { VkSemaphore ws; VkSemaphore cs; @@ -93,7 +93,7 @@ bool GPUQueue::Submit(const VkCommandBuffer *cmd_buf,const uint32_t cb_count,vul return(result==VK_SUCCESS); } -bool GPUQueue::Submit(const VkCommandBuffer &cmd_buf,vulkan::GPUSemaphore *wait_sem,vulkan::GPUSemaphore *complete_sem) +bool GPUQueue::Submit(const VkCommandBuffer &cmd_buf,GPUSemaphore *wait_sem,GPUSemaphore *complete_sem) { return Submit(&cmd_buf,1,wait_sem,complete_sem); } diff --git a/src/RenderDevice/VKRenderResource.cpp b/src/RenderDevice/VKRenderResource.cpp index 3ef87421..08cb794a 100644 --- a/src/RenderDevice/VKRenderResource.cpp +++ b/src/RenderDevice/VKRenderResource.cpp @@ -109,7 +109,7 @@ Pipeline *RenderResource::CreatePipeline(MaterialInstance *mi,RenderTarget *rt,P Pipeline *RenderResource::CreatePipeline(Material *mtl,RenderTarget *rt,const OSString &pipeline_filename,const Prim &prim,const bool prim_restart) { - PipelineData *pd=vulkan::GetPipelineData(pipeline_filename); + PipelineData *pd=GetPipelineData(pipeline_filename); if(!pd)return(nullptr); diff --git a/src/RenderDevice/VKTextureLoader.cpp b/src/RenderDevice/VKTextureLoader.cpp index 18c6266a..64ff445e 100644 --- a/src/RenderDevice/VKTextureLoader.cpp +++ b/src/RenderDevice/VKTextureLoader.cpp @@ -93,7 +93,7 @@ namespace GPUDevice *device; VkFormat format; - vulkan::GPUBuffer *buf; + GPUBuffer *buf; Texture2D *tex; diff --git a/src/SceneGraph/InlineGeometry.cpp b/src/SceneGraph/InlineGeometry.cpp index 02c00320..b76cf5fe 100644 --- a/src/SceneGraph/InlineGeometry.cpp +++ b/src/SceneGraph/InlineGeometry.cpp @@ -12,7 +12,7 @@ namespace hgl { namespace graph { - vulkan::Renderable *CreateRenderableRectangle(vulkan::RenderResource *db,vulkan::Material *mtl,const RectangleCreateInfo *rci) + Renderable *CreateRenderableRectangle(RenderResource *db,Material *mtl,const RectangleCreateInfo *rci) { RenderableCreater rc(db,mtl); @@ -29,7 +29,7 @@ namespace hgl return rc.Finish(); } - vulkan::Renderable *CreateRenderableGBufferComposition(vulkan::RenderResource *db,vulkan::Material *mtl) + Renderable *CreateRenderableGBufferComposition(RenderResource *db,Material *mtl) { RectangleCreateInfo rci; @@ -38,7 +38,7 @@ namespace hgl return CreateRenderableRectangle(db,mtl,&rci); } - vulkan::Renderable *CreateRenderableRoundRectangle(vulkan::RenderResource *db,vulkan::Material *mtl,const RoundRectangleCreateInfo *rci) + Renderable *CreateRenderableRoundRectangle(RenderResource *db,Material *mtl,const RoundRectangleCreateInfo *rci) { RenderableCreater rc(db,mtl); @@ -112,7 +112,7 @@ namespace hgl return rc.Finish(); } - vulkan::Renderable *CreateRenderableCircle(vulkan::RenderResource *db,vulkan::Material *mtl,const CircleCreateInfo *cci) + Renderable *CreateRenderableCircle(RenderResource *db,Material *mtl,const CircleCreateInfo *cci) { RenderableCreater rc(db,mtl); @@ -160,7 +160,7 @@ namespace hgl return rc.Finish(); } - vulkan::Renderable *CreateRenderablePlaneGrid(vulkan::RenderResource *db,vulkan::Material *mtl,const PlaneGridCreateInfo *pgci) + Renderable *CreateRenderablePlaneGrid(RenderResource *db,Material *mtl,const PlaneGridCreateInfo *pgci) { RenderableCreater rc(db,mtl); @@ -207,7 +207,7 @@ namespace hgl return rc.Finish(); } - vulkan::Renderable *CreateRenderablePlane(vulkan::RenderResource *db,vulkan::Material *mtl,const PlaneCreateInfo *pci) + Renderable *CreateRenderablePlane(RenderResource *db,Material *mtl,const PlaneCreateInfo *pci) { const float xy_vertices [] = { -0.5f,-0.5f,0.0f, +0.5f,-0.5f,0.0f, +0.5f,+0.5f,0.0f, -0.5f,+0.5f,0.0f }; float xy_tex_coord[] = { 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f }; @@ -248,7 +248,7 @@ namespace hgl return rc.Finish(); } - vulkan::Renderable *CreateRenderableCube(vulkan::RenderResource *db,vulkan::Material *mtl,const CubeCreateInfo *cci) + Renderable *CreateRenderableCube(RenderResource *db,Material *mtl,const CubeCreateInfo *cci) { // Points of a cube. /* 4 5 */ const float points[]={ -0.5f, -0.5f, -0.5f, -0.5f, -0.5f, +0.5f, +0.5f, -0.5f, +0.5f, +0.5f, -0.5f, -0.5f, -0.5f, +0.5f, -0.5f, -0.5f, +0.5f, +0.5f, /* *------------* */ +0.5f, +0.5f, +0.5f, +0.5f, +0.5f, -0.5f, -0.5f, -0.5f, -0.5f, -0.5f, +0.5f, -0.5f, +0.5f, +0.5f, -0.5f, +0.5f, -0.5f, -0.5f, @@ -426,7 +426,7 @@ namespace hgl * @param numberSlices 切片数 * @return 可渲染数据 */ - vulkan::Renderable *CreateRenderableSphere(vulkan::RenderResource *db,vulkan::Material *mtl,const uint numberSlices) + Renderable *CreateRenderableSphere(RenderResource *db,Material *mtl,const uint numberSlices) { RenderableCreater rc(db,mtl); @@ -502,7 +502,7 @@ namespace hgl return rc.Finish(); } - vulkan::Renderable *CreateRenderableDome(vulkan::RenderResource *db,vulkan::Material *mtl,const DomeCreateInfo *dci) + Renderable *CreateRenderableDome(RenderResource *db,Material *mtl,const DomeCreateInfo *dci) { RenderableCreater rc(db,mtl); @@ -621,7 +621,7 @@ namespace hgl } }//namespace - vulkan::Renderable *CreateRenderableTorus(vulkan::RenderResource *db,vulkan::Material *mtl,const TorusCreateInfo *tci) + Renderable *CreateRenderableTorus(RenderResource *db,Material *mtl,const TorusCreateInfo *tci) { RenderableCreater rc(db,mtl); @@ -777,7 +777,7 @@ namespace hgl } }//namespace - vulkan::Renderable *CreateRenderableCylinder(vulkan::RenderResource *db,vulkan::Material *mtl,const CylinderCreateInfo *cci) + Renderable *CreateRenderableCylinder(RenderResource *db,Material *mtl,const CylinderCreateInfo *cci) { uint numberIndices = cci->numberSlices * 3 * 2 + cci->numberSlices * 6; @@ -996,7 +996,7 @@ namespace hgl } }//namespace - vulkan::Renderable *CreateRenderableCone(vulkan::RenderResource *db,vulkan::Material *mtl,const ConeCreateInfo *cci) + Renderable *CreateRenderableCone(RenderResource *db,Material *mtl,const ConeCreateInfo *cci) { RenderableCreater rc(db,mtl); @@ -1123,7 +1123,7 @@ namespace hgl return rc.Finish(); } - vulkan::Renderable *CreateRenderableAxis(vulkan::RenderResource *db,vulkan::Material *mtl,const AxisCreateInfo *aci) + Renderable *CreateRenderableAxis(RenderResource *db,Material *mtl,const AxisCreateInfo *aci) { RenderableCreater rc(db,mtl); @@ -1148,7 +1148,7 @@ namespace hgl return rc.Finish(); } - vulkan::Renderable *CreateRenderableBoundingBox(vulkan::RenderResource *db,vulkan::Material *mtl,const CubeCreateInfo *cci) + Renderable *CreateRenderableBoundingBox(RenderResource *db,Material *mtl,const CubeCreateInfo *cci) { // Points of a cube. /* 4 5 */ const float points[]={ -0.5,-0.5, 0.5, 0.5,-0.5,0.5, 0.5,-0.5,-0.5, -0.5,-0.5,-0.5, diff --git a/src/SceneGraph/RenderList.cpp b/src/SceneGraph/RenderList.cpp index 7fd06d47..0d7100cb 100644 --- a/src/SceneGraph/RenderList.cpp +++ b/src/SceneGraph/RenderList.cpp @@ -27,7 +27,7 @@ namespace hgl // return (((Frustum *)fc)->BoxIn(node->GetWorldBoundingBox())!=Frustum::OUTSIDE); //} - void RenderList::Render(SceneNode *node,vulkan::RenderableInstance *ri) + void RenderList::Render(SceneNode *node,RenderableInstance *ri) { if(last_pipeline!=ri->GetPipeline()) { @@ -49,7 +49,7 @@ namespace hgl { last_pc=node->GetPushConstant(); - cmd_buf->PushConstants(last_pc,sizeof(vulkan::PushConstant)); + cmd_buf->PushConstants(last_pc,sizeof(PushConstant)); } //更新fin_mvp @@ -61,7 +61,7 @@ namespace hgl last_ri=ri; } - const vulkan::IndexBuffer *ib=ri->GetIndexBuffer(); + const IndexBuffer *ib=ri->GetIndexBuffer(); if(ib) { @@ -73,10 +73,10 @@ namespace hgl } } - void RenderList::Render(SceneNode *node,List &ri_list) + void RenderList::Render(SceneNode *node,List &ri_list) { const int count=ri_list.GetCount(); - vulkan::RenderableInstance **ri=ri_list.GetData(); + RenderableInstance **ri=ri_list.GetData(); for(int i=0;iGetStageInput(name); + const ShaderStage *ss=vsm->GetStageInput(name); if(!ss) return(nullptr); @@ -71,7 +71,7 @@ namespace hgl if(vab_maps.Get(name,ssb)) return false; - const vulkan::ShaderStage *ss=vsm->GetStageInput(name); + const ShaderStage *ss=vsm->GetStageInput(name); if(!ss) return(false); @@ -108,14 +108,14 @@ namespace hgl return (uint32 *)ibo->Map(); } - vulkan::Renderable *RenderableCreater::Finish() + Renderable *RenderableCreater::Finish() { const uint si_count=vsm->GetStageInputCount(); if(vab_maps.GetCount()!=si_count) return(nullptr); - vulkan::Renderable *render_obj=db->CreateRenderable(vertices_number); + Renderable *render_obj=db->CreateRenderable(vertices_number); const auto *sp=vab_maps.GetDataList(); for(uint i=0;iCheck()) return(nullptr); - VkFormat fmt=vulkan::GetVulkanFormat(type); + VkFormat fmt=GetVulkanFormat(type); return(new VertexAttribData(vertex_count,type->vec_size,type->GetStride(),fmt)); } diff --git a/src/SceneGraph/font/TextRenderable.cpp b/src/SceneGraph/font/TextRenderable.cpp index ade32fec..f4375b86 100644 --- a/src/SceneGraph/font/TextRenderable.cpp +++ b/src/SceneGraph/font/TextRenderable.cpp @@ -6,7 +6,7 @@ namespace hgl { namespace graph { - TextRenderable::TextRenderable(vulkan::GPUDevice *dev,vulkan::Material *m,uint mc):vulkan::Renderable(mc) + TextRenderable::TextRenderable(GPUDevice *dev,Material *m,uint mc):Renderable(mc) { device=dev; mtl=m;