move the white_torus to GizmoRotate

This commit is contained in:
hyzboy 2024-09-02 00:32:30 +08:00
parent efd9a447fb
commit bbbd8b06c2
3 changed files with 14 additions and 19 deletions

@ -1 +1 @@
Subproject commit ef1afa55da2ede0b7d0b6c8efb424e3e11c1c366 Subproject commit ae170b717e5960034a2a0e83ba4c00a05023491d

View File

@ -1,6 +1,7 @@
#include"GizmoResource.h" #include"GizmoResource.h"
#include<hgl/graph/VKRenderResource.h> #include<hgl/graph/VKRenderResource.h>
#include<hgl/graph/InlineGeometry.h> #include<hgl/graph/InlineGeometry.h>
#include<hgl/graph/TransformFaceToCamera.h>
VK_NAMESPACE_BEGIN VK_NAMESPACE_BEGIN
@ -53,6 +54,18 @@ bool InitGizmoRotateStaticMesh()
root_node->CreateSubNode(tm,torus[2]); root_node->CreateSubNode(tm,torus[2]);
} }
{
SceneNode *white_torus=new SceneNode(scale(13),torus[3]);
white_torus->SetLocalNormal(AxisVector::X);
TransformFaceToCamera *rotate_white_torus_tfc=new TransformFaceToCamera();
white_torus->GetTransform().AddTransform(rotate_white_torus_tfc);
root_node->AddSubNode(white_torus);
}
sm_gizmo_rotate=CreateGizmoStaticMesh(root_node); sm_gizmo_rotate=CreateGizmoStaticMesh(root_node);
} }

View File

@ -1,6 +1,5 @@
#include"VulkanAppFramework.h" #include"VulkanAppFramework.h"
#include"Gizmo.h" #include"Gizmo.h"
#include<hgl/graph/TransformFaceToCamera.h>
#include<hgl/graph/Ray.h> #include<hgl/graph/Ray.h>
using namespace hgl; using namespace hgl;
@ -56,14 +55,11 @@ const Vector3f GizmoPosition(0,0,0);
class TestApp:public SceneAppFramework class TestApp:public SceneAppFramework
{ {
SceneNode root; SceneNode root;
SceneNode *rotate_white_torus=nullptr;
StaticMesh *sm_move=nullptr; StaticMesh *sm_move=nullptr;
StaticMesh *sm_rotate=nullptr; StaticMesh *sm_rotate=nullptr;
StaticMesh *sm_scale=nullptr; StaticMesh *sm_scale=nullptr;
Renderable *face_torus=nullptr;
private: private:
bool InitGizmo() bool InitGizmo()
@ -75,8 +71,6 @@ private:
sm_rotate =GetGizmoRotateStaticMesh(); sm_rotate =GetGizmoRotateStaticMesh();
sm_scale =GetGizmoScaleStaticMesh(); sm_scale =GetGizmoScaleStaticMesh();
face_torus =GetGizmoRenderable(GizmoShape::Torus,GizmoColor::White);
return(true); return(true);
} }
@ -91,18 +85,6 @@ private:
root.CreateSubNode(sm_rotate->GetScene()); root.CreateSubNode(sm_rotate->GetScene());
//root.CreateSubNode(sm_scale->GetScene()); //root.CreateSubNode(sm_scale->GetScene());
{
rotate_white_torus=new SceneNode(scale(13),face_torus);
rotate_white_torus->SetLocalNormal(AxisVector::X);
TransformFaceToCamera *rotate_white_torus_tfc=new TransformFaceToCamera(ci);
rotate_white_torus->GetTransform().AddTransform(rotate_white_torus_tfc);
root.AddSubNode(rotate_white_torus);
}
root.RefreshMatrix(); root.RefreshMatrix();
render_list->SetCamera(ci); render_list->SetCamera(ci);
render_list->Expend(&root); render_list->Expend(&root);