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

renamed to render_obj from render_instance

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy)
2022-06-24 21:17:28 +08:00
parent d8d8d97abd
commit e381c3efeb
12 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
example/Vulkan/DrawText.cpp
View File

@@ -14,8 +14,8 @@ private:
TextRender * text_render =nullptr;
TextPrimitive * text_render_obj =nullptr;
Renderable *render_instance =nullptr;
TextPrimitive * text_primitive =nullptr;
Renderable * render_obj =nullptr;
public:
@@ -40,12 +40,12 @@ private:
if(!text_render)
return(false);
text_render_obj=text_render->CreatePrimitive(str);
if(!text_render_obj)
text_primitive=text_render->CreatePrimitive(str);
if(!text_primitive)
return(false);
render_instance=text_render->CreateRenderable(text_render_obj);
if(!render_instance)
render_obj=text_render->CreateRenderable(text_primitive);
if(!render_obj)
return(false);
return(true);
@@ -61,7 +61,7 @@ public:
if(!InitTextRenderable())
return(false);
BuildCommandBuffer(render_instance);
BuildCommandBuffer(render_obj);
return(true);
}
@@ -70,7 +70,7 @@ public:
{
VulkanApplicationFramework::Resize(w,h);
BuildCommandBuffer(render_instance);
BuildCommandBuffer(render_obj);
}
};//class TestApp:public VulkanApplicationFramework

12
example/Vulkan/DrawTile.cpp
View File

@@ -40,8 +40,8 @@ private:
Sampler * sampler =nullptr;
MaterialInstance * material_instance =nullptr;
Primitive * primitive =nullptr;
Renderable *render_instance =nullptr;
Primitive * primitive =nullptr;
Renderable * render_obj =nullptr;
Pipeline * pipeline =nullptr;
@@ -180,9 +180,9 @@ private:
primitive->Set(VAN::Position,db->CreateVBO(VF_V4F,tile_count,position_data));
primitive->Set(VAN::TexCoord,db->CreateVBO(VF_V4F,tile_count,tex_coord_data));
render_instance=db->CreateRenderable(primitive,material_instance,pipeline);
render_obj=db->CreateRenderable(primitive,material_instance,pipeline);
return(render_instance);
return(render_obj);
}
public:
@@ -204,7 +204,7 @@ public:
if(!InitVBO())
return(false);
BuildCommandBuffer(render_instance);
BuildCommandBuffer(render_obj);
return(true);
}
@@ -213,7 +213,7 @@ public:
{
VulkanApplicationFramework::Resize(w,h);
BuildCommandBuffer(render_instance);
BuildCommandBuffer(render_obj);
}
};//class TestApp:public VulkanApplicationFramework

8
example/Vulkan/InstanceTriangle.cpp
View File

@@ -32,7 +32,7 @@ class TestApp:public VulkanApplicationFramework
private:
MaterialInstance * material_instance =nullptr;
Renderable *render_instance =nullptr;
Renderable * render_obj =nullptr;
Pipeline * pipeline =nullptr;
@@ -59,7 +59,7 @@ private:
if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false);
if(!primitive->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false);
render_instance=db->CreateRenderable(primitive,material_instance,pipeline);
render_obj=db->CreateRenderable(primitive,material_instance,pipeline);
return(true);
}
@@ -76,7 +76,7 @@ public:
if(!InitVBO())
return(false);
if(!BuildCommandBuffer(render_instance))
if(!BuildCommandBuffer(render_obj))
return(false);
return(true);
@@ -86,7 +86,7 @@ public:
{
VulkanApplicationFramework::Resize(w,h);
BuildCommandBuffer(render_instance);
BuildCommandBuffer(render_obj);
}
};//class TestApp:public VulkanApplicationFramework

12
example/Vulkan/RectanglePrimitive.cpp
View File

