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

updated Billboard,and added FixedSize billboard

Browse Source
This commit is contained in:
hyzboy 2024-06-16 23:49:23 +08:00
parent c61e4dfdb8
commit 150b27c6e6
9 changed files with 140 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMSceneGraph

@ -1 +1 @@
Subproject commit d218c7435039d1932f6d79f3894ba1b74b22f4fe
Subproject commit deb54cdeaf5889d95e37524c00317c6274f3e2f7

131
example/Basic/Billboard2D.cpp
View File

@ -1,131 +0,0 @@
// Billboard2D
// 用于实现在3D场景中显示固定象素尺寸的2D内容，比如显示在3D场景中的血条、头顶名字等。
#include"VulkanAppFramework.h"
#include<hgl/filesystem/FileSystem.h>
#include<hgl/graph/InlineGeometry.h>
#include<hgl/graph/VKRenderResource.h>
#include<hgl/graph/RenderList.h>
#include<hgl/graph/Camera.h>
#include<hgl/graph/mtl/Material3DCreateConfig.h>
using namespace hgl;
using namespace hgl::graph;
class TestApp:public SceneAppFramework
{
private:
Material * material =nullptr;
Pipeline * pipeline =nullptr;
Primitive * prim_plane_grid =nullptr;
MaterialInstance * material_instance[3]{};
private:
bool InitMDP()
{
mtl::Material3DCreateConfig cfg(device->GetDeviceAttribute(),"VertexLuminance3D",Prim::Lines);
cfg.local_to_world=true;
cfg.position_format=VAT_VEC2;
material=db->LoadMaterial("Std3D/VertexLum3D",&cfg);
if(!material)return(false);
Color4f GridColor;
COLOR ce=COLOR::BlenderAxisRed;
for(uint i=0;i<3;i++)
{
GridColor=GetColor4f(ce,1.0);
material_instance[i]=db->CreateMaterialInstance(material,nullptr,&GridColor);
ce=COLOR((int)ce+1);
}
pipeline=CreatePipeline(material,InlinePipeline::Solid3D,Prim::Lines);
return pipeline;
}
bool CreateRenderObject()
{
using namespace inline_geometry;
struct PlaneGridCreateInfo pgci;
pgci.grid_size.Set(32,32);
pgci.sub_count.Set(8,8);
pgci.lum=0.75;
pgci.sub_lum=1.0;
PrimitiveCreater pc(device,material->GetDefaultVIL());
prim_plane_grid=CreatePlaneGrid(&pc,&pgci);
return prim_plane_grid;
}
Renderable *Add(MaterialInstance *mi,const Matrix4f &mat)
{
Renderable *ri=db->CreateRenderable(prim_plane_grid,mi,pipeline);
if(!ri)
return(nullptr);
render_root.CreateSubNode(mat,ri);
return ri;
}
bool InitScene()
{
Add(material_instance[0],Matrix4f(1.0f));
Add(material_instance[1],rotate(HGL_RAD_90,0,1,0));
Add(material_instance[2],rotate(HGL_RAD_90,1,0,0));
camera->pos=Vector3f(32,32,32);
camera_control->SetTarget(Vector3f(0,0,0));
camera_control->Refresh();
// camera_control->SetReserveDirection(true,true); //反转x,y
render_root.RefreshMatrix();
render_list->Expend(&render_root);
return(true);
}
public:
~TestApp()
{
SAFE_CLEAR(prim_plane_grid);
}
bool Init(uint width,uint height) override
{
if(!SceneAppFramework::Init(width,height))
return(false);
if(!InitMDP())
return(false);
if(!CreateRenderObject())
return(false);
if(!InitScene())
return(false);
return(true);
}
};//class TestApp:public CameraAppFramework
int main(int,char **)
{
return RunApp<TestApp>(1280,720);
}

10
example/Basic/Billboard2DWay.cpp → example/Basic/BillboardTest.cpp
View File

