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

renamed Renderable to Mesh

Browse Source
This commit is contained in:
hyzboy
2025-05-18 02:03:16 +08:00
parent 692eeff4a3
commit 014fce2c8e
44 changed files with 91 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
example/2dVector/LerpLine.cpp
View File

@@ -38,7 +38,7 @@ class TestApp:public VulkanApplicationFramework
private:
MaterialInstance * material_instance =nullptr;
Renderable * render_obj =nullptr;
Mesh * render_obj =nullptr;
Pipeline * pipeline =nullptr;

2
example/2dVector/line.cpp
View File

@@ -36,7 +36,7 @@ private:
Camera cam;
MaterialInstance * material_instance =nullptr;
Renderable * render_obj =nullptr;
Mesh * render_obj =nullptr;
DeviceBuffer * ubo_camera_info =nullptr;
DeviceBuffer * ubo_color_material =nullptr;
DeviceBuffer * ubo_line_config =nullptr;

2
example/2dVector/roundbox.cpp
View File

@@ -42,7 +42,7 @@ private:
Camera cam;
MaterialInstance * material_instance =nullptr;
Renderable * render_obj =nullptr;
Mesh * render_obj =nullptr;
DeviceBuffer * ubo_camera_info =nullptr;
DeviceBuffer * ubo_rb_config =nullptr;

8
example/Basic/BillboardTest.cpp
View File

