From 17fda54a96b634536b288ebd0bd901b4dfae028d Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Fri, 17 Mar 2023 10:44:26 +0800 Subject: [PATCH] removed ShaderMaker and ShaderBuilder --- .gitmodules | 6 ------ CMCore | 2 +- CMSceneGraph | 2 +- CMakeLists.txt | 5 ----- ShaderBuilder | 1 - ShaderMaker | 1 - 6 files changed, 2 insertions(+), 15 deletions(-) delete mode 160000 ShaderBuilder delete mode 160000 ShaderMaker diff --git a/.gitmodules b/.gitmodules index 33040be..91df5e7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,9 +19,6 @@ [submodule "CMAssetsManage"] path = CMAssetsManage url = https://github.com/hyzboy/CMAssetsManage.git -[submodule "ShaderMaker"] - path = ShaderMaker - url = https://github.com/hyzboy/ShaderMaker.git [submodule "Examples"] path = Examples url = https://github.com/hyzboy/CMExamples.git @@ -40,6 +37,3 @@ [submodule "CMQT"] path = CMQT url = https://github.com/hyzboy/CMQT.git -[submodule "ShaderBuilder"] - path = ShaderBuilder - url = https://github.com/hyzboy/ShaderBuilder.git diff --git a/CMCore b/CMCore index 59f7b25..41a2f9a 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 59f7b25075e79af4bba1579851f74efbc20e0b82 +Subproject commit 41a2f9af7287765835d6b8b72a2a567be6eb17e0 diff --git a/CMSceneGraph b/CMSceneGraph index 062c9cd..6e30c0c 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit 062c9cd64239ada350cce73dd50b833759c48e56 +Subproject commit 6e30c0c2ca4056b0593ea0d1770bd7485c2b2d6c diff --git a/CMakeLists.txt b/CMakeLists.txt index 07968a2..4d1cbbc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,11 +41,6 @@ if(CM_BUILD_TOOLS) # add_subdirectory(MeshConv) add_subdirectory(TextEncodeConvert) - add_subdirectory(ShaderBuilder) - - IF(CM_BUILD_QT) - add_subdirectory(ShaderMaker) - endif(CM_BUILD_QT) endif(CM_BUILD_TOOLS) OPTION(CM_BUILD_EXAMPLES OFF) diff --git a/ShaderBuilder b/ShaderBuilder deleted file mode 160000 index 20f2911..0000000 --- a/ShaderBuilder +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 20f2911dddbb0cfa59a32d4eaee6ef6dc5139762 diff --git a/ShaderMaker b/ShaderMaker deleted file mode 160000 index 91e6ac1..0000000 --- a/ShaderMaker +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 91e6ac1bfcded268545cc34e1706634c363d06f6