renamed VAF to VF, FMT to PF
This commit is contained in:
@@ -33,8 +33,8 @@ enum class GBufferAttachment
|
||||
ENUM_CLASS_RANGE(Color,Normal)
|
||||
};//
|
||||
|
||||
constexpr VkFormat gbuffer_color_format[size_t(GBufferAttachment::RANGE_SIZE)]={UFMT_RGB565,FMT_RG8UN};
|
||||
constexpr VkFormat gbuffer_depth_format=FMT_D16UN;
|
||||
constexpr VkFormat gbuffer_color_format[size_t(GBufferAttachment::RANGE_SIZE)]={UPF_RGB565,PF_RG8UN};
|
||||
constexpr VkFormat gbuffer_depth_format=PF_D16UN;
|
||||
|
||||
struct alignas(16) PhongPointLight
|
||||
{
|
||||
|
@@ -86,7 +86,7 @@ private:
|
||||
|
||||
bool InitTileTexture()
|
||||
{
|
||||
tile_data=device->CreateTileData( FMT_BC1_RGBAUN, //纹理格式,因VK不支持实时转换,所以提交的数据格式必须与此一致
|
||||
tile_data=device->CreateTileData( PF_BC1_RGBAUN, //纹理格式,因VK不支持实时转换,所以提交的数据格式必须与此一致
|
||||
512,512, //TILE大小
|
||||
tile_list.GetCount()); //TILE需求数量
|
||||
|
||||
@@ -185,8 +185,8 @@ private:
|
||||
render_obj=db->CreateRenderable(tile_count);
|
||||
if(!render_obj)return(false);
|
||||
|
||||
render_obj->Set(VAN::Position,db->CreateVAB(VAF_VEC4,tile_count,vertex_data));
|
||||
render_obj->Set(VAN::TexCoord,db->CreateVAB(VAF_VEC4,tile_count,tex_coord_data));
|
||||
render_obj->Set(VAN::Position,db->CreateVAB(VF_VEC4,tile_count,vertex_data));
|
||||
render_obj->Set(VAN::TexCoord,db->CreateVAB(VF_VEC4,tile_count,tex_coord_data));
|
||||
|
||||
render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline);
|
||||
|
||||
|
@@ -82,7 +82,7 @@ private:
|
||||
auto render_obj=db->CreateRenderable(VERTEX_COUNT);
|
||||
if(!render_obj)return(false);
|
||||
|
||||
if(!render_obj->Set(VAN::Position,db->CreateVAB(VAF_VEC2,VERTEX_COUNT,vertex_data)))return(false);
|
||||
if(!render_obj->Set(VAN::Position,db->CreateVAB(VF_VEC2,VERTEX_COUNT,vertex_data)))return(false);
|
||||
|
||||
renderable_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline);
|
||||
return(true);
|
||||
|
@@ -82,10 +82,10 @@ private:
|
||||
|
||||
bool InitVBO()
|
||||
{
|
||||
vertex_buffer =device->CreateVAB(VAF_VEC2,VERTEX_COUNT,vertex_data);
|
||||
vertex_buffer =device->CreateVAB(VF_VEC2,VERTEX_COUNT,vertex_data);
|
||||
if(!vertex_buffer)return(false);
|
||||
|
||||
tex_coord_buffer=device->CreateVAB(VAF_VEC2,VERTEX_COUNT,tex_coord_data);
|
||||
tex_coord_buffer=device->CreateVAB(VF_VEC2,VERTEX_COUNT,tex_coord_data);
|
||||
if(!tex_coord_buffer)return(false);
|
||||
|
||||
index_buffer =device->CreateIBO16(INDEX_COUNT,index_data);
|
||||
|
@@ -41,10 +41,10 @@ private:
|
||||
RenderList render_list;
|
||||
|
||||
Material * material =nullptr;
|
||||
MaterialParameters * material_instance =nullptr;
|
||||
MaterialInstance * material_instance =nullptr;
|
||||
|
||||
Material * axis_material =nullptr;
|
||||
MaterialParameters * axis_mi =nullptr;
|
||||
MaterialInstance * axis_mi =nullptr;
|
||||
|
||||
PipelineData * pipeline_data =nullptr;
|
||||
Pipeline * axis_pipeline =nullptr;
|
||||
|
@@ -77,7 +77,7 @@ public:
|
||||
|
||||
bool InitOffscreen()
|
||||
{
|
||||
FramebufferInfo fbi(UFMT_RGBA8,OFFSCREEN_SIZE,OFFSCREEN_SIZE);
|
||||
FramebufferInfo fbi(UPF_RGBA8,OFFSCREEN_SIZE,OFFSCREEN_SIZE);
|
||||
|
||||
os.render_taget=device->CreateRenderTarget(&fbi);
|
||||
if(!os.render_taget)return(false);
|
||||
|
@@ -91,8 +91,8 @@ private:
|
||||
|
||||
if(!render_obj)return(false);
|
||||
|
||||
render_obj->Set(VAN::Position,db->CreateVAB(VAF_VEC4,VERTEX_COUNT,vertex_data));
|
||||
render_obj->Set(VAN::TexCoord,db->CreateVAB(VAF_VEC4,VERTEX_COUNT,tex_coord_data));
|
||||
render_obj->Set(VAN::Position,db->CreateVAB(VF_VEC4,VERTEX_COUNT,vertex_data));
|
||||
render_obj->Set(VAN::TexCoord,db->CreateVAB(VF_VEC4,VERTEX_COUNT,tex_coord_data));
|
||||
|
||||
render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline);
|
||||
|
||||
|
@@ -92,8 +92,8 @@ private:
|
||||
Renderable *render_obj=db->CreateRenderable(VERTEX_COUNT);
|
||||
if(!render_obj)return(false);
|
||||
|
||||
if(!render_obj->Set(VAN::Position, db->CreateVAB(VAF_VEC2,VERTEX_COUNT,vertex_data)))return(false);
|
||||
if(!render_obj->Set(VAN::Color, db->CreateVAB(VAF_VEC4,VERTEX_COUNT,color_data)))return(false);
|
||||
if(!render_obj->Set(VAN::Position, db->CreateVAB(VF_VEC2,VERTEX_COUNT,vertex_data)))return(false);
|
||||
if(!render_obj->Set(VAN::Color, db->CreateVAB(VF_VEC4,VERTEX_COUNT,color_data)))return(false);
|
||||
|
||||
render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline);
|
||||
return(true);
|
||||
|
@@ -86,7 +86,7 @@ private:
|
||||
auto render_obj=db->CreateRenderable(VERTEX_COUNT);
|
||||
if(!render_obj)return(false);
|
||||
|
||||
if(!render_obj->Set(VAN::Position,db->CreateVAB(VAF_VEC2,VERTEX_COUNT,vertex_data)))return(false);
|
||||
if(!render_obj->Set(VAN::Position,db->CreateVAB(VF_VEC2,VERTEX_COUNT,vertex_data)))return(false);
|
||||
if(!render_obj->Set(db->CreateIBO16(INDEX_COUNT,index_data)))return(false);
|
||||
|
||||
renderable_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline);
|
||||
|
@@ -118,8 +118,8 @@ private:
|
||||
auto render_obj=db->CreateRenderable(VERTEX_COUNT);
|
||||
if(!render_obj)return(false);
|
||||
|
||||
if(!render_obj->Set(VAN::Position,db->CreateVAB(VAF_VEC2,VERTEX_COUNT,vertex_data)))return(false);
|
||||
if(!render_obj->Set(VAN::TexCoord,db->CreateVAB(VAF_VEC2,VERTEX_COUNT,tex_coord_data)))return(false);
|
||||
if(!render_obj->Set(VAN::Position,db->CreateVAB(VF_VEC2,VERTEX_COUNT,vertex_data)))return(false);
|
||||
if(!render_obj->Set(VAN::TexCoord,db->CreateVAB(VF_VEC2,VERTEX_COUNT,tex_coord_data)))return(false);
|
||||
if(!render_obj->Set(db->CreateIBO16(INDEX_COUNT,index_data)))return(false);
|
||||
|
||||
renderable_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline);
|
||||
|
@@ -87,8 +87,8 @@ private:
|
||||
Renderable *render_obj=db->CreateRenderable(VERTEX_COUNT);
|
||||
if(!render_obj)return(false);
|
||||
|
||||
if(!render_obj->Set(VAN::Position, db->CreateVAB(VAF_VEC2,VERTEX_COUNT,vertex_data)))return(false);
|
||||
if(!render_obj->Set(VAN::Color, db->CreateVAB(VAF_VEC4,VERTEX_COUNT,color_data)))return(false);
|
||||
if(!render_obj->Set(VAN::Position, db->CreateVAB(VF_VEC2,VERTEX_COUNT,vertex_data)))return(false);
|
||||
if(!render_obj->Set(VAN::Color, db->CreateVAB(VF_VEC4,VERTEX_COUNT,color_data)))return(false);
|
||||
|
||||
render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline);
|
||||
|
||||
|
Reference in New Issue
Block a user