From 6635d3346132d5aa9753cbe7d2baa25726d75318 Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Tue, 10 Jun 2025 23:36:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0BillboardTest/PlaneGrid3D?=
 =?UTF-8?q?=EF=BC=8C=E6=94=AF=E6=8C=81=E6=96=B0=E7=9A=84CameraControl::Set?=
 =?UTF-8?q?Position/SetTarget=EF=BC=8C=E7=AE=80=E5=8C=96=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E8=AE=BE=E7=BD=AE=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMSceneGraph                    |  2 +-
 example/Basic/BillboardTest.cpp | 16 ++++------------
 example/Gizmo/PlaneGrid3D.cpp   | 13 ++-----------
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/CMSceneGraph b/CMSceneGraph
index d81a9f79..23d74ac1 160000
--- a/CMSceneGraph
+++ b/CMSceneGraph
@@ -1 +1 @@
-Subproject commit d81a9f79f4f33a67d4c2938cb3acdd4ec18feeaf
+Subproject commit 23d74ac1676929b97d3292524a1457d0b3fb0419
diff --git a/example/Basic/BillboardTest.cpp b/example/Basic/BillboardTest.cpp
index ec00d990..e39ec6e1 100644
--- a/example/Basic/BillboardTest.cpp
+++ b/example/Basic/BillboardTest.cpp
@@ -163,23 +163,15 @@ private:
     bool InitScene()
     {
         SceneNode *scene_root=GetSceneRoot();       //取得缺省场景根节点
-        Camera *cur_camera=GetCamera();             //取得缺省相机
 
         scene_root->Add(CreateSceneNode(prim_plane_grid,mi_plane_grid,pipeline_plane_grid));
 
         scene_root->Add(new SceneNode(ro_billboard));
 
-        cur_camera->pos=Vector3f(32,32,32);
-
         CameraControl *camera_control=GetCameraControl();
 
-        if(camera_control
-         &&camera_control->GetControlName()==FirstPersonCameraControl::StaticControlName())
-        {
-            FirstPersonCameraControl *fp_cam_ctl=(FirstPersonCameraControl *)camera_control;
-
-            fp_cam_ctl->SetTarget(Vector3f(0,0,0));
-        }
+        camera_control->SetPosition(Vector3f(32,32,32));
+        camera_control->SetTarget(Vector3f(0,0,0));
 
         return(true);
     }
@@ -193,8 +185,8 @@ public:
         SAFE_CLEAR(prim_plane_grid);
     }
 
-    bool Init()
-    {        
+    bool Init() override
+    {
         if(!InitPlaneGridMP())
             return(false);
 
diff --git a/example/Gizmo/PlaneGrid3D.cpp b/example/Gizmo/PlaneGrid3D.cpp
index 96cac1b0..357f795f 100644
--- a/example/Gizmo/PlaneGrid3D.cpp
+++ b/example/Gizmo/PlaneGrid3D.cpp
@@ -94,19 +94,10 @@ private:
         Add(scene_root,material_instance[1],rotate(HGL_RAD_90,0,1,0));
         Add(scene_root,material_instance[2],rotate(HGL_RAD_90,1,0,0));
 
-        Camera *cur_camera=GetCamera();             //取得缺省相机
-
-        cur_camera->pos=Vector3f(32,32,32);
-
         CameraControl *camera_control=GetCameraControl();
 
-        if(camera_control
-           &&camera_control->GetControlName()==FirstPersonCameraControl::StaticControlName())
-        {
-            FirstPersonCameraControl *fp_cam_ctl=(FirstPersonCameraControl *)camera_control;
-
-            fp_cam_ctl->SetTarget(Vector3f(0,0,0));
-        }
+        camera_control->SetPosition(Vector3f(32,32,32));
+        camera_control->SetTarget(Vector3f(0,0,0));
 
 //        camera_control->SetReserveDirection(true,true);        //反转x,y