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

update InlineGeometryScene example

Browse Source
This commit is contained in:
hyzboy 2020-10-21 21:05:03 +08:00
parent 2045743249
commit 7a4dce3115
2 changed files with 40 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMSceneGraph

@ -1 +1 @@
Subproject commit 8d75c2dbfde480c2e8e736c66d9864ca44f64392 Subproject commit 5c88829fc7945c24c824c0aceaabb913df2d3a1d

54
example/Vulkan/InlineGeometryScene.cpp
View File

@ -14,9 +14,25 @@ using namespace hgl::graph;
constexpr uint32_t SCREEN_WIDTH=1280; constexpr uint32_t SCREEN_WIDTH=1280;
constexpr uint32_t SCREEN_HEIGHT=720; constexpr uint32_t SCREEN_HEIGHT=720;
struct PhongLight
{
Vector4f color;
Vector4f position;
};
struct PhongMaterial
{
Vector4f BaseColor;
float ambient;
float specular;
};
constexpr size_t v3flen=sizeof(PhongLight);
class TestApp:public CameraAppFramework class TestApp:public CameraAppFramework
{ {
Color4f color; PhongLight light;
PhongMaterial phong;
private: private:
@ -33,7 +49,8 @@ private:
Pipeline * axis_pipeline =nullptr; Pipeline * axis_pipeline =nullptr;
Pipeline * pipeline_solid =nullptr; Pipeline * pipeline_solid =nullptr;
GPUBuffer * ubo_color =nullptr; GPUBuffer * ubo_light =nullptr;
GPUBuffer * ubo_phong =nullptr;
Renderable *ro_axis, Renderable *ro_axis,
*ro_cube, *ro_cube,
@ -47,6 +64,13 @@ private:
bool InitMaterial() bool InitMaterial()
{ {
light.color.Set(1,1,1,1);
light.position.Set(1000,1000,1000,1.0);
phong.BaseColor.Set(1,1,1,1);
phong.ambient=0.1;
phong.specular=0.5;
axis_material=db->CreateMaterial(OS_TEXT("res/material/VertexColor3D")); axis_material=db->CreateMaterial(OS_TEXT("res/material/VertexColor3D"));
if(!axis_material)return(false); if(!axis_material)return(false);
@ -56,7 +80,7 @@ private:
axis_pipeline=CreatePipeline(axis_material,InlinePipeline::Solid3D,Prim::Lines); axis_pipeline=CreatePipeline(axis_material,InlinePipeline::Solid3D,Prim::Lines);
if(!axis_pipeline)return(false); if(!axis_pipeline)return(false);
material=db->CreateMaterial(OS_TEXT("res/material/DebugVertexNormal")); material=db->CreateMaterial(OS_TEXT("res/material/VertexNormal"));
if(!material)return(false); if(!material)return(false);
material_instance=db->CreateMaterialInstance(material); material_instance=db->CreateMaterialInstance(material);
@ -90,7 +114,7 @@ private:
} }
{ {
ro_sphere=CreateRenderableSphere(db,material,16); ro_sphere=CreateRenderableSphere(db,material,64);
} }
{ {
@ -108,8 +132,8 @@ private:
tci.innerRadius=50; tci.innerRadius=50;
tci.outerRadius=70; tci.outerRadius=70;
tci.numberSlices=32; tci.numberSlices=128;
tci.numberStacks=16; tci.numberStacks=32;
ro_torus=CreateRenderableTorus(db,material,&tci); ro_torus=CreateRenderableTorus(db,material,&tci);
} }
@ -119,7 +143,7 @@ private:
cci.halfExtend=10; cci.halfExtend=10;
cci.radius=10; cci.radius=10;
cci.numberSlices=16; cci.numberSlices=32;
ro_cylinder=CreateRenderableCylinder(db,material,&cci); ro_cylinder=CreateRenderableCylinder(db,material,&cci);
} }
@ -129,7 +153,7 @@ private:
cci.halfExtend=10; cci.halfExtend=10;
cci.radius=10; cci.radius=10;
cci.numberSlices=16; cci.numberSlices=128;
cci.numberStacks=1; cci.numberStacks=1;
ro_cone=CreateRenderableCone(db,material,&cci); ro_cone=CreateRenderableCone(db,material,&cci);
@ -138,16 +162,16 @@ private:
bool InitUBO() bool InitUBO()
{ {
color.Set(1,1,1,1); ubo_light=db->CreateUBO(sizeof(PhongLight),&light);
ubo_phong=db->CreateUBO(sizeof(PhongMaterial),&phong);
ubo_color=device->CreateUBO(sizeof(Vector4f),&color);
db->Add(ubo_color); material_instance->BindUBO("light",ubo_light);
material_instance->BindUBO("phong",ubo_phong);
material_instance->BindUBO("color_material",ubo_color);
if(!material_instance->BindUBO("world",GetCameraMatrixBuffer())) if(!material_instance->BindUBO("world",GetCameraMatrixBuffer()))
return(false); return(false);
if(!material_instance->BindUBO("fs_world",GetCameraMatrixBuffer()))
return(false);
material_instance->Update(); material_instance->Update();
@ -176,7 +200,7 @@ private:
{ {
render_root.Add(db->CreateRenderableInstance(ro_axis,axis_mi,axis_pipeline)); render_root.Add(db->CreateRenderableInstance(ro_axis,axis_mi,axis_pipeline));
// Add(ro_dome,pipeline_solid); // Add(ro_dome,pipeline_solid);
Add(ro_torus ,pipeline_solid); Add(ro_torus ,pipeline_solid);//,rotate(90,Vector3f(1,0,0)));
Add(ro_cube ,pipeline_solid,translate(-10, 0, 5)*scale(10,10,10)); Add(ro_cube ,pipeline_solid,translate(-10, 0, 5)*scale(10,10,10));
Add(ro_sphere ,pipeline_solid,translate( 10, 0, 5)*scale(10,10,10)); Add(ro_sphere ,pipeline_solid,translate( 10, 0, 5)*scale(10,10,10));
Add(ro_cylinder ,pipeline_solid,translate( 0, 16, 0)); Add(ro_cylinder ,pipeline_solid,translate( 0, 16, 0));