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

统一名称

Browse Source
This commit is contained in:
hyzboy 2019-06-17 21:59:54 +08:00
parent c84b522703
commit 0d141385dd
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
example/Vulkan/InlineGeometryScene.cpp
View File

@ -71,12 +71,12 @@ private:
pgci.color.Set(0.75,0,0,1);
pgci.side_color.Set(1,0,0,1);
ro_plane_grid=CreatePlaneGrid(db,material,&pgci);
ro_plane_grid=CreateRenderablePlaneGrid(db,material,&pgci);
}
{
struct CubeCreateInfo cci;
ro_cube=CreateCube(db,material,&cci);
ro_cube=CreateRenderableCube(db,material,&cci);
}
{
@ -87,7 +87,7 @@ private:
DomeCreateInfo dci;
dci.radius=100;
dci.numberSlices=16;
dci.numberSlices=32;
ro_dome=CreateRenderableDome(db,material,&dci);
}
@ -170,8 +170,8 @@ private:
render_root.Add(db->CreateRenderableInstance(pipeline_line,descriptor_sets,ro_plane_grid));
render_root.Add(db->CreateRenderableInstance(pipeline_twoside,descriptor_sets,ro_dome));
render_root.Add(db->CreateRenderableInstance(pipeline_twoside,descriptor_sets,ro_torus));
render_root.Add(db->CreateRenderableInstance(pipeline_solid,descriptor_sets,ro_cube ),translate(-10, 0,10)*scale(10,10,10));
render_root.Add(db->CreateRenderableInstance(pipeline_solid,descriptor_sets,ro_sphere ),translate( 10, 0,10)*scale(10,10,10));
render_root.Add(db->CreateRenderableInstance(pipeline_solid,descriptor_sets,ro_cube ),translate(-10, 0, 5)*scale(10,10,10));
render_root.Add(db->CreateRenderableInstance(pipeline_solid,descriptor_sets,ro_sphere ),translate( 10, 0, 5)*scale(10,10,10));
render_root.Add(db->CreateRenderableInstance(pipeline_solid,descriptor_sets,ro_cylinder ),translate( 0, 16, 0));
render_root.Add(db->CreateRenderableInstance(pipeline_solid,descriptor_sets,ro_cone ),translate( 0,-16, 0));

4
inc/hgl/graph/InlineGeometry.h
View File

@ -58,7 +58,7 @@ namespace hgl
Color4f side_color; //边界线条颜色
};//struct PlaneGridCreateInfo
vulkan::Renderable *CreatePlaneGrid(SceneDB *db,vulkan::Material *mtl,const PlaneGridCreateInfo *pgci);
vulkan::Renderable *CreateRenderablePlaneGrid(SceneDB *db,vulkan::Material *mtl,const PlaneGridCreateInfo *pgci);
struct PlaneCreateInfo
{
@ -75,7 +75,7 @@ namespace hgl
/**
* 创建一个中心坐标为0,0,0，长宽高为1的立方体
*/
vulkan::Renderable *CreateCube(SceneDB *db,vulkan::Material *mtl,const CubeCreateInfo *cci);
vulkan::Renderable *CreateRenderableCube(SceneDB *db,vulkan::Material *mtl,const CubeCreateInfo *cci);
/**
* 创建一个球心坐标为0,0,0，半径为1的球体

6
src/RenderDevice/Vulkan/VKDevice.cpp
View File

@ -262,9 +262,6 @@ bool Device::SubmitDraw(const VkCommandBuffer *cmd_bufs,const uint32_t count)
VkResult result=vkQueueSubmit(attr->graphics_queue,1,&submit_info,fence);
if(++current_fence==swap_chain_count)
current_fence=0;
return(result==VK_SUCCESS);
}
@ -275,6 +272,9 @@ bool Device::Wait(bool wait_all,uint64_t time_out)
vkWaitForFences(attr->device,1,&fence,wait_all,time_out);
vkResetFences(attr->device,1,&fence);
if(++current_fence==swap_chain_count)
current_fence=0;
return(true);
}

2
src/RenderDevice/Vulkan/VKDeviceCreater.cpp
View File

@ -102,7 +102,7 @@ namespace
swapchain_ci.sType=VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR;
swapchain_ci.pNext=nullptr;
swapchain_ci.surface=rsa->surface;
swapchain_ci.minImageCount=rsa->surface_caps.minImageCount;
swapchain_ci.minImageCount=3;//rsa->surface_caps.minImageCount;
swapchain_ci.imageFormat=rsa->format;
swapchain_ci.imageExtent=rsa->swapchain_extent;
swapchain_ci.preTransform=rsa->preTransform;