renamed MaterialInstance to MaterialParameters.
This commit is contained in:
@@ -35,7 +35,7 @@ private:
|
||||
|
||||
Camera cam;
|
||||
|
||||
MaterialInstance * material_instance =nullptr;
|
||||
MaterialParameters * material_instance =nullptr;
|
||||
RenderableInstance *render_instance =nullptr;
|
||||
GPUBuffer * ubo_camera_info =nullptr;
|
||||
GPUBuffer * ubo_color_material =nullptr;
|
||||
|
@@ -37,7 +37,7 @@ private:
|
||||
SceneNode render_root;
|
||||
RenderList render_list;
|
||||
|
||||
MaterialInstance * material_instance =nullptr;
|
||||
MaterialParameters * material_instance =nullptr;
|
||||
Pipeline * pipeline_solid =nullptr;
|
||||
|
||||
GPUBuffer * ubo_atomsphere =nullptr;
|
||||
|
@@ -70,7 +70,7 @@ private:
|
||||
struct SubpassParam
|
||||
{
|
||||
Material * material;
|
||||
MaterialInstance * material_instance;
|
||||
MaterialParameters * material_instance;
|
||||
Pipeline * pipeline_fan;
|
||||
Pipeline * pipeline_triangles;
|
||||
};//
|
||||
|
@@ -27,7 +27,7 @@ class TestApp:public VulkanApplicationFramework
|
||||
private:
|
||||
|
||||
Sampler * sampler =nullptr;
|
||||
MaterialInstance * material_instance =nullptr;
|
||||
MaterialParameters * material_instance =nullptr;
|
||||
GPUBuffer * ubo_camera_info =nullptr;
|
||||
GPUBuffer * ubo_color =nullptr;
|
||||
|
||||
|
@@ -39,7 +39,7 @@ class TestApp:public VulkanApplicationFramework
|
||||
private:
|
||||
|
||||
Sampler * sampler =nullptr;
|
||||
MaterialInstance * material_instance =nullptr;
|
||||
MaterialParameters * material_instance =nullptr;
|
||||
Renderable * render_obj =nullptr;
|
||||
RenderableInstance *render_instance =nullptr;
|
||||
GPUBuffer * ubo_camera_info =nullptr;
|
||||
|
@@ -26,7 +26,7 @@ private:
|
||||
|
||||
Camera cam;
|
||||
|
||||
MaterialInstance * material_instance =nullptr;
|
||||
MaterialParameters * material_instance =nullptr;
|
||||
RenderableInstance *renderable_instance =nullptr;
|
||||
GPUBuffer * ubo_camera_info =nullptr;
|
||||
|
||||
|
@@ -29,7 +29,7 @@ private:
|
||||
RenderList render_list;
|
||||
|
||||
Material * material =nullptr;
|
||||
MaterialInstance * material_instance =nullptr;
|
||||
MaterialParameters * material_instance =nullptr;
|
||||
|
||||
Renderable * ro_rectangle =nullptr;
|
||||
Renderable * ro_circle =nullptr;
|
||||
|
@@ -27,7 +27,7 @@ private:
|
||||
struct MDP
|
||||
{
|
||||
Material * material =nullptr;
|
||||
MaterialInstance * material_instance =nullptr;
|
||||
MaterialParameters * material_instance =nullptr;
|
||||
Pipeline * pipeline =nullptr;
|
||||
}m3d,m2d;
|
||||
|
||||
|
@@ -54,7 +54,7 @@ private:
|
||||
|
||||
struct MIR
|
||||
{
|
||||
MaterialInstance * material_instance =nullptr;
|
||||
MaterialParameters * material_instance =nullptr;
|
||||
RenderableInstance *renderable_instance =nullptr;
|
||||
}mir_nearest,mir_linear,mir_nearest_hq,mir_linear_hq;
|
||||
|
||||
|
@@ -41,10 +41,10 @@ private:
|
||||
RenderList render_list;
|
||||
|
||||
Material * material =nullptr;
|
||||
MaterialInstance * material_instance =nullptr;
|
||||
MaterialParameters * material_instance =nullptr;
|
||||
|
||||
Material * axis_material =nullptr;
|
||||
MaterialInstance * axis_mi =nullptr;
|
||||
MaterialParameters * axis_mi =nullptr;
|
||||
|
||||
PipelineData * pipeline_data =nullptr;
|
||||
Pipeline * axis_pipeline =nullptr;
|
||||
|
@@ -15,7 +15,7 @@ class TestApp:public CameraAppFramework
|
||||
{
|
||||
Camera cam;
|
||||
|
||||
MaterialInstance * material_instance =nullptr;
|
||||
MaterialParameters * material_instance =nullptr;
|
||||
GPUBuffer * ubo_camera_info =nullptr;
|
||||
};
|
||||
|
||||
|
@@ -38,7 +38,7 @@ private:
|
||||
|
||||
Texture2D * texture =nullptr;
|
||||
Sampler * sampler =nullptr;
|
||||
MaterialInstance * material_instance =nullptr;
|
||||
MaterialParameters * material_instance =nullptr;
|
||||
Renderable * render_obj =nullptr;
|
||||
RenderableInstance *render_instance =nullptr;
|
||||
GPUBuffer * ubo_camera_info =nullptr;
|
||||
|
@@ -33,7 +33,7 @@ private:
|
||||
|
||||
Camera cam;
|
||||
|
||||
MaterialInstance * material_instance =nullptr;
|
||||
MaterialParameters * material_instance =nullptr;
|
||||
RenderableInstance *render_instance =nullptr;
|
||||
GPUBuffer * ubo_camera_info =nullptr;
|
||||
|
||||
|
@@ -36,7 +36,7 @@ private:
|
||||
|
||||
Camera cam;
|
||||
|
||||
MaterialInstance * material_instance =nullptr;
|
||||
MaterialParameters * material_instance =nullptr;
|
||||
RenderableInstance *renderable_instance =nullptr;
|
||||
GPUBuffer * ubo_camera_info =nullptr;
|
||||
|
||||
|
@@ -51,7 +51,7 @@ private:
|
||||
|
||||
Texture2D * texture =nullptr;
|
||||
Sampler * sampler =nullptr;
|
||||
MaterialInstance * material_instance =nullptr;
|
||||
MaterialParameters * material_instance =nullptr;
|
||||
RenderableInstance *renderable_instance =nullptr;
|
||||
GPUBuffer * ubo_camera_info =nullptr;
|
||||
Pipeline * pipeline =nullptr;
|
||||
|
@@ -36,7 +36,7 @@ private:
|
||||
SceneNode render_root;
|
||||
RenderList render_list;
|
||||
|
||||
MaterialInstance * material_instance =nullptr;
|
||||
MaterialParameters * material_instance =nullptr;
|
||||
RenderableInstance *render_instance =nullptr;
|
||||
GPUBuffer * ubo_camera_info =nullptr;
|
||||
|
||||
|
Reference in New Issue
Block a user