diff --git a/CMCore b/CMCore index 71392198..0ed44f05 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 713921985587dde43b11d1e0d3d2defc6c35d541 +Subproject commit 0ed44f05318c8163dec5353b4ba6bcf7b77ee61a diff --git a/CMSceneGraph b/CMSceneGraph index c3df1ca2..b914dbfb 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit c3df1ca2f871936d0fafbd83c1b7adf43e1272bb +Subproject commit b914dbfb66a2be85b2bcf362f832eb18f44eb179 diff --git a/CMUtil b/CMUtil index d67a309f..7a72b077 160000 --- a/CMUtil +++ b/CMUtil @@ -1 +1 @@ -Subproject commit d67a309f9409364bfc543d7441d4432081e758d7 +Subproject commit 7a72b077e887459adf534064908d24752dc2947e diff --git a/inc/hgl/graph/SceneNode.h b/inc/hgl/graph/SceneNode.h index 96c1b37b..da3cce76 100644 --- a/inc/hgl/graph/SceneNode.h +++ b/inc/hgl/graph/SceneNode.h @@ -4,6 +4,7 @@ #include #include #include +#include #include namespace hgl::io @@ -45,7 +46,7 @@ namespace hgl::graph AABB bounding_box; ///<绑定盒 AABB local_bounding_box; ///<本地坐标绑定盒 - //AABB WorldBoundingBox; ///<世界坐标绑定盒 + OBB world_bounding_box; ///<世界坐标绑定盒 protected: @@ -115,8 +116,9 @@ namespace hgl::graph { SetParent(nullptr); //清除父节点 - bounding_box.SetZero(); - local_bounding_box.SetZero(); + bounding_box.Clear(); + local_bounding_box.Clear(); + world_bounding_box.Clear(); child_nodes.Clear(); component_set.Clear();