updated Billboard,and added FixedSize billboard

example/Basic/Billboard2D.cpp

@@ -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);
-}

example/Basic/BillboardTest.cpp

@@ -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);
         }
 

example/Basic/CMakeLists.txt

@@ -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)