use shorter name of manager/modules....
This commit is contained in:
parent
b47b096039
commit
906aba2459
@ -37,12 +37,12 @@ protected:
|
|||||||
|
|
||||||
GraphModuleManager * module_manager =nullptr;
|
GraphModuleManager * module_manager =nullptr;
|
||||||
|
|
||||||
RenderPassManager * render_pass_manager =nullptr;
|
RenderPassManager * rp_manager =nullptr;
|
||||||
|
|
||||||
TextureManager * texture_manager =nullptr;
|
TextureManager * tex_manager =nullptr;
|
||||||
RenderTargetManager * rt_manager =nullptr;
|
RenderTargetManager * rt_manager =nullptr;
|
||||||
|
|
||||||
SwapchainModule * swapchain_module =nullptr;
|
SwapchainModule * sc_module =nullptr;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
@ -56,11 +56,11 @@ public:
|
|||||||
|
|
||||||
GraphModuleManager * GetModuleManager (){return module_manager;}
|
GraphModuleManager * GetModuleManager (){return module_manager;}
|
||||||
|
|
||||||
RenderPassManager * GetRenderPassManager (){return render_pass_manager;}
|
RenderPassManager * GetRenderPassManager (){return rp_manager;}
|
||||||
TextureManager * GetTextureManager (){return texture_manager;}
|
TextureManager * GetTextureManager (){return tex_manager;}
|
||||||
RenderTargetManager * GetRenderTargetManager (){return rt_manager;}
|
RenderTargetManager * GetRenderTargetManager (){return rt_manager;}
|
||||||
|
|
||||||
SwapchainModule * GetSwapchainModule (){return swapchain_module;}
|
SwapchainModule * GetSwapchainModule (){return sc_module;}
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ namespace hgl
|
|||||||
*/
|
*/
|
||||||
class TileData ///Tile纹理管理
|
class TileData ///Tile纹理管理
|
||||||
{
|
{
|
||||||
TextureManager *texture_manager;
|
TextureManager *tex_manager;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
|
@ -93,21 +93,21 @@ bool RenderFramework::Init(uint w,uint h)
|
|||||||
|
|
||||||
module_manager=new GraphModuleManager(device);
|
module_manager=new GraphModuleManager(device);
|
||||||
|
|
||||||
render_pass_manager=module_manager->GetOrCreate<RenderPassManager>();
|
rp_manager=module_manager->GetOrCreate<RenderPassManager>();
|
||||||
|
|
||||||
if(!render_pass_manager)
|
if(!rp_manager)
|
||||||
return(false);
|
return(false);
|
||||||
|
|
||||||
texture_manager=module_manager->GetOrCreate<TextureManager>();
|
tex_manager=module_manager->GetOrCreate<TextureManager>();
|
||||||
|
|
||||||
if(!texture_manager)
|
if(!tex_manager)
|
||||||
return(false);
|
return(false);
|
||||||
|
|
||||||
rt_manager=new RenderTargetManager(device,texture_manager,render_pass_manager);
|
rt_manager=new RenderTargetManager(device,tex_manager,rp_manager);
|
||||||
module_manager->Registry(rt_manager);
|
module_manager->Registry(rt_manager);
|
||||||
|
|
||||||
swapchain_module=new SwapchainModule(device,texture_manager,rt_manager,render_pass_manager);
|
sc_module=new SwapchainModule(device,tex_manager,rt_manager,rp_manager);
|
||||||
module_manager->Registry(swapchain_module);
|
module_manager->Registry(sc_module);
|
||||||
|
|
||||||
OnResize(w,h);
|
OnResize(w,h);
|
||||||
|
|
||||||
@ -124,7 +124,7 @@ bool RenderFramework::Run(RenderModule *rm)
|
|||||||
if(!win)
|
if(!win)
|
||||||
return(false);
|
return(false);
|
||||||
|
|
||||||
if(!swapchain_module)
|
if(!sc_module)
|
||||||
return(false);
|
return(false);
|
||||||
|
|
||||||
while(win->Update())
|
while(win->Update())
|
||||||
@ -152,7 +152,7 @@ void RenderFramework::OnResize(uint w,uint h)
|
|||||||
|
|
||||||
VkExtent2D ext(w,h);
|
VkExtent2D ext(w,h);
|
||||||
|
|
||||||
swapchain_module->OnResize(ext); //其实swapchain_module并不需要这个
|
sc_module->OnResize(ext); //其实swapchain_module并不需要传递尺寸数据过去
|
||||||
}
|
}
|
||||||
|
|
||||||
void RenderFramework::OnActive(bool)
|
void RenderFramework::OnActive(bool)
|
||||||
@ -177,9 +177,9 @@ bool RenderFramework::RunFrame(RenderModule *rm)
|
|||||||
|
|
||||||
BeginFrame();
|
BeginFrame();
|
||||||
|
|
||||||
swapchain_module->BeginFrame();
|
sc_module->BeginFrame();
|
||||||
{
|
{
|
||||||
RenderCmdBuffer *rcb=swapchain_module->RecordCmdBuffer();
|
RenderCmdBuffer *rcb=sc_module->RecordCmdBuffer();
|
||||||
|
|
||||||
if(rcb)
|
if(rcb)
|
||||||
{
|
{
|
||||||
@ -188,7 +188,7 @@ bool RenderFramework::RunFrame(RenderModule *rm)
|
|||||||
rcb->End();
|
rcb->End();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
swapchain_module->EndFrame();
|
sc_module->EndFrame();
|
||||||
|
|
||||||
EndFrame();
|
EndFrame();
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ namespace hgl
|
|||||||
{
|
{
|
||||||
TileData::TileData(TextureManager *tm,Texture2D *tt,const uint tw,const uint th)
|
TileData::TileData(TextureManager *tm,Texture2D *tt,const uint tw,const uint th)
|
||||||
{
|
{
|
||||||
texture_manager=tm;
|
tex_manager=tm;
|
||||||
|
|
||||||
tile_texture=tt;
|
tile_texture=tt;
|
||||||
|
|
||||||
@ -53,7 +53,7 @@ namespace hgl
|
|||||||
|
|
||||||
tile_bytes=GetImageBytes(tile_texture->GetFormat(),tile_width*tile_height);
|
tile_bytes=GetImageBytes(tile_texture->GetFormat(),tile_width*tile_height);
|
||||||
|
|
||||||
tile_buffer=texture_manager->CreateTransferSourceBuffer(tile_bytes*tile_max_count);
|
tile_buffer=tex_manager->CreateTransferSourceBuffer(tile_bytes*tile_max_count);
|
||||||
|
|
||||||
commit_ptr=nullptr;
|
commit_ptr=nullptr;
|
||||||
}
|
}
|
||||||
@ -80,7 +80,7 @@ namespace hgl
|
|||||||
tile_buffer->Unmap();
|
tile_buffer->Unmap();
|
||||||
commit_ptr=nullptr;
|
commit_ptr=nullptr;
|
||||||
|
|
||||||
if(!texture_manager->ChangeTexture2D(tile_texture,tile_buffer,commit_list))
|
if(!tex_manager->ChangeTexture2D(tile_texture,tile_buffer,commit_list))
|
||||||
return -2;
|
return -2;
|
||||||
|
|
||||||
const int result=commit_list.GetCount();
|
const int result=commit_list.GetCount();
|
||||||
|
@ -17,7 +17,7 @@ TileFont *RenderFramework::CreateTileFont(FontSource *fs,int limit_count)
|
|||||||
|
|
||||||
if(limit_count<=0)
|
if(limit_count<=0)
|
||||||
{
|
{
|
||||||
const VkExtent2D &ext=swapchain_module->GetSwapchainSize();
|
const VkExtent2D &ext=sc_module->GetSwapchainSize();
|
||||||
|
|
||||||
limit_count=(ext.width/height)*(ext.height/height); //按全屏幕放满不一样的字符为上限
|
limit_count=(ext.width/height)*(ext.height/height); //按全屏幕放满不一样的字符为上限
|
||||||
}
|
}
|
||||||
@ -25,7 +25,7 @@ TileFont *RenderFramework::CreateTileFont(FontSource *fs,int limit_count)
|
|||||||
if(!fs)
|
if(!fs)
|
||||||
return(nullptr);
|
return(nullptr);
|
||||||
|
|
||||||
TileData *td=texture_manager->CreateTileData(UPF_R8,height,height,limit_count);
|
TileData *td=tex_manager->CreateTileData(UPF_R8,height,height,limit_count);
|
||||||
|
|
||||||
if(!td)
|
if(!td)
|
||||||
return nullptr;
|
return nullptr;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user