From 2f34d556e43528d7d62173289987fbc09ffd1a13 Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Sun, 6 Oct 2024 16:49:08 +0800
Subject: [PATCH] renamed to ChildNode instead of SubNode

---
 CMCore                          |  2 +-
 CMSceneGraph                    |  2 +-
 example/Gizmo/Gizmo3DRotate.cpp |  2 ++
 inc/hgl/graph/SceneManager.h    | 15 ---------------
 inc/hgl/graph/SceneNode.h       | 10 +++++-----
 src/SceneGraph/RenderList.cpp   |  2 +-
 src/SceneGraph/SceneNode.cpp    | 10 +++++-----
 7 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/CMCore b/CMCore
index 2ebd4b4a..14ae93e9 160000
--- a/CMCore
+++ b/CMCore
@@ -1 +1 @@
-Subproject commit 2ebd4b4ac93ad89cb5f74af0b01d06d30752b1aa
+Subproject commit 14ae93e9096b37dd832cee1903f9ae546b033b59
diff --git a/CMSceneGraph b/CMSceneGraph
index f9e23893..9ff596c4 160000
--- a/CMSceneGraph
+++ b/CMSceneGraph
@@ -1 +1 @@
-Subproject commit f9e2389303d54229946e88cd514d1c38b07bb28b
+Subproject commit 9ff596c42437ada641f62b4d0d2bfae535638666
diff --git a/example/Gizmo/Gizmo3DRotate.cpp b/example/Gizmo/Gizmo3DRotate.cpp
index 3fd67a0c..d3655e46 100644
--- a/example/Gizmo/Gizmo3DRotate.cpp
+++ b/example/Gizmo/Gizmo3DRotate.cpp
@@ -60,6 +60,8 @@ bool InitGizmoRotateStaticMesh()
             white_torus->SetLocalNormal(AxisVector::X);
 
             TransformFaceToCamera *rotate_white_torus_tfc=new TransformFaceToCamera();
+            
+            //暂时因为无法传入Camera所以无法正确计算朝向，正在设计Actor/World结构
 
             white_torus->GetTransform().AddTransform(rotate_white_torus_tfc);
 
diff --git a/inc/hgl/graph/SceneManager.h b/inc/hgl/graph/SceneManager.h
index 453b6d27..0517c610 100644
--- a/inc/hgl/graph/SceneManager.h
+++ b/inc/hgl/graph/SceneManager.h
@@ -5,21 +5,6 @@ namespace hgl
 {
     namespace graph
     {
-        template<typename T> class ObjectAllocator
-        {
-
-        template<typename OBJECT,typename ID,typename NAME> class IDNameObjectMap
-        {
-            ObjectList<OBJECT> obj_list;
-
-            Map<ID,OBJECT *> obj_map_by_id;
-            Map<NAME,OBJECT *> obj_map_by_name;
-
-        public:
-
-            virtual ~IDNameObjectMap()=default;
-        };//class NodeManager;
-
         /**
         * 场景管理器<Br>
         * 管理一个场景中的所有资源与场景节点
diff --git a/inc/hgl/graph/SceneNode.h b/inc/hgl/graph/SceneNode.h
index b50250d9..ea7771ee 100644
--- a/inc/hgl/graph/SceneNode.h
+++ b/inc/hgl/graph/SceneNode.h
@@ -32,14 +32,14 @@ namespace hgl
 
         protected:
 
-            ObjectList<SceneNode> SubNode;                                                                              ///<子节点
+            ObjectList<SceneNode> ChildNode;                                                                              ///<子节点
 
         public:
 
             const SceneNodeID &     GetNodeID   ()const { return NodeID; }                                              ///<取得节点ID
             const SceneNodeName &   GetNodeName ()const { return NodeName; }                                            ///<取得节点名称
 
-            const ObjectList<SceneNode> &GetSubNode()const { return SubNode; }                                             ///<取得子节点列表
+            const ObjectList<SceneNode> &GetChildNode()const { return ChildNode; }                                             ///<取得子节点列表
 
         public:
 
@@ -62,14 +62,14 @@ namespace hgl
                 BoundingBox.SetZero();
                 LocalBoundingBox.SetZero();
 
-                SubNode.Clear();
+                ChildNode.Clear();
                 render_obj=nullptr;
             }
 
             const bool IsEmpty()const
             {
                 if(render_obj)return(false);
-                if(SubNode.GetCount())return(false);
+                if(ChildNode.GetCount())return(false);
 
                 return(true);
             }
@@ -82,7 +82,7 @@ namespace hgl
                 if(!sn)
                     return(nullptr);
 
-                SubNode.Add(sn);
+                ChildNode.Add(sn);
                 return sn;
             }
 
diff --git a/src/SceneGraph/RenderList.cpp b/src/SceneGraph/RenderList.cpp
index 5047651a..ffa84c4a 100644
--- a/src/SceneGraph/RenderList.cpp
+++ b/src/SceneGraph/RenderList.cpp
@@ -41,7 +41,7 @@ namespace hgl
                 ++renderable_count;
             }
 
-            for(SceneNode *sub:sn->GetSubNode())
+            for(SceneNode *sub:sn->GetChildNode())
                 ExpendNode(sub);
 
             return(true);
diff --git a/src/SceneGraph/SceneNode.cpp b/src/SceneGraph/SceneNode.cpp
index be7f3ba7..02a41dd7 100644
--- a/src/SceneGraph/SceneNode.cpp
+++ b/src/SceneGraph/SceneNode.cpp
@@ -13,7 +13,7 @@ namespace hgl
 
             node->SetRenderable(src_node->GetRenderable());
 
-            for(SceneNode *sn:src_node->GetSubNode())
+            for(SceneNode *sn:src_node->GetChildNode())
             {
                 node->Add(Duplication(sn));
             }
@@ -50,9 +50,9 @@ namespace hgl
 
             const Matrix4f &l2w=scene_matrix.GetLocalToWorldMatrix();
 
-            const int count=SubNode.GetCount();
+            const int count=ChildNode.GetCount();
 
-            SceneNode **sub=SubNode.GetData();
+            SceneNode **sub=ChildNode.GetData();
 
             for(int i=0;i<count;i++)
             {
@@ -68,8 +68,8 @@ namespace hgl
         */
         void SceneNode::RefreshBoundingBox()
         {
-            int count=SubNode.GetCount();
-            SceneNode **sub=SubNode.GetData();
+            int count=ChildNode.GetCount();
+            SceneNode **sub=ChildNode.GetData();
 
             AABB local,world;