moved to inline_geometry namespace they are CreateRenderable....functions.
This commit is contained in:
@@ -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));
|
||||
|
||||
|
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -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);
|
||||
|
@@ -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()
|
||||
|
@@ -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()
|
||||
|
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -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);
|
||||
}
|
||||
}
|
||||
|
@@ -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);
|
||||
@@ -136,12 +138,14 @@ public:
|
||||
if(!cube.material_instance->BindSampler(DescriptorSetsType::Value,"tex",os.render_taget->GetColorTexture(),cube.sampler))
|
||||
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);
|
||||
|
@@ -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);
|
||||
}
|
||||
|
||||
{
|
||||
|
@@ -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++)
|
||||
{
|
||||
|
@@ -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()
|
||||
|
@@ -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()
|
||||
|
Reference in New Issue
Block a user