diff --git a/CMSceneGraph b/CMSceneGraph index 6113fb00..443e5d30 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit 6113fb00e0a3c8896de4018f554432679fc5fe43 +Subproject commit 443e5d302bb1ef0b8fb2e0da6b95ff784e568354 diff --git a/example/Vulkan/Atomsphere.cpp b/example/Vulkan/Atomsphere.cpp index d1f4129a..15fbd818 100644 --- a/example/Vulkan/Atomsphere.cpp +++ b/example/Vulkan/Atomsphere.cpp @@ -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,OS_TEXT("res/pipeline/sky")); //等同上一行,为Framework重载,默认使用swapchain的render target + pipeline_solid=CreatePipeline(material_instance,vulkan::InlinePipeline::Sky); //等同上一行,为Framework重载,默认使用swapchain的render target if(!pipeline_solid)return(false); return(true); diff --git a/example/Vulkan/DrawText.cpp b/example/Vulkan/DrawText.cpp index 3fcfa3c2..0b26d2e4 100644 --- a/example/Vulkan/DrawText.cpp +++ b/example/Vulkan/DrawText.cpp @@ -59,7 +59,7 @@ private: material_instance=db->CreateMaterialInstance(OS_TEXT("res/material/LumTextureRect2D")); if(!material_instance)return(false); - pipeline=CreatePipeline(material_instance,OS_TEXT("res/pipeline/default"),Prim::Rectangles); + pipeline=CreatePipeline(material_instance,vulkan::InlinePipeline::Solid2D,Prim::Rectangles); if(!pipeline)return(false); sampler=db->CreateSampler(); diff --git a/example/Vulkan/DrawTile.cpp b/example/Vulkan/DrawTile.cpp index 0778bf7d..3ef58e43 100644 --- a/example/Vulkan/DrawTile.cpp +++ b/example/Vulkan/DrawTile.cpp @@ -150,7 +150,7 @@ private: if(!material_instance) return(false); - pipeline=CreatePipeline(material_instance,OS_TEXT("res/pipeline/default"),Prim::Rectangles); + pipeline=CreatePipeline(material_instance,vulkan::InlinePipeline::Solid2D,Prim::Rectangles); sampler=db->CreateSampler(); diff --git a/example/Vulkan/FragCoordTest.cpp b/example/Vulkan/FragCoordTest.cpp index ed2be637..d6d9eb82 100644 --- a/example/Vulkan/FragCoordTest.cpp +++ b/example/Vulkan/FragCoordTest.cpp @@ -41,7 +41,7 @@ private: if(!material_instance) return(false); - pipeline=CreatePipeline(material_instance,OS_TEXT("res/pipeline/solid2d"),Prim::TriangleStrip); + pipeline=CreatePipeline(material_instance,vulkan::InlinePipeline::Solid2D,Prim::TriangleStrip); if(!pipeline) return(false); diff --git a/example/Vulkan/Geometry2D.cpp b/example/Vulkan/Geometry2D.cpp index 70ee7d62..842ea215 100644 --- a/example/Vulkan/Geometry2D.cpp +++ b/example/Vulkan/Geometry2D.cpp @@ -52,7 +52,7 @@ private: if(!material_instance)return(false); - pipeline=CreatePipeline(material,OS_TEXT("res/pipeline/solid2d"),Prim::Fan); + pipeline=CreatePipeline(material,vulkan::InlinePipeline::Solid2D,Prim::Fan); return pipeline; } diff --git a/example/Vulkan/Geometry3D.cpp b/example/Vulkan/Geometry3D.cpp index fa0ff782..fb59d216 100644 --- a/example/Vulkan/Geometry3D.cpp +++ b/example/Vulkan/Geometry3D.cpp @@ -43,7 +43,7 @@ private: mdp->material_instance=db->CreateMaterialInstance(mdp->material); if(!mdp->material_instance)return(false); - mdp->pipeline=CreatePipeline(mdp->material_instance,OS_TEXT("res/pipeline/default"),primitive); + mdp->pipeline=CreatePipeline(mdp->material_instance,vulkan::InlinePipeline::Solid3D,primitive); if(!mdp->material_instance->BindUBO("world",GetCameraMatrixBuffer())) return(false); diff --git a/example/Vulkan/HQFilterTexture.cpp b/example/Vulkan/HQFilterTexture.cpp index 977a68f6..8e3ef05e 100644 --- a/example/Vulkan/HQFilterTexture.cpp +++ b/example/Vulkan/HQFilterTexture.cpp @@ -152,7 +152,7 @@ private: bool InitMaterial() { - pipeline_data=vulkan::GetPipelineData(OS_TEXT("res/pipeline/solid2d")); + pipeline_data=vulkan::GetPipelineData(vulkan::InlinePipeline::Solid2D); if(!pipeline_data)return(false); if(!InitMaterial(&mp_normal,OS_TEXT("res/material/Texture2DPC")))return(false); diff --git a/example/Vulkan/InlineGeometryScene.cpp b/example/Vulkan/InlineGeometryScene.cpp index cfe48702..c7e06b19 100644 --- a/example/Vulkan/InlineGeometryScene.cpp +++ b/example/Vulkan/InlineGeometryScene.cpp @@ -50,7 +50,7 @@ private: material_instance=db->CreateMaterialInstance(material); if(!material_instance)return(false); - pipeline_data=vulkan::GetPipelineData(OS_TEXT("res/pipeline/default")); + pipeline_data=vulkan::GetPipelineData(vulkan::InlinePipeline::Solid3D); if(!pipeline_data)return(false); pipeline_line=CreatePipeline(material,pipeline_data,Prim::Lines); @@ -78,7 +78,7 @@ private: pgci.side_step.u=10; pgci.side_step.v=10; - pgci.color.Set(0.75,0,0,1); + pgci.color.Set(0.5,0,0,1); pgci.side_color.Set(1,0,0,1); ro_plane_grid=CreateRenderablePlaneGrid(db,material,&pgci); diff --git a/example/Vulkan/RectanglePrimitive.cpp b/example/Vulkan/RectanglePrimitive.cpp index 51e9f738..6a6549b3 100644 --- a/example/Vulkan/RectanglePrimitive.cpp +++ b/example/Vulkan/RectanglePrimitive.cpp @@ -52,7 +52,7 @@ private: material_instance=db->CreateMaterialInstance(OS_TEXT("res/material/TextureRect2D")); if(!material_instance)return(false); - pipeline=CreatePipeline(material_instance,OS_TEXT("res/pipeline/default"),Prim::Rectangles); + pipeline=CreatePipeline(material_instance,vulkan::InlinePipeline::Solid2D,Prim::Rectangles); if(!pipeline)return(false); texture=vulkan::CreateTextureFromFile(device,OS_TEXT("res/image/lena.Tex2D")); diff --git a/example/Vulkan/first_triangle.cpp b/example/Vulkan/first_triangle.cpp index 45bdeff8..9c5bcc5a 100644 --- a/example/Vulkan/first_triangle.cpp +++ b/example/Vulkan/first_triangle.cpp @@ -48,7 +48,7 @@ private: return(false); // pipeline=db->CreatePipeline(material_instance,sc_render_target,OS_TEXT("res/pipeline/solid2d")); - pipeline=CreatePipeline(material_instance,OS_TEXT("res/pipeline/solid2d")); //等同上一行,为Framework重载,默认使用swapchain的render target + pipeline=CreatePipeline(material_instance,vulkan::InlinePipeline::Solid2D); //等同上一行,为Framework重载,默认使用swapchain的render target if(!pipeline) return(false); diff --git a/example/Vulkan/indices_rect.cpp b/example/Vulkan/indices_rect.cpp index d41eae45..e60b72e6 100644 --- a/example/Vulkan/indices_rect.cpp +++ b/example/Vulkan/indices_rect.cpp @@ -49,7 +49,7 @@ private: material_instance=db->CreateMaterialInstance(OS_TEXT("res/material/FragColor")); if(!material_instance)return(false); - pipeline=CreatePipeline(material_instance,OS_TEXT("res/pipeline/solid2d")); //等同上一行,为Framework重载,默认使用swapchain的render target + pipeline=CreatePipeline(material_instance,vulkan::InlinePipeline::Solid2D); return(true); }