@@ -37,8 +37,8 @@ private:
Texture2D * texture =nullptr;
Sampler * sampler =nullptr;
MaterialInstance * material_instance =nullptr;
Primitive * primitive =nullptr;
Renderable *render_instance =nullptr;
Primitive * primitive =nullptr;
Renderable * render_obj =nullptr;
Pipeline * pipeline =nullptr;
@@ -73,9 +73,9 @@ private:
primitive->Set(VAN::Position,db->CreateVBO(VF_V4F,VERTEX_COUNT,position_data));
primitive->Set(VAN::TexCoord,db->CreateVBO(VF_V4F,VERTEX_COUNT,tex_coord_data));
render_instance=db->CreateRenderable(primitive,material_instance,pipeline);
render_obj=db->CreateRenderable(primitive,material_instance,pipeline);
return(render_instance);
return(render_obj);
}
public:
@@ -91,7 +91,7 @@ public:
if(!InitVBO())
return(false);
BuildCommandBuffer(render_instance);
BuildCommandBuffer(render_obj);
return(true);
}
@@ -100,7 +100,7 @@ public:
{
VulkanApplicationFramework::Resize(w,h);
BuildCommandBuffer(render_instance);
BuildCommandBuffer(render_obj);
}
};//class TestApp:public VulkanApplicationFramework

8
example/Vulkan/first_triangle.cpp
View File

@@ -32,7 +32,7 @@ class TestApp:public VulkanApplicationFramework
private:
MaterialInstance * material_instance =nullptr;
Renderable *render_instance =nullptr;
Renderable * render_obj =nullptr;
Pipeline * pipeline =nullptr;
@@ -59,7 +59,7 @@ private:
if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false);
if(!primitive->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false);
render_instance=db->CreateRenderable(primitive,material_instance,pipeline);
render_obj=db->CreateRenderable(primitive,material_instance,pipeline);
return(true);
}
@@ -76,7 +76,7 @@ public:
if(!InitVBO())
return(false);
if(!BuildCommandBuffer(render_instance))
if(!BuildCommandBuffer(render_obj))
return(false);
return(true);
@@ -86,7 +86,7 @@ public:
{
VulkanApplicationFramework::Resize(w,h);
BuildCommandBuffer(render_instance);
BuildCommandBuffer(render_obj);
}
};//class TestApp:public VulkanApplicationFramework

8
example/Vulkan/second_triangle.cpp
View File

@@ -32,7 +32,7 @@ class TestApp:public VulkanApplicationFramework
private:
MaterialInstance * material_instance =nullptr;
Renderable *render_instance =nullptr;
Renderable * render_obj =nullptr;
Pipeline * pipeline =nullptr;
@@ -61,7 +61,7 @@ private:
if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false);
if(!primitive->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false);
render_instance=db->CreateRenderable(primitive,material_instance,pipeline);
render_obj=db->CreateRenderable(primitive,material_instance,pipeline);
return(true);
}
@@ -78,7 +78,7 @@ public:
if(!InitVBO())
return(false);
if(!BuildCommandBuffer(render_instance))
if(!BuildCommandBuffer(render_obj))
return(false);
return(true);
@@ -88,7 +88,7 @@ public:
{
VulkanApplicationFramework::Resize(w,h);
BuildCommandBuffer(render_instance);
BuildCommandBuffer(render_obj);
}
};//class TestApp:public VulkanApplicationFramework

6
example/Vulkan/third_triangle.cpp
View File

@@ -34,7 +34,7 @@ private:
RenderList * render_list =nullptr;
MaterialInstance * material_instance =nullptr;
Renderable *render_instance =nullptr;
Renderable * render_obj =nullptr;
Pipeline * pipeline =nullptr;
@@ -63,9 +63,9 @@ private:
if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false);
if(!primitive->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false);
render_instance=db->CreateRenderable(primitive,material_instance,pipeline);
render_obj=db->CreateRenderable(primitive,material_instance,pipeline);
render_root.CreateSubNode(render_instance);
render_root.CreateSubNode(render_obj);
render_root.RefreshMatrix();