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-06-17 23:51:17 +08:00
parent 0d141385dd
commit 84bce16954
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,7 @@ namespace hgl
RectScope2f scope; RectScope2f scope;
};//struct RectangleCreateInfo };//struct RectangleCreateInfo
vulkan::Renderable *CreateRectangle(SceneDB *db,vulkan::Material *mtl,const RectangleCreateInfo *rci); vulkan::Renderable *CreateRenderableRectangle(SceneDB *db,vulkan::Material *mtl,const RectangleCreateInfo *rci);
/** /**
* 圆角矩形创建信息 * 圆角矩形创建信息
@ -30,7 +30,7 @@ namespace hgl
uint32_t round_per; ///<圆角精度 uint32_t round_per; ///<圆角精度
};//struct RoundRectangleCreateInfo:public RectangleCreateInfo };//struct RoundRectangleCreateInfo:public RectangleCreateInfo
vulkan::Renderable *CreateRoundRectangle(SceneDB *db,vulkan::Material *mtl,const RoundRectangleCreateInfo *rci); vulkan::Renderable *CreateRenderableRoundRectangle(SceneDB *db,vulkan::Material *mtl,const RoundRectangleCreateInfo *rci);
/** /**
* 圆形创建信息 * 圆形创建信息
@ -42,7 +42,7 @@ namespace hgl
uint field_count; ///<分段次数 uint field_count; ///<分段次数
};//struct CircleCreateInfo };//struct CircleCreateInfo
vulkan::Renderable *CreateCircle(SceneDB *db,vulkan::Material *mtl,const CircleCreateInfo *rci); vulkan::Renderable *CreateRenderableCircle(SceneDB *db,vulkan::Material *mtl,const CircleCreateInfo *rci);
/** /**
* 平面网格创建信息 * 平面网格创建信息
@ -65,7 +65,7 @@ namespace hgl
Vector2f tile; Vector2f tile;
};//struct PlaneCreateInfo };//struct PlaneCreateInfo
vulkan::Renderable *CreatePlane(SceneDB *db,vulkan::Material *mtl,const PlaneCreateInfo *pci); vulkan::Renderable *CreateRenderablePlane(SceneDB *db,vulkan::Material *mtl,const PlaneCreateInfo *pci);
struct CubeCreateInfo struct CubeCreateInfo
{ {

1
src/SceneGraph/CMakeLists.txt
View File

@ -22,6 +22,7 @@ SET(SCENE_GRAPH_SOURCE AABox.cpp
SceneNode.cpp SceneNode.cpp
SceneOrient.cpp SceneOrient.cpp
InlineGeometry.cpp InlineGeometry.cpp
#InlinePipeline.cpp
#Material.cpp #Material.cpp
#Mesh.cpp #Mesh.cpp
#SceneFile.cpp #SceneFile.cpp

12
src/SceneGraph/InlineGeometry.cpp
View File

@ -139,7 +139,7 @@ namespace hgl
using GeometryCreater2D=GeometryCreater<VB2f>; using GeometryCreater2D=GeometryCreater<VB2f>;
}//namespace }//namespace
vulkan::Renderable *CreateRectangle(SceneDB *db,vulkan::Material *mtl,const RectangleCreateInfo *rci) vulkan::Renderable *CreateRenderableRectangle(SceneDB *db,vulkan::Material *mtl,const RectangleCreateInfo *rci)
{ {
GeometryCreater2D gc(db,mtl); GeometryCreater2D gc(db,mtl);
@ -153,7 +153,7 @@ namespace hgl
return gc.Finish(); return gc.Finish();
} }
vulkan::Renderable *CreateRoundRectangle(SceneDB *db,vulkan::Material *mtl,const RoundRectangleCreateInfo *rci) vulkan::Renderable *CreateRenderableRoundRectangle(SceneDB *db,vulkan::Material *mtl,const RoundRectangleCreateInfo *rci)
{ {
GeometryCreater2D gc(db,mtl); GeometryCreater2D gc(db,mtl);
@ -229,7 +229,7 @@ namespace hgl
return gc.Finish(); return gc.Finish();
} }
vulkan::Renderable *CreateCircle(SceneDB *db,vulkan::Material *mtl,const CircleCreateInfo *cci) vulkan::Renderable *CreateRenderableCircle(SceneDB *db,vulkan::Material *mtl,const CircleCreateInfo *cci)
{ {
GeometryCreater2D gc(db,mtl); GeometryCreater2D gc(db,mtl);
@ -253,7 +253,7 @@ namespace hgl
return gc.Finish(); return gc.Finish();
} }
vulkan::Renderable *CreatePlaneGrid(SceneDB *db,vulkan::Material *mtl,const PlaneGridCreateInfo *pgci) vulkan::Renderable *CreateRenderablePlaneGrid(SceneDB *db,vulkan::Material *mtl,const PlaneGridCreateInfo *pgci)
{ {
GeometryCreater3D gc(db,mtl); GeometryCreater3D gc(db,mtl);
@ -300,7 +300,7 @@ namespace hgl
return gc.Finish(); return gc.Finish();
} }
vulkan::Renderable *CreatePlane(SceneDB *db,vulkan::Material *mtl,const PlaneCreateInfo *pci) vulkan::Renderable *CreateRenderablePlane(SceneDB *db,vulkan::Material *mtl,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}; 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, 0.0f,1.0f, 1.0f, 1.0f}; float xy_tex_coord[] = { 0.0f, 0.0f, 1.0f,0.0f, 0.0f,1.0f, 1.0f, 1.0f};
@ -341,7 +341,7 @@ namespace hgl
return gc.Finish(); return gc.Finish();
} }
vulkan::Renderable *CreateCube(SceneDB *db,vulkan::Material *mtl,const CubeCreateInfo *cci) vulkan::Renderable *CreateRenderableCube(SceneDB *db,vulkan::Material *mtl,const CubeCreateInfo *cci)
{ // Points of a cube. { // Points of a cube.
/* 4 5 */ const float points[]={ -0.5f, -0.5f, -0.5f, -0.5f, -0.5f, +0.5f, +0.5f, -0.5f, +0.5f, +0.5f, -0.5f, -0.5f, -0.5f, +0.5f, -0.5f, -0.5f, +0.5f, +0.5f, /* 4 5 */ const float points[]={ -0.5f, -0.5f, -0.5f, -0.5f, -0.5f, +0.5f, +0.5f, -0.5f, +0.5f, +0.5f, -0.5f, -0.5f, -0.5f, +0.5f, -0.5f, -0.5f, +0.5f, +0.5f,
/* *------------* */ +0.5f, +0.5f, +0.5f, +0.5f, +0.5f, -0.5f, -0.5f, -0.5f, -0.5f, -0.5f, +0.5f, -0.5f, +0.5f, +0.5f, -0.5f, +0.5f, -0.5f, -0.5f, /* *------------* */ +0.5f, +0.5f, +0.5f, +0.5f, +0.5f, -0.5f, -0.5f, -0.5f, -0.5f, -0.5f, +0.5f, -0.5f, +0.5f, +0.5f, -0.5f, +0.5f, -0.5f, -0.5f,