hyzboy/CMProject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
hyzboy 2020-06-15 09:57:43 +08:00
commit e23085f89c
6 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -31,3 +31,6 @@
[submodule "CMSceneGraph"] [submodule "CMSceneGraph"]
path = CMSceneGraph path = CMSceneGraph
url = https://github.com/hyzboy/CMSceneGraph.git url = https://github.com/hyzboy/CMSceneGraph.git
[submodule "MeshConv"]
path = MeshConv
url = https://github.com/hyzboy/MeshConv.git

2
CMPlatform

@ -1 +1 @@
Subproject commit 984d9698ef873a08f0c99579e8a9b4bf15e5ce5f Subproject commit 17b14af957b057de41e00752df9e9e58cf970eec

1
CMakeLists.txt
View File

@ -32,6 +32,7 @@ if(CM_BUILD_TOOLS)
add_subdirectory(TexConv) add_subdirectory(TexConv)
add_subdirectory(ShaderMaker) add_subdirectory(ShaderMaker)
add_subdirectory(MeshConv)
endif(CM_BUILD_TOOLS) endif(CM_BUILD_TOOLS)
OPTION(CM_BUILD_EXAMPLES OFF) OPTION(CM_BUILD_EXAMPLES OFF)

2
MathGeoLib

@ -1 +1 @@
Subproject commit 47599c77c46034c1cd78dbb93ba5f5495c27b185 Subproject commit 35058b7f881c2a2ad00bf21c083aa88a70277864

1
MeshConv Submodule

@ -0,0 +1 @@
Subproject commit 13827d9c37c416e6eb400a1d2df28d35f426b77d

2
TexConv

@ -1 +1 @@
Subproject commit 1d4e7c3412a982bdc1885d16ba1c1b75923dfd8e Subproject commit acc64579f4a03d4af9df0b979d2b75591482e89d