renamed to CreateMesh from CreateRenderable
This commit is contained in:
@@ -75,7 +75,7 @@ class Mesh
|
||||
|
||||
private:
|
||||
|
||||
friend Mesh *CreateRenderable(Primitive *,MaterialInstance *,Pipeline *);
|
||||
friend Mesh *CreateMesh(Primitive *,MaterialInstance *,Pipeline *);
|
||||
|
||||
Mesh(Primitive *,MaterialInstance *,Pipeline *,MeshDataBuffer *,MeshRenderData *);
|
||||
|
||||
@@ -116,5 +116,5 @@ public:
|
||||
}
|
||||
};//class Mesh
|
||||
|
||||
Mesh *CreateRenderable(Primitive *,MaterialInstance *,Pipeline *);
|
||||
Mesh *CreateMesh(Primitive *,MaterialInstance *,Pipeline *);
|
||||
VK_NAMESPACE_END
|
||||
|
@@ -18,7 +18,7 @@ namespace hgl
|
||||
{
|
||||
protected:
|
||||
|
||||
VulkanDevice * device;
|
||||
VulkanDevice * device;
|
||||
|
||||
CameraInfo * camera_info; ///<相机信息
|
||||
|
||||
|
@@ -86,8 +86,8 @@ namespace hgl
|
||||
const SceneNode * GetParent()const noexcept{return ParentNode;}
|
||||
|
||||
void SetRenderable(Mesh *);
|
||||
Mesh *GetRenderable() noexcept{return render_obj;}
|
||||
const Mesh *GetRenderable()const noexcept{return render_obj;}
|
||||
Mesh * GetRenderable() noexcept{return render_obj;}
|
||||
const Mesh * GetRenderable()const noexcept{return render_obj;}
|
||||
|
||||
SceneNode *Add(SceneNode *sn)
|
||||
{
|
||||
|
@@ -143,8 +143,8 @@ public: //Material
|
||||
|
||||
MaterialInstance * CreateMaterialInstance(const AnsiString &mtl_name,const mtl::MaterialCreateInfo *,const VILConfig *vil_cfg=nullptr);
|
||||
|
||||
Mesh * CreateRenderable(Primitive *r,MaterialInstance *mi,Pipeline *p);
|
||||
Mesh * CreateRenderable(PrimitiveCreater *pc,MaterialInstance *mi,Pipeline *p);
|
||||
Mesh * CreateMesh(Primitive *r,MaterialInstance *mi,Pipeline *p);
|
||||
Mesh * CreateMesh(PrimitiveCreater *pc,MaterialInstance *mi,Pipeline *p);
|
||||
|
||||
Sampler * CreateSampler(VkSamplerCreateInfo *sci=nullptr);
|
||||
Sampler * CreateSampler(Texture *);
|
||||
|
@@ -58,7 +58,7 @@ namespace hgl
|
||||
|
||||
bool Layout(TextPrimitive *tr,const U16String &str);
|
||||
|
||||
Mesh *CreateRenderable(TextPrimitive *text_primitive);
|
||||
Mesh *CreateMesh(TextPrimitive *text_primitive);
|
||||
|
||||
void Release(TextPrimitive *);
|
||||
};//class TextRender
|
||||
|
Reference in New Issue
Block a user