@@ -38,7 +38,7 @@ private:
MaterialInstance * mi_billboard =nullptr;
Pipeline * pipeline_billboard =nullptr;
Renderable * ro_billboard =nullptr;
Mesh * ro_billboard =nullptr;
Texture2D * texture =nullptr;
Sampler * sampler =nullptr;
@@ -110,13 +110,13 @@ private:
return(true);
}
Renderable *Add(Primitive *r,MaterialInstance *mi,Pipeline *p)
Mesh *Add(Primitive *r,MaterialInstance *mi,Pipeline *p)
{
Renderable *ri=db->CreateRenderable(r,mi,p);
Mesh *ri=db->CreateRenderable(r,mi,p);
if(!ri)
{
LOG_ERROR(OS_TEXT("Create Renderable failed."));
LOG_ERROR(OS_TEXT("Create Mesh failed."));
return(nullptr);
}

2
example/Basic/auto_instance.cpp
View File

@@ -38,7 +38,7 @@ private:
SceneNode render_root;
MaterialInstance * material_instance =nullptr;
Renderable * render_obj =nullptr;
Mesh * render_obj =nullptr;
Pipeline * pipeline =nullptr;

2
example/Basic/auto_merge_material_instance.cpp
View File

@@ -38,7 +38,7 @@ private:
struct
{
MaterialInstance * mi;
Renderable * r;
Mesh * r;
}render_obj[DRAW_OBJECT_COUNT]{};
Pipeline * pipeline =nullptr;

2
example/Basic/draw_triangle_in_NDC.cpp
View File

@@ -68,7 +68,7 @@ private:
#endif
MaterialInstance * material_instance =nullptr;
Renderable * render_obj =nullptr;
Mesh * render_obj =nullptr;
Pipeline * pipeline =nullptr;

2
example/Basic/draw_triangle_use_UBO.cpp
View File

@@ -38,7 +38,7 @@ private:
Color4f clear_color =Color4f(0.2f,0.2f,0.2f,1.0f);
MaterialInstance * material_instance =nullptr;
Renderable * render_obj =nullptr;
Mesh * render_obj =nullptr;
Pipeline * pipeline =nullptr;

2
example/Basic/rf_test.cpp
View File

@@ -34,7 +34,7 @@ private:
Color4f clear_color =Color4f(0.2f,0.2f,0.2f,1.0f);
MaterialInstance * material_instance =nullptr;
Renderable * render_obj =nullptr;
Mesh * render_obj =nullptr;
Pipeline * pipeline =nullptr;

2
example/GUI/DrawText.cpp
View File

@@ -15,7 +15,7 @@ private:
TextRender * text_render =nullptr;
TextPrimitive * text_primitive =nullptr;
Renderable * render_obj =nullptr;
Mesh * render_obj =nullptr;
public:

2
example/Gizmo/Gizmo.h
View File

@@ -34,7 +34,7 @@ enum class GizmoShape:uint
bool InitGizmoResource(RenderResource *);
void FreeGizmoResource();
Renderable *GetGizmoRenderable(const GizmoShape &shape,const GizmoColor &color);
Mesh *GetGizmoRenderable(const GizmoShape &shape,const GizmoColor &color);
StaticMesh *GetGizmoMoveStaticMesh();
StaticMesh *GetGizmoScaleStaticMesh();

8
example/Gizmo/Gizmo3DMove.cpp
View File

@@ -45,22 +45,22 @@ void ClearGizmoMoveStaticMesh()
bool InitGizmoMoveStaticMesh()
{
Renderable *sphere=GetGizmoRenderable(GizmoShape::Sphere,GizmoColor::White);
Renderable *cylinder[3]
Mesh *sphere=GetGizmoRenderable(GizmoShape::Sphere,GizmoColor::White);
Mesh *cylinder[3]
{
GetGizmoRenderable(GizmoShape::Cylinder,GizmoColor::Red),
GetGizmoRenderable(GizmoShape::Cylinder,GizmoColor::Green),
GetGizmoRenderable(GizmoShape::Cylinder,GizmoColor::Blue),
};
Renderable *cone[3]
Mesh *cone[3]
{
GetGizmoRenderable(GizmoShape::Cone,GizmoColor::Red),
GetGizmoRenderable(GizmoShape::Cone,GizmoColor::Green),
GetGizmoRenderable(GizmoShape::Cone,GizmoColor::Blue),
};
Renderable *circle[3]=
Mesh *circle[3]=
{
GetGizmoRenderable(GizmoShape::Circle,GizmoColor::Red),
GetGizmoRenderable(GizmoShape::Circle,GizmoColor::Green),

2
example/Gizmo/Gizmo3DRotate.cpp
View File

@@ -22,7 +22,7 @@ void ClearGizmoRotateStaticMesh()
bool InitGizmoRotateStaticMesh()
{
Renderable *torus[4]
Mesh *torus[4]
{
GetGizmoRenderable(GizmoShape::Torus,GizmoColor::Red),
GetGizmoRenderable(GizmoShape::Torus,GizmoColor::Green),

8
example/Gizmo/Gizmo3DScale.cpp
View File

@@ -45,22 +45,22 @@ void ClearGizmoScaleStaticMesh()
bool InitGizmoScaleStaticMesh()
{
Renderable *center_cube=GetGizmoRenderable(GizmoShape::Cube,GizmoColor::White);
Renderable *cylinder[3]
Mesh *center_cube=GetGizmoRenderable(GizmoShape::Cube,GizmoColor::White);
Mesh *cylinder[3]
{
GetGizmoRenderable(GizmoShape::Cylinder,GizmoColor::Red),
GetGizmoRenderable(GizmoShape::Cylinder,GizmoColor::Green),
GetGizmoRenderable(GizmoShape::Cylinder,GizmoColor::Blue),
};
Renderable *cube[3]
Mesh *cube[3]
{
GetGizmoRenderable(GizmoShape::Cube,GizmoColor::Red),
GetGizmoRenderable(GizmoShape::Cube,GizmoColor::Green),
GetGizmoRenderable(GizmoShape::Cube,GizmoColor::Blue),
};
Renderable *square[3]=
Mesh *square[3]=
{
GetGizmoRenderable(GizmoShape::Square,GizmoColor::Red),
GetGizmoRenderable(GizmoShape::Square,GizmoColor::Green),

4
example/Gizmo/GizmoResource.cpp
View File

@@ -43,7 +43,7 @@ namespace
{
Primitive *prim;
Renderable *renderable[size_t(GizmoColor::RANGE_SIZE)];
Mesh *renderable[size_t(GizmoColor::RANGE_SIZE)];
};
GizmoRenderable gizmo_rederable[size_t(GizmoShape::RANGE_SIZE)]{};
@@ -306,7 +306,7 @@ void FreeGizmoResource()
SAFE_CLEAR(gizmo_line.vdm);
}
Renderable *GetGizmoRenderable(const GizmoShape &shape,const GizmoColor &color)
Mesh *GetGizmoRenderable(const GizmoShape &shape,const GizmoColor &color)
{
if(!gizmo_rr)
return(nullptr);

2
example/Gizmo/GizmoResource.h
View File

@@ -35,7 +35,7 @@ constexpr const float GIZMO_CYLINDER_OFFSET =GIZMO_CYLINDER_HALF_LENGTH+GIZM
constexpr const float GIZMO_TWO_AXIS_OFFSET =5.0F; ///<二轴调节点偏移量(方片或圆)
Renderable *GetGizmoRenderable(const GizmoShape &gs,const GizmoColor &);
Mesh *GetGizmoRenderable(const GizmoShape &gs,const GizmoColor &);
StaticMesh *CreateGizmoStaticMesh(SceneNode *);

4
example/Gizmo/MetricCellsGrid.cpp
View File

@@ -93,9 +93,9 @@ private:
return ro_plane;
}
Renderable *Add(MaterialInstance *mi,const Matrix4f &mat)
Mesh *Add(MaterialInstance *mi,const Matrix4f &mat)
{
Renderable *ri=db->CreateRenderable(ro_plane,mi,pipeline);
Mesh *ri=db->CreateRenderable(ro_plane,mi,pipeline);
if(!ri)
return(nullptr);

4
example/Gizmo/PlaneGrid3D.cpp
View File

@@ -74,9 +74,9 @@ private:
return prim_plane_grid;
}
Renderable *Add(MaterialInstance *mi,const Matrix4f &mat)
Mesh *Add(MaterialInstance *mi,const Matrix4f &mat)
{
Renderable *ri=db->CreateRenderable(prim_plane_grid,mi,pipeline);
Mesh *ri=db->CreateRenderable(prim_plane_grid,mi,pipeline);
if(!ri)
return(nullptr);

6
example/Gizmo/RayPicking.cpp
View File

@@ -92,13 +92,13 @@ private:
return(true);
}
Renderable *Add(Primitive *r,MaterialInstance *mi,Pipeline *p)
Mesh *Add(Primitive *r,MaterialInstance *mi,Pipeline *p)
{
Renderable *ri=db->CreateRenderable(r,mi,p);
Mesh *ri=db->CreateRenderable(r,mi,p);
if(!ri)
{
LOG_ERROR(OS_TEXT("Create Renderable failed."));
LOG_ERROR(OS_TEXT("Create Mesh failed."));
return(nullptr);
}

6
example/LightBasic/BlinnPhongDirectionLight.cpp
View File

@@ -243,7 +243,7 @@ private:
return(true);
}
Renderable *Add(Primitive *r,MaterialInstance *mi,Pipeline *p,const Matrix4f &mat=Identity4f)
Mesh *Add(Primitive *r,MaterialInstance *mi,Pipeline *p,const Matrix4f &mat=Identity4f)
{
if(!r)
return(nullptr);
@@ -252,11 +252,11 @@ private:
if(!p)
return(nullptr);
Renderable *ri=db->CreateRenderable(r,mi,p);
Mesh *ri=db->CreateRenderable(r,mi,p);
if(!ri)
{
LOG_ERROR("Create Renderable failed! Primitive: "+r->GetName());
LOG_ERROR("Create Mesh failed! Primitive: "+r->GetName());
return(nullptr);
}

2
example/Texture/texture_quad.cpp
View File

@@ -44,7 +44,7 @@ private:
Sampler * sampler =nullptr;
Material * material =nullptr;
MaterialInstance * material_instance =nullptr;
Renderable * render_obj =nullptr;
Mesh * render_obj =nullptr;
Pipeline * pipeline =nullptr;
private:

2
example/Texture/texture_rect.cpp
View File

@@ -40,7 +40,7 @@ private:
Sampler * sampler =nullptr;
Material * material =nullptr;
MaterialInstance * material_instance =nullptr;
Renderable * render_obj =nullptr;
Mesh * render_obj =nullptr;
Pipeline * pipeline =nullptr;
private:

2
example/Texture/texture_rect_array.cpp
View File

@@ -61,7 +61,7 @@ private:
struct
{
MaterialInstance * mi;
Renderable * r;
Mesh * r;
}render_obj[TexCount]{};
private:

8
example/common/VulkanAppFramework.h
View File

@@ -220,7 +220,7 @@ public:
}
}
bool BuildCommandBuffer(RenderCmdBuffer *cb,Framebuffer *fbo,Renderable *ri)
bool BuildCommandBuffer(RenderCmdBuffer *cb,Framebuffer *fbo,Mesh *ri)
{
if(!ri)return(false);
@@ -238,7 +238,7 @@ public:
return(true);
}
bool BuildCommandBuffer(uint32_t index,Renderable *ri)
bool BuildCommandBuffer(uint32_t index,Mesh *ri)
{
if(!ri)return(false);
@@ -246,7 +246,7 @@ public:
sc_render_target->GetFramebuffer(),ri);
}
bool BuildCommandBuffer(Renderable *ri)
bool BuildCommandBuffer(Mesh *ri)
{
if(!ri)return(false);
@@ -256,7 +256,7 @@ public:
return(true);
}
bool BuildCurrentCommandBuffer(Renderable *ri)
bool BuildCurrentCommandBuffer(Mesh *ri)
{
if(!ri)return(false);