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-07-08 18:18:35 +08:00
parent 2e42bc0d0f
commit e4a3559aaa
3 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
example/Vulkan/Deferred.cpp
View File

@ -238,7 +238,36 @@ private:
texture.color =vulkan::LoadTGATexture(OS_TEXT("cardboardPlainStain.tga"),device); texture.color =vulkan::LoadTGATexture(OS_TEXT("cardboardPlainStain.tga"),device);
texture.normal =vulkan::LoadTGATexture(OS_TEXT("APOCWALL029_NRM.tga"),device); texture.normal =vulkan::LoadTGATexture(OS_TEXT("APOCWALL029_NRM.tga"),device);
texture.specular=vulkan::LoadTGATexture(OS_TEXT("APOCWALL029_SPEC.tga"),device); texture.specular=vulkan::LoadTGATexture(OS_TEXT("APOCWALL029_SPEC.tga"),device);
VkSamplerCreateInfo sampler_create_info;
sampler_create_info.sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO;
sampler_create_info.pNext = nullptr;
sampler_create_info.flags = 0;
sampler_create_info.magFilter = VK_FILTER_LINEAR;
sampler_create_info.minFilter = VK_FILTER_LINEAR;
sampler_create_info.mipmapMode = VK_SAMPLER_MIPMAP_MODE_LINEAR;
sampler_create_info.addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
sampler_create_info.addressModeV = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
sampler_create_info.addressModeW = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
sampler_create_info.mipLodBias = 0.0f;
sampler_create_info.anisotropyEnable = false;
sampler_create_info.maxAnisotropy = 0;
sampler_create_info.compareEnable = false;
sampler_create_info.compareOp = VK_COMPARE_OP_NEVER;
sampler_create_info.minLod = 0.0f;
sampler_create_info.maxLod = 1.0f;
sampler_create_info.borderColor = VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK;
sampler_create_info.unnormalizedCoordinates = false;
sampler=device->CreateSampler(&sampler_create_info);
sp_gbuffer.desc_sets->BindSampler(sp_gbuffer.material->GetSampler("TextureColor"),texture.color,sampler);
sp_gbuffer.desc_sets->BindSampler(sp_gbuffer.material->GetSampler("TextureNormal"),texture.normal,sampler);
InitCameraUBO(sp_gbuffer.desc_sets,sp_gbuffer.material->GetUBO("world"));
sp_gbuffer.desc_sets->Update();
return(true); return(true);
} }
@ -249,20 +278,8 @@ private:
ro_cube=CreateRenderableCube(db,mtl,&cci); ro_cube=CreateRenderableCube(db,mtl,&cci);
} }
bool InitUBO(SubpassParam *sp)
{
if(!InitCameraUBO(sp->desc_sets,sp->material->GetUBO("world")))
return(false);
sp->desc_sets->Update();
return(true);
}
bool InitScene(SubpassParam *sp) bool InitScene(SubpassParam *sp)
{ {
if(!InitUBO(sp))
return(false);
CreateRenderObject(sp->material); CreateRenderObject(sp->material);
render_root.Add(db->CreateRenderableInstance(sp->pipeline,sp->desc_sets,ro_cube),scale(1000)); render_root.Add(db->CreateRenderableInstance(sp->pipeline,sp->desc_sets,ro_cube),scale(1000));

1
inc/hgl/math/Matrix.h
View File

@ -19,7 +19,6 @@ namespace hgl
// alignas(16) Matrix4f inverse_projection; // alignas(16) Matrix4f inverse_projection;
alignas(16) Matrix4f modelview; alignas(16) Matrix4f modelview;
alignas(16) Matrix4f mvp; alignas(16) Matrix4f mvp;
alignas(16) Matrix3f normal;
alignas(16) Vector4f view_pos; //眼睛坐标 alignas(16) Vector4f view_pos; //眼睛坐标
};//struct WorldMatrix };//struct WorldMatrix

1
res/shader/gbuffer_opaque.vert
View File

@ -11,6 +11,7 @@ layout(binding = 0) uniform WorldMatrix
mat4 projection; mat4 projection;
mat4 modelview; mat4 modelview;
mat4 mvp; mat4 mvp;
vec4 view_pos;
} world; } world;
layout(push_constant) uniform Consts { layout(push_constant) uniform Consts {