diff --git a/.gitmodules b/.gitmodules index a9323b2..97e98fd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,3 +34,6 @@ [submodule "CMSceneGraph"] path = CMSceneGraph url = https://github.com/hyzboy/CMSceneGraph.git +[submodule "MeshConv"] + path = MeshConv + url = https://github.com/hyzboy/MeshConv.git diff --git a/CMCore b/CMCore index bc89eba..7e90d9d 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit bc89ebae56d3fd59ef5f4f11e0e62326b8d9584a +Subproject commit 7e90d9dead664436ef51da4e0d5a5734973360a2 diff --git a/CMPlatform b/CMPlatform index 984d969..17b14af 160000 --- a/CMPlatform +++ b/CMPlatform @@ -1 +1 @@ -Subproject commit 984d9698ef873a08f0c99579e8a9b4bf15e5ce5f +Subproject commit 17b14af957b057de41e00752df9e9e58cf970eec diff --git a/CMUtil b/CMUtil index dbdb48e..4d40765 160000 --- a/CMUtil +++ b/CMUtil @@ -1 +1 @@ -Subproject commit dbdb48efdcc10173b9edf01916c79a38661f80a1 +Subproject commit 4d40765bb40d2a023933fba90230d86c9341cc0c diff --git a/CMakeLists.txt b/CMakeLists.txt index cd432e8..5e264ce 100644 --- 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) diff --git a/MathGeoLib b/MathGeoLib index 47599c7..35058b7 160000 --- a/MathGeoLib +++ b/MathGeoLib @@ -1 +1 @@ -Subproject commit 47599c77c46034c1cd78dbb93ba5f5495c27b185 +Subproject commit 35058b7f881c2a2ad00bf21c083aa88a70277864 diff --git a/MeshConv b/MeshConv new file mode 160000 index 0000000..13827d9 --- /dev/null +++ b/MeshConv @@ -0,0 +1 @@ +Subproject commit 13827d9c37c416e6eb400a1d2df28d35f426b77d diff --git a/TexConv b/TexConv index 1d4e7c3..acc6457 160000 --- a/TexConv +++ b/TexConv @@ -1 +1 @@ -Subproject commit 1d4e7c3412a982bdc1885d16ba1c1b75923dfd8e +Subproject commit acc64579f4a03d4af9df0b979d2b75591482e89d