hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化代码、排版、重命名

Browse Source
This commit is contained in:
hyzboy
2025-07-04 11:12:55 +08:00
parent e87838289a
commit 2b135b1d24
6 changed files with 39 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMCore

Submodule CMCore updated: 25060b07d0...a38866694c

2
CMPlatform

Submodule CMPlatform updated: b6cf73deca...bc5623e462

2
example/Gizmo/Gizmo.h
View File

@@ -35,7 +35,7 @@ enum class GizmoShape:uint
bool InitGizmoResource(RenderFramework *); bool InitGizmoResource(RenderFramework *);
void FreeGizmoResource(); void FreeGizmoResource();
ComponentDataPtr GetGizmoMeshComponentDataPtr(const GizmoShape &shape,const GizmoColor &color); ComponentDataPtr GetGizmoMeshCDP(const GizmoShape &shape,const GizmoColor &color);
SceneNode *GetGizmoMoveNode(); SceneNode *GetGizmoMoveNode();
//SceneNode *GetGizmoScaleMesh(); //SceneNode *GetGizmoScaleMesh();

77
example/Gizmo/Gizmo3DMove.cpp
View File

@@ -58,124 +58,115 @@ namespace
SceneNode * Duplication() const override SceneNode * Duplication() const override
{ {
GizmoMoveNode *new_gma=(GizmoMoveNode *)SceneNode::Duplication(); GizmoMoveNode *new_gmn=(GizmoMoveNode *)SceneNode::Duplication();
if(!new_gma) if(!new_gmn)
return(nullptr); return(nullptr);
new_gma->sphere=sphere; new_gmn->sphere=sphere;
for(int i=0;i<3;i++) hgl_cpy(new_gmn->axis,axis);
{
new_gma->axis[i].cylinder =axis[i].cylinder;
new_gma->axis[i].cone =axis[i].cone;
new_gma->axis[i].square =axis[i].square;
}
return new_gma; return new_gmn;
} }
bool Init(RenderFramework *render_framework) bool Init(RenderFramework *render_framework)
{ {
ComponentDataPtr sphere=GetGizmoMeshComponentDataPtr(GizmoShape::Sphere,GizmoColor::White); ComponentDataPtr sphere_ptr=GetGizmoMeshCDP(GizmoShape::Sphere,GizmoColor::White);
ComponentDataPtr cylinder[3] #define GET_GIZMO_MESH_CDP(shape) ComponentDataPtr shape##Ptr[3]{ \
{ GetGizmoMeshCDP(GizmoShape::shape,GizmoColor::Red), \
GetGizmoMeshComponentDataPtr(GizmoShape::Cylinder,GizmoColor::Red), GetGizmoMeshCDP(GizmoShape::shape,GizmoColor::Green), \
GetGizmoMeshComponentDataPtr(GizmoShape::Cylinder,GizmoColor::Green), GetGizmoMeshCDP(GizmoShape::shape,GizmoColor::Blue) \
GetGizmoMeshComponentDataPtr(GizmoShape::Cylinder,GizmoColor::Blue),
}; };
ComponentDataPtr cone[3] GET_GIZMO_MESH_CDP(Cylinder)
{ GET_GIZMO_MESH_CDP(Cone)
GetGizmoMeshComponentDataPtr(GizmoShape::Cone,GizmoColor::Red), GET_GIZMO_MESH_CDP(Square)
GetGizmoMeshComponentDataPtr(GizmoShape::Cone,GizmoColor::Green),
GetGizmoMeshComponentDataPtr(GizmoShape::Cone,GizmoColor::Blue),
};
ComponentDataPtr square[3]= if(!sphere_ptr)
{
GetGizmoMeshComponentDataPtr(GizmoShape::Square,GizmoColor::Red),
GetGizmoMeshComponentDataPtr(GizmoShape::Square,GizmoColor::Green),
GetGizmoMeshComponentDataPtr(GizmoShape::Square,GizmoColor::Blue)
};
if(!sphere)
return(false); return(false);
for(int i=0;i<3;i++) for(int i=0;i<3;i++)
{ {
if(!cylinder[i]) if(!CylinderPtr[i])
return(false); return(false);
if(!cone[i]) if(!ConePtr[i])
return(false); return(false);
if(!square[i]) if(!SquarePtr[i])
return(false); return(false);
} }
CreateComponentInfo cci(this); CreateComponentInfo cci(this);
render_framework->CreateComponent<MeshComponent>(&cci,sphere); sphere=render_framework->CreateComponent<MeshComponent>(&cci,sphere_ptr);
{ {
Transform tm; Transform tm;
GizmoMoveAxis *gma;
const Vector3f one_scale(1); const Vector3f one_scale(1);
const Vector3f square_scale(2); const Vector3f square_scale(2);
const Vector3f cylinder_scale(GIZMO_CYLINDER_RADIUS,GIZMO_CYLINDER_RADIUS,GIZMO_CYLINDER_HALF_LENGTH); const Vector3f cylinder_scale(GIZMO_CYLINDER_RADIUS,GIZMO_CYLINDER_RADIUS,GIZMO_CYLINDER_HALF_LENGTH);
{ {
gma=axis+size_t(AXIS::Z);
tm.SetScale(cylinder_scale); tm.SetScale(cylinder_scale);
tm.SetTranslation(0,0,GIZMO_CYLINDER_OFFSET); tm.SetTranslation(0,0,GIZMO_CYLINDER_OFFSET);
cci.mat=tm; cci.mat=tm;
render_framework->CreateComponent<MeshComponent>(&cci,cylinder[2]); //Z 向上圆柱 gma->cylinder=render_framework->CreateComponent<MeshComponent>(&cci,CylinderPtr[2]); //Z 向上圆柱
tm.SetScale(one_scale); tm.SetScale(one_scale);
tm.SetTranslation(0,0,GIZMO_CONE_OFFSET); tm.SetTranslation(0,0,GIZMO_CONE_OFFSET);
cci.mat=tm; cci.mat=tm;
render_framework->CreateComponent<MeshComponent>(&cci,cone[2]); //Z 向上圆锥 gma->cone=render_framework->CreateComponent<MeshComponent>(&cci,ConePtr[2]); //Z 向上圆锥
tm.SetScale(square_scale); tm.SetScale(square_scale);
tm.SetTranslation(GIZMO_TWO_AXIS_OFFSET,GIZMO_TWO_AXIS_OFFSET,0); tm.SetTranslation(GIZMO_TWO_AXIS_OFFSET,GIZMO_TWO_AXIS_OFFSET,0);
cci.mat=tm; cci.mat=tm;
render_framework->CreateComponent<MeshComponent>(&cci,square[2]); gma->square=render_framework->CreateComponent<MeshComponent>(&cci,SquarePtr[2]);
} }
{ {
gma=axis+size_t(AXIS::X);
tm.SetScale(cylinder_scale); tm.SetScale(cylinder_scale);
tm.SetRotation(AxisVector::Y,90); tm.SetRotation(AxisVector::Y,90);
tm.SetTranslation(GIZMO_CYLINDER_OFFSET,0,0); tm.SetTranslation(GIZMO_CYLINDER_OFFSET,0,0);
cci.mat=tm; cci.mat=tm;
render_framework->CreateComponent<MeshComponent>(&cci,cylinder[0]); //X 向右圆柱 gma->cylinder=render_framework->CreateComponent<MeshComponent>(&cci,CylinderPtr[0]); //X 向右圆柱
tm.SetScale(one_scale); tm.SetScale(one_scale);
tm.SetTranslation(GIZMO_CONE_OFFSET,0,0); tm.SetTranslation(GIZMO_CONE_OFFSET,0,0);
cci.mat=tm; cci.mat=tm;
render_framework->CreateComponent<MeshComponent>(&cci,cone[0]); //X 向右圆锥 gma->cone=render_framework->CreateComponent<MeshComponent>(&cci,ConePtr[0]); //X 向右圆锥
tm.SetScale(square_scale); tm.SetScale(square_scale);
tm.SetTranslation(0,GIZMO_TWO_AXIS_OFFSET,GIZMO_TWO_AXIS_OFFSET); tm.SetTranslation(0,GIZMO_TWO_AXIS_OFFSET,GIZMO_TWO_AXIS_OFFSET);
cci.mat=tm; cci.mat=tm;
render_framework->CreateComponent<MeshComponent>(&cci,square[0]); gma->square=render_framework->CreateComponent<MeshComponent>(&cci,SquarePtr[0]);
} }
{ {
gma=axis+size_t(AXIS::Y);
tm.SetScale(cylinder_scale); tm.SetScale(cylinder_scale);
tm.SetRotation(AxisVector::X,-90); tm.SetRotation(AxisVector::X,-90);
tm.SetTranslation(0,GIZMO_CYLINDER_OFFSET,0); tm.SetTranslation(0,GIZMO_CYLINDER_OFFSET,0);
cci.mat=tm; cci.mat=tm;
render_framework->CreateComponent<MeshComponent>(&cci,cylinder[1]); //Y 向前圆柱 gma->cylinder=render_framework->CreateComponent<MeshComponent>(&cci,CylinderPtr[1]); //Y 向前圆柱
tm.SetScale(one_scale); tm.SetScale(one_scale);
tm.SetTranslation(0,GIZMO_CONE_OFFSET,0); tm.SetTranslation(0,GIZMO_CONE_OFFSET,0);
cci.mat=tm; cci.mat=tm;
render_framework->CreateComponent<MeshComponent>(&cci,cone[1]); //Y 向前圆锥 gma->cone=render_framework->CreateComponent<MeshComponent>(&cci,ConePtr[1]); //Y 向前圆锥
tm.SetScale(square_scale); tm.SetScale(square_scale);
tm.SetTranslation(GIZMO_TWO_AXIS_OFFSET,0,GIZMO_TWO_AXIS_OFFSET); tm.SetTranslation(GIZMO_TWO_AXIS_OFFSET,0,GIZMO_TWO_AXIS_OFFSET);
cci.mat=tm; cci.mat=tm;
render_framework->CreateComponent<MeshComponent>(&cci,square[1]); gma->square=render_framework->CreateComponent<MeshComponent>(&cci,SquarePtr[1]);
} }
} }

2
example/Gizmo/GizmoResource.cpp
View File

@@ -338,7 +338,7 @@ void FreeGizmoResource()
SAFE_CLEAR(gizmo_line.vdm); SAFE_CLEAR(gizmo_line.vdm);
} }
ComponentDataPtr GetGizmoMeshComponentDataPtr(const GizmoShape &shape,const GizmoColor &color) ComponentDataPtr GetGizmoMeshCDP(const GizmoShape &shape,const GizmoColor &color)
{ {
if(!gizmo_rr) if(!gizmo_rr)
return(nullptr); return(nullptr);

2
inc/hgl/graph/module/GraphModuleManager.h
View File

@@ -23,7 +23,7 @@ public:
public: public:
RenderFramework * GetRenderFramework ()const{return render_framework;} ///<取得渲染框架 RenderFramework * GetRenderFramework ()const{return render_framework;} ///<取得渲染框架
VulkanDevice * GetDevice ()const; ///<取得GPU设备 VulkanDevice * GetDevice ()const; ///<取得GPU设备
public: public: