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

moved to inline_geometry namespace they are CreateRenderable....functions.

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy) 2022-06-24 21:36:24 +08:00
parent e381c3efeb
commit f70be8e42c
14 changed files with 1229 additions and 1207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/Vulkan/Atmosphere.cpp
View File

@ -81,7 +81,7 @@ private:
bool InitScene()
{
ro_sphere=CreateRenderableSphere(db,material_instance->GetVAB(),128);
ro_sphere=inline_geometry::CreateSphere(db,material_instance->GetVAB(),128);
render_root.CreateSubNode(scale(100),db->CreateRenderable(ro_sphere,material_instance,pipeline_solid));

8
example/Vulkan/Cubemap.cpp
View File

@ -121,22 +121,24 @@ private:
void CreateRenderObject()
{
using namespace inline_geometry;
{
struct AxisCreateInfo aci;
aci.size=GetCameraInfo().zfar;
ro_axis=CreateRenderableAxis(db,axis_mi->GetVAB(),&aci);
ro_axis=CreateAxis(db,axis_mi->GetVAB(),&aci);
}
{
struct CubeCreateInfo cci;
ro_cube=CreateRenderableCube(db,sky_mi->GetVAB(),&cci);
ro_cube=CreateCube(db,sky_mi->GetVAB(),&cci);
}
{
ro_sphere=CreateRenderableSphere(db,envmap_mi->GetVAB(),64);
ro_sphere=CreateSphere(db,envmap_mi->GetVAB(),64);
}
}

16
example/Vulkan/DeferredRender.cpp
View File

@ -273,18 +273,20 @@ private:
void CreateRenderObject(const VAB *vab)
{
using namespace inline_geometry;
{
struct PlaneCreateInfo pci;
ro_plane=CreateRenderablePlane(db,vab,&pci);
ro_plane=CreatePlane(db,vab,&pci);
}
{
struct CubeCreateInfo cci;
ro_cube=CreateRenderableCube(db,vab,&cci);
ro_cube=CreateCube(db,vab,&cci);
}
{
ro_sphere=CreateRenderableSphere(db,vab,64);
ro_sphere=CreateSphere(db,vab,64);
}
{
@ -299,7 +301,7 @@ private:
tci.uv_scale.x=4;
tci.uv_scale.y=1;
ro_torus=CreateRenderableTorus(db,vab,&tci);
ro_torus=CreateTorus(db,vab,&tci);
}
{
@ -309,7 +311,7 @@ private:
cci.radius=10;
cci.numberSlices=32;
ro_cylinder=CreateRenderableCylinder(db,vab,&cci);
ro_cylinder=CreateCylinder(db,vab,&cci);
}
{
@ -320,13 +322,13 @@ private:
cci.numberSlices=128;
cci.numberStacks=32;
ro_cone=CreateRenderableCone(db,vab,&cci);
ro_cone=CreateCone(db,vab,&cci);
}
}
bool InitCompositionRenderable()
{
ro_gbc_plane=CreateRenderableGBufferComposition(db,sp_composition.material_instance->GetVAB());
ro_gbc_plane=inline_geometry::CreateGBufferCompositionRectangle(db,sp_composition.material_instance->GetVAB());
if(!ro_gbc_plane)return(false);
ro_gbc_plane_ri=db->CreateRenderable(ro_gbc_plane,sp_composition.material_instance,sp_composition.pipeline_fan);

2
example/Vulkan/EquirectangularMap.cpp
View File

@ -64,7 +64,7 @@ private:
void CreateRenderObject()
{
ro_sphere=CreateRenderableSphere(db,envmap_mi->GetVAB(),128);
ro_sphere=inline_geometry::CreateSphere(db,envmap_mi->GetVAB(),128);
}
bool InitUBO()

8
example/Vulkan/Geometry3D.cpp
View File

@ -58,6 +58,8 @@ private:
void CreateRenderObject()
{
using namespace inline_geometry;
struct PlaneGridCreateInfo pgci;
pgci.coord[0]=Vector3f(-100,-100,0);
@ -76,16 +78,16 @@ private:
const VAB *vab=material_instance->GetVAB();
ro_plane_grid[0]=CreateRenderablePlaneGrid(db,vab,&pgci);
ro_plane_grid[0]=CreatePlaneGrid(db,vab,&pgci);
pgci.color.Set(0,0.5,0,1);
pgci.side_color.Set(0,1,0,1);
ro_plane_grid[1]=CreateRenderablePlaneGrid(db,vab,&pgci);
ro_plane_grid[1]=CreatePlaneGrid(db,vab,&pgci);
pgci.color.Set(0,0,0.5,1);
pgci.side_color.Set(0,0,1,1);
ro_plane_grid[2]=CreateRenderablePlaneGrid(db,vab,&pgci);
ro_plane_grid[2]=CreatePlaneGrid(db,vab,&pgci);
}
bool InitScene()

14
example/Vulkan/InlineGeometryScene.cpp
View File

@ -147,12 +147,14 @@ private:
void CreateRenderObject()
{
using namespace inline_geometry;
{
struct AxisCreateInfo aci;
aci.size=200;
ro_axis=CreateRenderableAxis(db,axis_mi->GetVAB(),&aci);
ro_axis=CreateAxis(db,axis_mi->GetVAB(),&aci);
}
const VAB *vab=material_instance->GetVAB();
@ -164,11 +166,11 @@ private:
cci.tex_coord=true;
cci.color_type=CubeCreateInfo::ColorType::SameColor;
cci.color[0]=Vector4f(1,1,1,1);
ro_cube=CreateRenderableCube(db,vab,&cci);
ro_cube=CreateCube(db,vab,&cci);
}
{
ro_sphere=CreateRenderableSphere(db,vab,64);
ro_sphere=CreateSphere(db,vab,64);
}
{
@ -183,7 +185,7 @@ private:
tci.uv_scale.x=4;
tci.uv_scale.y=1;
ro_torus=CreateRenderableTorus(db,vab,&tci);
ro_torus=CreateTorus(db,vab,&tci);
}
{
@ -193,7 +195,7 @@ private:
cci.radius=10;
cci.numberSlices=32;
ro_cylinder=CreateRenderableCylinder(db,vab,&cci);
ro_cylinder=CreateCylinder(db,vab,&cci);
}
{
@ -204,7 +206,7 @@ private:
cci.numberSlices=128;
cci.numberStacks=32;
ro_cone=CreateRenderableCone(db,vab,&cci);
ro_cone=CreateCone(db,vab,&cci);
}
}

4
example/Vulkan/LoadStaticMesh.cpp
View File

@ -188,7 +188,7 @@ private:
aci.size.Set(1000,1000,1000);
axis_renderable=CreateRenderableAxis(db,mp_line.material,&aci);
axis_renderable=CreateAxis(db,mp_line.material,&aci);
axis_renderable_instance=CreateRenderable(mp_line,axis_renderable);
}
@ -198,7 +198,7 @@ private:
cci.has_color=true;
cci.color.Set(1,1,1,1);
bbox_renderable=CreateRenderableBoundingBox(db,mp_line.material,&cci);
bbox_renderable=CreateBoundingBox(db,mp_line.material,&cci);
bbox_renderable_instance=CreateRenderable(mp_line,bbox_renderable);
}
}

