the change don't have any effect.
This commit is contained in:
parent
6f1466f295
commit
dcda5b0fac
@ -33,7 +33,7 @@ enum class GBufferAttachment
|
|||||||
ENUM_CLASS_RANGE(Color,Normal)
|
ENUM_CLASS_RANGE(Color,Normal)
|
||||||
};//
|
};//
|
||||||
|
|
||||||
constexpr VkFormat gbuffer_color_format[size_t(GBufferAttachment::RANGE_SIZE)]={UPF_RGB565,PF_RG8UN};
|
constexpr VkFormat gbuffer_color_format[size_t(GBufferAttachment::RANGE_SIZE)]={UPF_RGB565,UPF_RG8};
|
||||||
constexpr VkFormat gbuffer_depth_format=PF_D16UN;
|
constexpr VkFormat gbuffer_depth_format=PF_D16UN;
|
||||||
|
|
||||||
struct alignas(16) PhongPointLight
|
struct alignas(16) PhongPointLight
|
||||||
@ -84,9 +84,10 @@ private:
|
|||||||
*ro_sphere,
|
*ro_sphere,
|
||||||
*ro_torus,
|
*ro_torus,
|
||||||
*ro_cylinder,
|
*ro_cylinder,
|
||||||
*ro_cone,
|
*ro_cone,
|
||||||
|
*ro_gbc_plane,
|
||||||
*ro_gbc_plane;
|
*ro_axis;
|
||||||
|
|
||||||
RenderableInstance *ro_gbc_plane_ri;
|
RenderableInstance *ro_gbc_plane_ri;
|
||||||
|
|
||||||
Sampler * sampler=nullptr;
|
Sampler * sampler=nullptr;
|
||||||
@ -314,7 +315,7 @@ private:
|
|||||||
{
|
{
|
||||||
CreateRenderObject(sp->material);
|
CreateRenderObject(sp->material);
|
||||||
render_root.CreateSubNode( scale(100,100,1), db->CreateRenderableInstance(ro_plane ,sp->material_instance,sp->pipeline_fan ));
|
render_root.CreateSubNode( scale(100,100,1), db->CreateRenderableInstance(ro_plane ,sp->material_instance,sp->pipeline_fan ));
|
||||||
render_root.CreateSubNode(translate(0,0,0), db->CreateRenderableInstance(ro_torus ,sp->material_instance,sp->pipeline_triangles));
|
render_root.CreateSubNode( db->CreateRenderableInstance(ro_torus ,sp->material_instance,sp->pipeline_triangles));
|
||||||
render_root.CreateSubNode( scale(20,20,20), db->CreateRenderableInstance(ro_sphere ,sp->material_instance,sp->pipeline_triangles));
|
render_root.CreateSubNode( scale(20,20,20), db->CreateRenderableInstance(ro_sphere ,sp->material_instance,sp->pipeline_triangles));
|
||||||
render_root.CreateSubNode(translate(-30, 0,10)*scale(10,10,10), db->CreateRenderableInstance(ro_cube ,sp->material_instance,sp->pipeline_triangles));
|
render_root.CreateSubNode(translate(-30, 0,10)*scale(10,10,10), db->CreateRenderableInstance(ro_cube ,sp->material_instance,sp->pipeline_triangles));
|
||||||
render_root.CreateSubNode(translate( 30, 30,10)*scale(1,1,2), db->CreateRenderableInstance(ro_cylinder ,sp->material_instance,sp->pipeline_triangles));
|
render_root.CreateSubNode(translate( 30, 30,10)*scale(1,1,2), db->CreateRenderableInstance(ro_cylinder ,sp->material_instance,sp->pipeline_triangles));
|
||||||
@ -378,9 +379,9 @@ public:
|
|||||||
const double timer=GetDoubleTime();
|
const double timer=GetDoubleTime();
|
||||||
|
|
||||||
// White
|
// White
|
||||||
lights.position = Vector4f(0.0f, 0.0f, 50.0f, 0.0f);
|
lights.position = Vector4f(0.0f, 0.0f, 25.0f, 0.0f);
|
||||||
lights.color = Vector4f(1.0f);
|
lights.color = Vector4f(15.0f);
|
||||||
lights.radius = 15.0f;
|
lights.radius = 155.0f;
|
||||||
|
|
||||||
lights.position.x = sin(hgl_rad2deg(timer/100)) * 100.0f;
|
lights.position.x = sin(hgl_rad2deg(timer/100)) * 100.0f;
|
||||||
lights.position.y = cos(hgl_rad2deg(timer/100)) * 100.0f;
|
lights.position.y = cos(hgl_rad2deg(timer/100)) * 100.0f;
|
||||||
|
@ -149,6 +149,9 @@ inline const uint32_t GetMipLevel(const VkExtent3D &ext)
|
|||||||
return hgl::GetMipLevel(ext.width,ext.height,ext.depth);
|
return hgl::GetMipLevel(ext.width,ext.height,ext.depth);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 索引类型,等同于VkIndexType
|
||||||
|
*/
|
||||||
enum IndexType
|
enum IndexType
|
||||||
{
|
{
|
||||||
U16=0,
|
U16=0,
|
||||||
|
2
res
2
res
@ -1 +1 @@
|
|||||||
Subproject commit 5a45a9ec3c13fe60453b4d40571fda2d912dbc0e
|
Subproject commit c279762326b8ca91368cb4a607230de5d9d3ff79
|
Loading…
x
Reference in New Issue
Block a user