@ -1,4 +1,4 @@
// Billboard : The 2D way
// Billboard
#include"VulkanAppFramework.h"
#include<hgl/filesystem/FileSystem.h>
@ -70,15 +70,17 @@ private:
bool InitBillboardMP()
{
mtl::Material3DCreateConfig cfg(device->GetDeviceAttribute(),"Billboard2DWay",Prim::Billboard2DWay);
mtl::BillboardMaterialCreateConfig cfg(device->GetDeviceAttribute(),"Billboard2D",Prim::Billboard);
{
AutoDelete<mtl::MaterialCreateInfo> mci=mtl::CreateBillboard2DWay(&cfg);
cfg.fixed_size=false;
AutoDelete<mtl::MaterialCreateInfo> mci=mtl::CreateBillboard2D(&cfg);
mi_billboard=db->CreateMaterialInstance(mci);
if(!mi_billboard)return(false);
pipeline_billboard=CreatePipeline(mi_billboard,InlinePipeline::Solid3D,Prim::Billboard2DWay);
pipeline_billboard=CreatePipeline(mi_billboard,InlinePipeline::Solid3D,Prim::Billboard);
if(!pipeline_billboard)return(false);
}

2
example/Basic/CMakeLists.txt
View File

@ -15,4 +15,4 @@ CreateProject(02_draw_triangle_use_UBO draw_triangle_use_UBO.cpp)
CreateProject(03_auto_instance auto_instance.cpp)
CreateProject(04_auto_merge_material_instance auto_merge_material_instance.cpp)
CreateProject(05_Billboard2DWay Billboard2DWay.cpp)
CreateProject(05_Billboard BillboardTest.cpp)

14
inc/hgl/graph/mtl/Material3DCreateConfig.h
View File

@ -53,7 +53,19 @@ public:
MaterialCreateInfo *CreateVertexColor3D(const Material3DCreateConfig *);
MaterialCreateInfo *CreateVertexLuminance3D(const Material3DCreateConfig *);
MaterialCreateInfo *CreateBillboard2DWay(mtl::Material3DCreateConfig *);
struct BillboardMaterialCreateConfig:public Material3DCreateConfig
{
bool fixed_size; ///<固定大小(指像素尺寸)
Vector2u pixel_size; ///<像素尺寸
public:
using Material3DCreateConfig::Material3DCreateConfig;
};
MaterialCreateInfo *CreateBillboard2D(mtl::BillboardMaterialCreateConfig *);
/**
* 从文件加载材质

16
src/ShaderGen/3d/M_Billboard.cpp Normal file
View File

@ -0,0 +1,16 @@
#include"Std3DMaterial.h"
STD_MTL_NAMESPACE_BEGIN
MaterialCreateInfo *CreateBillboard2DDynamic(mtl::BillboardMaterialCreateConfig *cfg);
MaterialCreateInfo *CreateBillboard2DFixedSize(mtl::BillboardMaterialCreateConfig *cfg);
MaterialCreateInfo *CreateBillboard2D(mtl::BillboardMaterialCreateConfig *cfg)
{
if(cfg->fixed_size)
return CreateBillboard2DFixedSize(cfg);
else
return CreateBillboard2DDynamic(cfg);
}
STD_MTL_NAMESPACE_END

12
src/ShaderGen/3d/M_Billboard2DWay.cpp → src/ShaderGen/3d/M_BillboardDynamicSize.cpp
View File

@ -45,12 +45,12 @@ void main()
FragColor=texture(TextureBaseColor,Input.TexCoord);
})";
class MaterialBillboard2DWay:public Std3DMaterial
class MaterialBillboard2DDynamicSize:public Std3DMaterial
{
public:
using Std3DMaterial::Std3DMaterial;
~MaterialBillboard2DWay()=default;
~MaterialBillboard2DDynamicSize()=default;
bool CustomVertexShader(ShaderCreateInfoVertex *vsc) override
{
@ -82,10 +82,10 @@ void main()
fsc->SetMain(fs_main);
return(true);
}
};//class MaterialBillboard2DWay:public Std3DMaterial
};//class MaterialBillboard2DDynamicSize:public Std3DMaterial
}//namespace
MaterialCreateInfo *CreateBillboard2DWay(mtl::Material3DCreateConfig *cfg)
MaterialCreateInfo *CreateBillboard2DDynamic(mtl::BillboardMaterialCreateConfig *cfg)
{
if(!cfg)
return(nullptr);
@ -94,8 +94,8 @@ MaterialCreateInfo *CreateBillboard2DWay(mtl::Material3DCreateConfig *cfg)
cfg->local_to_world=true;
MaterialBillboard2DWay mtl_billbard_2dway(cfg);
MaterialBillboard2DDynamicSize mtl_billbard_2d(cfg);
return mtl_billbard_2dway.Create();
return mtl_billbard_2d.Create();
}
STD_MTL_NAMESPACE_END

94
src/ShaderGen/3d/M_BillboardFixedSize.cpp Normal file
View File

@ -0,0 +1,94 @@
#include"Std3DMaterial.h"
#include<hgl/shadergen/MaterialCreateInfo.h>
STD_MTL_NAMESPACE_BEGIN
namespace
{
constexpr const char vs_main[]=R"(
void main()
{
gl_Position=GetPosition3D();
gl_Position/=gl_Position.w;
})";
constexpr const char gs_main[]=R"(
void main()
{
const vec2 BillboardVertex[4]=vec2[]
(
vec2(-0.5,-0.5),
vec2(-0.5, 0.5),
vec2( 0.5,-0.5),
vec2( 0.5, 0.5)
);
for(int i=0;i<4;i++)
{
gl_Position=gl_in[0].gl_Position;
gl_Position.xy+=BillboardVertex[i];
Output.TexCoord=BillboardVertex[i]+vec2(0.5);
EmitVertex();
}
EndPrimitive();
})";
constexpr const char fs_main[]=R"(
void main()
{
FragColor=texture(TextureBaseColor,Input.TexCoord);
})";
class MaterialBillboard2DFixedSize:public Std3DMaterial
{
public:
using Std3DMaterial::Std3DMaterial;
~MaterialBillboard2DFixedSize()=default;
bool CustomVertexShader(ShaderCreateInfoVertex *vsc) override
{
if(!Std3DMaterial::CustomVertexShader(vsc))
return(false);
vsc->SetMain(vs_main);
return(true);
}
bool CustomGeometryShader(ShaderCreateInfoGeometry *gsc) override
{
gsc->SetGeom(Prim::Points,Prim::TriangleStrip,4);
gsc->AddOutput(VAT_VEC2,"TexCoord");
gsc->SetMain(gs_main);
return(true);
}
bool CustomFragmentShader(ShaderCreateInfoFragment *fsc) override
{
mci->AddSampler(VK_SHADER_STAGE_FRAGMENT_BIT,DescriptorSetType::PerMaterial,SamplerType::Sampler2D,mtl::SamplerName::BaseColor);
fsc->AddOutput(VAT_VEC4,"FragColor"); //Fragment shader的输出等于最终的RT了，所以这个名称其实随便起。
fsc->SetMain(fs_main);
return(true);
}
};//class MaterialBillboard2DFixedSize:public Std3DMaterial
}//namespace
MaterialCreateInfo *CreateBillboard2DFixedSize(mtl::BillboardMaterialCreateConfig *cfg)
{
if(!cfg)
return(nullptr);
cfg->shader_stage_flag_bit|=VK_SHADER_STAGE_GEOMETRY_BIT;
cfg->local_to_world=true;
MaterialBillboard2DFixedSize mtl_billbard_2d_fixed_size(cfg);
return mtl_billbard_2d_fixed_size.Create();
}
STD_MTL_NAMESPACE_END

4
src/ShaderGen/CMakeLists.txt
View File

@ -69,7 +69,9 @@ SET(STD_MTL_3D_SOURCE_FILES ${STD_MTL_HEADER_PATH}/Material3DCreateConfig.h
3d/Std3DMaterialLoader.cpp
3d/M_VertexColor3D.cpp
3d/M_VertexLum3D.cpp
3d/M_Billboard2DWay.cpp
3d/M_BillboardDynamicSize.cpp
3d/M_BillboardFixedSize.cpp
3d/M_Billboard.cpp
)
SET(STD_MTL_SOURCE ${STD_MTL_HEADER_PATH}/MaterialConfig.h