Merge branch 'master' of https://github.com/hyzboy/CMProject

2020-06-15 09:57:43 +08:00 · 2020-06-15 09:57:43 +08:00 · e23085f89c
commit e23085f89c
parent b48bd65207 108f0d8d6b
6 changed files with 8 additions and 3 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -31,3 +31,6 @@
 [submodule "CMSceneGraph"]
 	path = CMSceneGraph
 	url = https://github.com/hyzboy/CMSceneGraph.git
+[submodule "MeshConv"]
+	path = MeshConv
+	url = https://github.com/hyzboy/MeshConv.git
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 984d9698ef873a08f0c99579e8a9b4bf15e5ce5f
+Subproject commit 17b14af957b057de41e00752df9e9e58cf970eec
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -32,6 +32,7 @@ if(CM_BUILD_TOOLS)

    add_subdirectory(TexConv)
    add_subdirectory(ShaderMaker)
+    add_subdirectory(MeshConv)
 endif(CM_BUILD_TOOLS)

 OPTION(CM_BUILD_EXAMPLES    OFF)
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 47599c77c46034c1cd78dbb93ba5f5495c27b185
+Subproject commit 35058b7f881c2a2ad00bf21c083aa88a70277864
--- a/1
+++ b/1
@ -0,0 +1 @@
+Subproject commit 13827d9c37c416e6eb400a1d2df28d35f426b77d
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 1d4e7c3412a982bdc1885d16ba1c1b75923dfd8e
+Subproject commit acc64579f4a03d4af9df0b979d2b75591482e89d
				`@ -0,0 +1 @@`
				`Subproject commit 13827d9c37c416e6eb400a1d2df28d35f426b77d`