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

修复gizmo用错材质的问题

Browse Source
This commit is contained in:
hyzboy
2025-07-06 13:29:48 +08:00
parent d6afed4e8d
commit 63e44d7363
4 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
example/Gizmo/GizmoResource.cpp
View File

@@ -28,15 +28,15 @@ namespace
{
static RenderFramework *render_framework=nullptr;
static RenderResource * gizmo_rr=nullptr;
static MaterialInstance *gizmo_mi[size_t(GizmoColor::RANGE_SIZE)]{};
struct GizmoResource
{
Material * mtl;
Pipeline * pipeline;
VertexDataManager * vdm;
Material * mtl;
MaterialInstance * mi[size_t(GizmoColor::RANGE_SIZE)];
Pipeline * pipeline;
VertexDataManager * vdm;
PrimitiveCreater * prim_creater;
PrimitiveCreater * prim_creater;
};
static GizmoResource gizmo_line{};
@@ -56,7 +56,7 @@ namespace
{
prim=p;
mesh=CreateMesh(prim,gizmo_mi[0],gizmo_triangle.pipeline);
mesh=CreateMesh(prim,gizmo_triangle.mi[0],gizmo_triangle.pipeline);
mcd=new MeshComponentData(mesh);
cdp=mcd;
}
@@ -90,9 +90,9 @@ namespace
{
color=GetColor4f(gizmo_color[i],1.0);
gizmo_mi[i]=gizmo_rr->CreateMaterialInstance(gr->mtl,nullptr,&color);
gr->mi[i]=gizmo_rr->CreateMaterialInstance(gr->mtl,nullptr,&color);
if(!gizmo_mi[i])
if(!gr->mi[i])
return(false);
}
@@ -324,11 +324,11 @@ void FreeGizmoResource()
SAFE_CLEAR(gizmo_line.vdm);
}
MaterialInstance *GetGizmoMI(const GizmoColor &color)
MaterialInstance *GetGizmoMI3D(const GizmoColor &color)
{
RANGE_CHECK_RETURN_NULLPTR(color)
return gizmo_mi[size_t(color)];
return gizmo_triangle.mi[size_t(color)];
}
ComponentDataPtr GetGizmoMeshCDP(const GizmoShape &shape)