10
example/Vulkan/OffscreenRender.cpp
View File

@ -96,6 +96,8 @@ public:
return(false);
{
using namespace inline_geometry;
CircleCreateInfo cci;
cci.center=Vector2f(OFFSCREEN_SIZE*0.5,OFFSCREEN_SIZE*0.5);
@ -105,7 +107,7 @@ public:
cci.center_color=Vector4f(1,1,1,1);
cci.border_color=Vector4f(1,1,1,0);
Primitive *primitive=CreateRenderableCircle(db,os.material_instance->GetVAB(),&cci);
Primitive *primitive=CreateCircle(db,os.material_instance->GetVAB(),&cci);
if(!primitive)return(false);
os.renderable=db->CreateRenderable(primitive,os.material_instance,os.pipeline);
@ -137,11 +139,13 @@ public:
return(false);
{
using namespace inline_geometry;
CubeCreateInfo cci;
cci.tex_coord=true;
Primitive *primitive=CreateRenderableCube(db,cube.material_instance->GetVAB(),&cci);
Primitive *primitive=CreateCube(db,cube.material_instance->GetVAB(),&cci);
if(!primitive)return(false);
cube.renderable=db->CreateRenderable(primitive,cube.material_instance,cube.pipeline);
@ -159,7 +163,7 @@ public:
bool Init()
{
if(!CameraAppFramework::Init(SCREEN_WIDTH,SCREEN_HEIGHT))
//if(!CameraAppFramework::Init(SCREEN_WIDTH,SCREEN_HEIGHT))
return(false);
SetClearColor(COLOR::MozillaCharcoal);

4
example/Vulkan/RayPicking.cpp
View File

@ -78,6 +78,8 @@ private:
bool CreateRenderObject()
{
using namespace inline_geometry;
{
struct PlaneGridCreateInfo pgci;
@ -97,7 +99,7 @@ private:
const VAB *vab=material_instance->GetVAB();
ro_plane_grid=CreateRenderablePlaneGrid(db,vab,&pgci);
ro_plane_grid=CreatePlaneGrid(db,vab,&pgci);
}
{

6
example/Vulkan/SceneTree.cpp
View File

@ -36,7 +36,7 @@ private:
GPUBuffer * ubo_color =nullptr;
GPUBuffer * ubo_sun =nullptr;
Primitive * renderable_object =nullptr;
Primitive * primitive =nullptr;
Pipeline * pipeline =nullptr;
@ -67,7 +67,7 @@ private:
void CreateRenderObject()
{
renderable_object=CreateRenderableSphere(db,material_instance->GetVAB(),40);
primitive=inline_geometry::CreateSphere(db,material_instance->GetVAB(),40);
}
bool InitUBO()
@ -112,7 +112,7 @@ private:
uint count;
float size;
Renderable *ri=db->CreateRenderable(renderable_object,material_instance,pipeline);
Renderable *ri=db->CreateRenderable(primitive,material_instance,pipeline);
for(uint i=0;i<360;i++)
{

2
example/Vulkan/SkyColor.cpp
View File

@ -90,7 +90,7 @@ private:
{
const VAB *vab=material_instance->GetVAB();
ro_skyphere=CreateRenderableDome(db,vab,64);
ro_skyphere=inline_geometry::CreateDome(db,vab,64);
}
bool InitScene()

4
example/Vulkan/TerrainSimple.cpp
View File

@ -77,6 +77,8 @@ private:
void CreateRenderObject()
{
using namespace inline_geometry;
struct PlaneGridCreateInfo pgci;
pgci.coord[0]=Vector3f(-100,-100,0);
@ -95,7 +97,7 @@ private:
const VAB *vab=material_instance->GetVAB();
renderable=CreateRenderablePlaneGrid(db,vab,&pgci);
renderable=CreatePlaneGrid(db,vab,&pgci);
}
bool InitScene()

31
inc/hgl/graph/InlineGeometry.h
View File

@ -9,6 +9,8 @@
namespace hgl
{
namespace graph
{
namespace inline_geometry
{
/**
* 矩形创建信息(扇形/三角形条)
@ -18,12 +20,12 @@ namespace hgl
RectScope2f scope;
};//struct RectangleCreateInfo
Primitive *CreateRenderableRectangle(RenderResource *db,const VAB *vab,const RectangleCreateInfo *rci);
Primitive *CreateRectangle(RenderResource *db,const VAB *vab,const RectangleCreateInfo *rci);
/**
* 创建延迟渲染用全屏平面
*/
Primitive *CreateRenderableGBufferComposition(RenderResource *db,const VAB *vab);
Primitive *CreateGBufferCompositionRectangle(RenderResource *db,const VAB *vab);
/**
* 圆角矩形创建信息(扇形/线圈)
@ -34,7 +36,7 @@ namespace hgl
uint32_t round_per; ///<圆角精度
};//struct RoundRectangleCreateInfo:public RectangleCreateInfo
Primitive *CreateRenderableRoundRectangle(RenderResource *db,const VAB *vab,const RoundRectangleCreateInfo *rci);
Primitive *CreateRoundRectangle(RenderResource *db,const VAB *vab,const RoundRectangleCreateInfo *rci);
/**
* 圆形创建信息
@ -54,7 +56,7 @@ namespace hgl
/**
* 创建一个2D圆形(扇形/线圈)
*/
Primitive *CreateRenderableCircle(RenderResource *db,const VAB *vab,const CircleCreateInfo *cci);
Primitive *CreateCircle(RenderResource *db,const VAB *vab,const CircleCreateInfo *cci);
/**
* 平面网格创建信息
@ -73,7 +75,7 @@ namespace hgl
/**
* 创建一个平面网格(线条)
*/
Primitive *CreateRenderablePlaneGrid(RenderResource *db,const VAB *vab,const PlaneGridCreateInfo *pgci);
Primitive *CreatePlaneGrid(RenderResource *db,const VAB *vab,const PlaneGridCreateInfo *pgci);
struct PlaneCreateInfo
{
@ -91,7 +93,7 @@ namespace hgl
/**
* 创建一个平面(三角形)
*/
Primitive *CreateRenderablePlane(RenderResource *db,const VAB *vab,const PlaneCreateInfo *pci);
Primitive *CreatePlane(RenderResource *db,const VAB *vab,const PlaneCreateInfo *pci);
struct CubeCreateInfo
{
@ -127,7 +129,7 @@ namespace hgl
/**
* 创建一个立方体(三角形)
*/
Primitive *CreateRenderableCube(RenderResource *db,const VAB *vab,const CubeCreateInfo *cci);
Primitive *CreateCube(RenderResource *db,const VAB *vab,const CubeCreateInfo *cci);
struct BoundingBoxCreateInfo
{
@ -158,17 +160,17 @@ namespace hgl
/**
* 创建一个绑定盒(线条)
*/
Primitive *CreateRenderableBoundingBox(RenderResource *db,const VAB *vab,const BoundingBoxCreateInfo *cci);
Primitive *CreateBoundingBox(RenderResource *db,const VAB *vab,const BoundingBoxCreateInfo *cci);
/**
* 创建一个球心坐标为0,0,0，半径为1的球体(三角形)
*/
Primitive *CreateRenderableSphere(RenderResource *db,const VAB *vab,const uint numberSlices);
Primitive *CreateSphere(RenderResource *db,const VAB *vab,const uint numberSlices);
/**
* 创建一个穹顶(三角形)
*/
Primitive *CreateRenderableDome(RenderResource *db,const VAB *vab, const uint numberSlices);
Primitive *CreateDome(RenderResource *db,const VAB *vab, const uint numberSlices);
struct TorusCreateInfo
{
@ -184,7 +186,7 @@ namespace hgl
/**
* 创建一个圆环(三角形)
*/
Primitive *CreateRenderableTorus(RenderResource *db,const VAB *vab,const TorusCreateInfo *tci);
Primitive *CreateTorus(RenderResource *db,const VAB *vab,const TorusCreateInfo *tci);
struct CylinderCreateInfo
{
@ -196,7 +198,7 @@ namespace hgl
/**
* 创建一个圆柱(三角形)
*/
Primitive *CreateRenderableCylinder(RenderResource *db,const VAB *vab,const CylinderCreateInfo *cci);
Primitive *CreateCylinder(RenderResource *db,const VAB *vab,const CylinderCreateInfo *cci);
struct ConeCreateInfo
{
@ -209,7 +211,7 @@ namespace hgl
/**
* 创建一个圆锥(三角形)
*/
Primitive *CreateRenderableCone(RenderResource *db,const VAB *vab,const ConeCreateInfo *cci);
Primitive *CreateCone(RenderResource *db,const VAB *vab,const ConeCreateInfo *cci);
struct AxisCreateInfo
{
@ -230,7 +232,8 @@ namespace hgl
/**
* 创建一个坐标线(线条)
*/
Primitive *CreateRenderableAxis(RenderResource *db,const VAB *vab,const AxisCreateInfo *aci);
Primitive *CreateAxis(RenderResource *db,const VAB *vab,const AxisCreateInfo *aci);
}//namespace inline_geometry
}//namespace graph
};//namespace hgl
#endif//HGL_GRAPH_INLINE_GEOMETRY_INCLUDE

33
src/SceneGraph/InlineGeometry.cpp
View File

@ -12,7 +12,9 @@ namespace hgl
{
namespace graph
{
Primitive *CreateRenderableRectangle(RenderResource *db,const VAB *vab,const RectangleCreateInfo *rci)
namespace inline_geometry
{
Primitive *CreateRectangle(RenderResource *db,const VAB *vab,const RectangleCreateInfo *rci)
{
PrimitiveCreater rc(db,vab);
@ -29,16 +31,16 @@ namespace hgl
return rc.Finish();
}
Primitive *CreateRenderableGBufferComposition(RenderResource *db,const VAB *vab)
Primitive *CreateGBufferCompositionRectangle(RenderResource *db,const VAB *vab)
{
RectangleCreateInfo rci;
rci.scope.Set(-1,-1,2,2);
return CreateRenderableRectangle(db,vab,&rci);
return CreateRectangle(db,vab,&rci);
}
Primitive *CreateRenderableRoundRectangle(RenderResource *db,const VAB *vab,const RoundRectangleCreateInfo *rci)
Primitive *CreateRoundRectangle(RenderResource *db,const VAB *vab,const RoundRectangleCreateInfo *rci)
{
PrimitiveCreater rc(db,vab);
@ -112,7 +114,7 @@ namespace hgl
return rc.Finish();
}
Primitive *CreateRenderableCircle(RenderResource *db,const VAB *vab,const CircleCreateInfo *cci)
Primitive *CreateCircle(RenderResource *db,const VAB *vab,const CircleCreateInfo *cci)
{
PrimitiveCreater rc(db,vab);
@ -160,7 +162,7 @@ namespace hgl
return rc.Finish();
}
Primitive *CreateRenderablePlaneGrid(RenderResource *db,const VAB *vab,const PlaneGridCreateInfo *pgci)
Primitive *CreatePlaneGrid(RenderResource *db,const VAB *vab,const PlaneGridCreateInfo *pgci)
{
PrimitiveCreater rc(db,vab);
@ -207,7 +209,7 @@ namespace hgl
return rc.Finish();
}
Primitive *CreateRenderablePlane(RenderResource *db,const VAB *vab,const PlaneCreateInfo *pci)
Primitive *CreatePlane(RenderResource *db,const VAB *vab,const PlaneCreateInfo *pci)
{
const float xy_vertices [] = { -0.5f,-0.5f,0.0f, +0.5f,-0.5f,0.0f, +0.5f,+0.5f,0.0f, -0.5f,+0.5f,0.0f };
float xy_tex_coord[] = { 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f };
@ -248,7 +250,7 @@ namespace hgl
return rc.Finish();
}
Primitive *CreateRenderableCube(RenderResource *db,const VAB *vab,const CubeCreateInfo *cci)
Primitive *CreateCube(RenderResource *db,const VAB *vab,const CubeCreateInfo *cci)
{
/**
* 4 5
@ -440,7 +442,7 @@ namespace hgl
* @param numberSlices 切片数
* @return 可渲染数据
*/
Primitive *CreateRenderableSphere(RenderResource *db,const VAB *vab,const uint numberSlices)
Primitive *CreateSphere(RenderResource *db,const VAB *vab,const uint numberSlices)
{
PrimitiveCreater rc(db,vab);
@ -516,7 +518,7 @@ namespace hgl
return rc.Finish();
}
Primitive *CreateRenderableDome(RenderResource *db,const VAB *vab,const uint numberSlices)
Primitive *CreateDome(RenderResource *db,const VAB *vab,const uint numberSlices)
{
PrimitiveCreater rc(db,vab);
@ -637,7 +639,7 @@ namespace hgl
}
}//namespace
Primitive *CreateRenderableTorus(RenderResource *db,const VAB *vab,const TorusCreateInfo *tci)
Primitive *CreateTorus(RenderResource *db,const VAB *vab,const TorusCreateInfo *tci)
{
PrimitiveCreater rc(db,vab);
@ -793,7 +795,7 @@ namespace hgl
}
}//namespace
Primitive *CreateRenderableCylinder(RenderResource *db,const VAB *vab,const CylinderCreateInfo *cci)
Primitive *CreateCylinder(RenderResource *db,const VAB *vab,const CylinderCreateInfo *cci)
{
uint numberIndices = cci->numberSlices * 3 * 2 + cci->numberSlices * 6;
@ -1012,7 +1014,7 @@ namespace hgl
}
}//namespace
Primitive *CreateRenderableCone(RenderResource *db,const VAB *vab,const ConeCreateInfo *cci)
Primitive *CreateCone(RenderResource *db,const VAB *vab,const ConeCreateInfo *cci)
{
PrimitiveCreater rc(db,vab);
@ -1139,7 +1141,7 @@ namespace hgl
return rc.Finish();
}
Primitive *CreateRenderableAxis(RenderResource *db,const VAB *vab,const AxisCreateInfo *aci)
Primitive *CreateAxis(RenderResource *db,const VAB *vab,const AxisCreateInfo *aci)
{
if(!db||!vab||!aci)return(nullptr);
@ -1166,7 +1168,7 @@ namespace hgl
return rc.Finish();
}
Primitive *CreateRenderableBoundingBox(RenderResource *db,const VAB *vab,const BoundingBoxCreateInfo *cci)
Primitive *CreateBoundingBox(RenderResource *db,const VAB *vab,const BoundingBoxCreateInfo *cci)
{
// Points of a cube.
/* 4 5 */ const float points[]={ -0.5,-0.5, 0.5, 0.5,-0.5,0.5, 0.5,-0.5,-0.5, -0.5,-0.5,-0.5,
@ -1219,5 +1221,6 @@ namespace hgl
return rc.Finish();
}
}//namespace inline_geometry
}//namespace graph
}//namespace hgl