diff --git a/CMSceneGraph b/CMSceneGraph index a4d3950a..c3df1ca2 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit a4d3950af690d892e259865be4559053e007c979 +Subproject commit c3df1ca2f871936d0fafbd83c1b7adf43e1272bb diff --git a/example/Basic/RenderBoundBox.cpp b/example/Basic/RenderBoundBox.cpp index fc126851..5f70dc6d 100644 --- a/example/Basic/RenderBoundBox.cpp +++ b/example/Basic/RenderBoundBox.cpp @@ -251,7 +251,7 @@ private: } { - cci.mat=TranslateMatrix(5,0,3); + cci.mat=TranslateMatrix(5,0,3)*AxisRotate(deg2rad(30),20,30,40); rm_cylinder->component=CreateComponent(&cci,rm_cylinder->cdp); rm_cylinder->component->SetOverrideMaterial(solid.mi[3]); diff --git a/example/Gizmo/Gizmo3DMove.cpp b/example/Gizmo/Gizmo3DMove.cpp index 1b25d428..ebff5bfc 100644 --- a/example/Gizmo/Gizmo3DMove.cpp +++ b/example/Gizmo/Gizmo3DMove.cpp @@ -56,7 +56,7 @@ namespace return(new GizmoMoveNode); } - SceneNode * Duplication() const override + SceneNode *Duplication()const override { GizmoMoveNode *new_gmn=(GizmoMoveNode *)SceneNode::Duplication(); diff --git a/src/SceneGraph/RenderFramework.cpp b/src/SceneGraph/RenderFramework.cpp index aec03a95..0939c691 100644 --- a/src/SceneGraph/RenderFramework.cpp +++ b/src/SceneGraph/RenderFramework.cpp @@ -161,8 +161,10 @@ void RenderFramework::CreateDefaultRenderer() auto ckc=new CameraKeyboardControl(fpcc); auto cmc=new CameraMouseControl(fpcc); - this->RegisterEventDispatch(ckc); - this->RegisterEventDispatch(cmc); + this->RegisterEventDispatch(fpcc); + + fpcc->RegisterEventDispatch(ckc); + fpcc->RegisterEventDispatch(cmc); default_camera_control=fpcc; @@ -193,6 +195,8 @@ void RenderFramework::Tick() { if(default_camera_control) { + //没有Tick CameraKeyboardControl,所以键盘操作失效了 + default_camera_control->Refresh(); } }