From e03aaf7fce5543d63e89bdb0e9d30be4de6e4c6e Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Sat, 25 Jun 2022 22:15:25 +0800 Subject: [PATCH] updated submodules. --- CMCMakeModule | 2 +- CMCore | 2 +- CMPlatform | 2 +- CMSceneGraph | 2 +- CMUtil | 2 +- example/2dVector/line.cpp | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMCMakeModule b/CMCMakeModule index a9a5ebe6..9899bc1c 160000 --- a/CMCMakeModule +++ b/CMCMakeModule @@ -1 +1 @@ -Subproject commit a9a5ebe6e93d15359a723bd5e3bae9b408168aef +Subproject commit 9899bc1c07122a77b754345e8ce31fbcd8624772 diff --git a/CMCore b/CMCore index 68071435..5a88a607 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 680714358407b0b208f08b768ce08e3c8bc8b41e +Subproject commit 5a88a6072ce8d7ad64508631f29df60ab4a85d9d diff --git a/CMPlatform b/CMPlatform index b6c70c8e..32606016 160000 --- a/CMPlatform +++ b/CMPlatform @@ -1 +1 @@ -Subproject commit b6c70c8e2adeb602b86e65831499ec74c5f7b9cb +Subproject commit 326060163fa5a7fdbb0daec04337d42e9216c2b0 diff --git a/CMSceneGraph b/CMSceneGraph index 1bf41ad6..f32f9c51 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit 1bf41ad683d9fdfc092dee259567ac8054199bc6 +Subproject commit f32f9c511ff0680105fc33f2e3c915486271b88b diff --git a/CMUtil b/CMUtil index 7be4b32e..c3addef6 160000 --- a/CMUtil +++ b/CMUtil @@ -1 +1 @@ -Subproject commit 7be4b32e66b3e13a5ff1e1bb1808b462ef3e5e28 +Subproject commit c3addef6b7f2fc38737ea5bfe01e55b7c35b3a7a diff --git a/example/2dVector/line.cpp b/example/2dVector/line.cpp index 83641bc0..04875f5d 100644 --- a/example/2dVector/line.cpp +++ b/example/2dVector/line.cpp @@ -53,8 +53,8 @@ private: return(false); // pipeline=db->CreatePipeline(material_instance,sc_render_target,OS_TEXT("res/pipeline/solid2d")); - pipeline=CreatePipeline(material_instance,OS_TEXT("res/pipeline/alpha2d"),Prim::LineStrip); //等同上一行,为Framework重载,默认使用swapchain的render target - //pipeline=CreatePipeline(material_instance,InlinePipeline::Alpha2D,Prim::LineStrip); //等同上一行,为Framework重载,默认使用swapchain的render target + //pipeline=CreatePipeline(material_instance,OS_TEXT("res/pipeline/alpha2d"),Prim::LineStrip); //等同上一行,为Framework重载,默认使用swapchain的render target + pipeline=CreatePipeline(material_instance,InlinePipeline::Alpha2D,Prim::LineStrip); //等同上一行,为Framework重载,默认使用swapchain的render target if(!pipeline) return(false);