diff --git a/CMCore b/CMCore index 9567616e..7feefc65 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 9567616ee48cd38ab71ed913b0bd8e3b3a9ad86d +Subproject commit 7feefc65c96d704f05b43f266b30e628fad5e539 diff --git a/example/Gizmo/CMakeLists.txt b/example/Gizmo/CMakeLists.txt index 54db8d43..6e62ac07 100644 --- a/example/Gizmo/CMakeLists.txt +++ b/example/Gizmo/CMakeLists.txt @@ -14,6 +14,6 @@ CreateProject(01_PlaneGrid3D PlaneGrid3D.cpp) CreateProject(02_RayPicking RayPicking.cpp) CreateProject(03_MetricCellsGrid MetricCellsGrid.cpp) -CreateProject(04_Gizmo3DTest GizmoTest.cpp Gizmo3DMove.cpp Gizmo.h GizmoResource.h GizmoResource.cpp StaticMesh.h StaticMesh.cpp) +CreateProject(04_Gizmo3DTest GizmoTest.cpp Gizmo3DMove.cpp Gizmo.h GizmoResource.h GizmoResource.cpp) #CreateProject(03_BlenderAxis BlenderAxis.cpp) diff --git a/example/Gizmo/Gizmo3DMove.cpp b/example/Gizmo/Gizmo3DMove.cpp index 187ea3d8..fb54098d 100644 --- a/example/Gizmo/Gizmo3DMove.cpp +++ b/example/Gizmo/Gizmo3DMove.cpp @@ -66,7 +66,7 @@ namespace root_node->CreateSubNode(scale(9,1,1),cylinder[0]); { - TransformMatrix4f tm; + Transform tm; tm.SetTranslation(Vector3f(0,0,4.5f)); root_node->CreateSubNode(tm.GetMatrix(),cylinder[2]); //Z 向上 diff --git a/src/SceneGraph/CMakeLists.txt b/src/SceneGraph/CMakeLists.txt index ceacd05b..13b76908 100644 --- a/src/SceneGraph/CMakeLists.txt +++ b/src/SceneGraph/CMakeLists.txt @@ -58,6 +58,11 @@ SET(SCENE_GRAPH_SOURCE RenderList.cpp SOURCE_GROUP("Scene Graph" FILES ${SCENE_GRAPH_HEADER} ${SCENE_GRAPH_SOURCE}) +SET(STATIC_MESH_HEADER_FILES ${SG_INCLUDE_PATH}/StaticMesh.h) +SET(STATIC_MESH_SOURCE_FILES StaticMesh.cpp) + +SOURCE_GROUP("Scene Graph\\Static Mesh" FILES ${STATIC_MESH_HEADER_FILES} ${STATIC_MESH_SOURCE_FILES}) + SET(FONT_MANAGE_SOURCE ${SG_INCLUDE_PATH}/font/Font.h ${SG_INCLUDE_PATH}/font/FontManage.h font/Font.cpp) @@ -306,6 +311,9 @@ add_cm_library(ULRE.SceneGraph "ULRE" ${SCENE_GRAPH_HEADER} ${TILE_SOURCE} ${SG_VDM_SOURCE} + ${STATIC_MESH_HEADER_FILES} + ${STATIC_MESH_SOURCE_FILES} + # ${FONT_MANAGE_SOURCE} # ${FONT_SOURCE} # ${FONT_SOURCE_OS} diff --git a/example/Gizmo/StaticMesh.cpp b/src/SceneGraph/StaticMesh.cpp similarity index 100% rename from example/Gizmo/StaticMesh.cpp rename to src/SceneGraph/StaticMesh.cpp