Skip to content

Commit

Permalink
#149 Add culling for primitive & fix normal cube mesh
Browse files Browse the repository at this point in the history
  • Loading branch information
@ducphamhong
ducphamhong committed May 27, 2022
1 parent 2d0ee49 commit f34f898
Show file tree
Hide file tree
Showing 7 changed files with 148 additions and 10 deletions.
13 changes: 13 additions & 0 deletions Projects/Skylicht/Components/Source/Primitive/CPrimitive.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ This file is part of the "Skylicht Engine".
#include "GameObject/CGameObject.h"
#include "Entity/CEntityManager.h"
#include "Transform/CWorldTransformData.h"
#include "Transform/CWorldInverseTransformData.h"
#include "Culling/CCullingData.h"
#include "Culling/CCullingBBoxData.h"


namespace Skylicht
{
Expand Down Expand Up @@ -64,6 +68,15 @@ namespace Skylicht
CPrimiviteData* primitiveData = entity->addData<CPrimiviteData>();
primitiveData->Type = m_type;

// Culling
entity->addData<CWorldInverseTransformData>();
entity->addData<CCullingData>();

CCullingBBoxData* cullingBBox = entity->addData<CCullingBBoxData>();
cullingBBox->BBox.MinEdge.set(-1.0f, -1.0f, -1.0f);
cullingBBox->BBox.MaxEdge.set(1.0f, 1.0f, 1.0f);

// Position
CWorldTransformData* transform = (CWorldTransformData*)entity->getDataByIndex(CWorldTransformData::DataTypeIndex);
transform->Relative.setTranslation(pos);
transform->Relative.setRotationDegrees(rotDeg);
Expand Down
121 changes: 118 additions & 3 deletions Projects/Skylicht/Components/Source/Primitive/CPrimitiveRenderer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,7 @@ namespace Skylicht

// cube mesh
{
IMesh* m = geometry->createCubeMesh(core::vector3df(1.0f, 1.0f, 1.0f));
initMesh(m, CPrimiviteData::Cube);
m->drop();
initCube();
}

// sphere mesh
Expand All @@ -70,6 +68,123 @@ namespace Skylicht
}
}

void CPrimitiveRenderer::initCube()
{
IVideoDriver* driver = getVideoDriver();

// Irrlicht Engine Mesh Buffer instance
// http://irrlicht.sourceforge.net/docu/classirr_1_1scene_1_1_c_mesh_buffer.html
IMeshBuffer* meshBuffer = new CMeshBuffer<S3DVertex>(driver->getVertexDescriptor(EVT_STANDARD), EIT_16BIT);
IIndexBuffer* ib = meshBuffer->getIndexBuffer();
IVertexBuffer* vb = meshBuffer->getVertexBuffer();

// Create vertices
video::SColor clr1(255, 255, 0, 0);
video::SColor clr2(255, 0, 255, 0);
video::SColor clr3(255, 0, 0, 255);
video::SColor clr4(255, 255, 255, 255);
video::SColor clr5(255, 255, 0, 255);
video::SColor clr6(255, 255, 255, 0);


vb->reallocate(12);

video::S3DVertex Vertices[] = {
// back
video::S3DVertex(0, 0, 0, 0, 0, -1, clr1, 0, 1),
video::S3DVertex(1, 0, 0, 0, 0, -1, clr1, 1, 1),
video::S3DVertex(1, 1, 0, 0, 0, -1, clr1, 1, 0),
video::S3DVertex(0, 1, 0, 0, 0, -1, clr1, 1, 0),

// front
video::S3DVertex(0, 0, 1, 0, 0, 1, clr2, 0, 1),
video::S3DVertex(1, 0, 1, 0, 0, 1, clr2, 1, 1),
video::S3DVertex(1, 1, 1, 0, 0, 1, clr2, 1, 0),
video::S3DVertex(0, 1, 1, 0, 0, 1, clr2, 1, 0),

// bottom
video::S3DVertex(0, 0, 0, 0, -1, 0, clr3, 0, 1),
video::S3DVertex(0, 0, 1, 0, -1, 0, clr3, 1, 1),
video::S3DVertex(1, 0, 1, 0, -1, 0, clr3, 1, 0),
video::S3DVertex(1, 0, 0, 0, -1, 0, clr3, 1, 0),

// top
video::S3DVertex(0, 1, 0, 0, 1, 0, clr4, 0, 1),
video::S3DVertex(0, 1, 1, 0, 1, 0, clr4, 1, 1),
video::S3DVertex(1, 1, 1, 0, 1, 0, clr4, 1, 0),
video::S3DVertex(1, 1, 0, 0, 1, 0, clr4, 1, 0),

// left
video::S3DVertex(1, 0, 0, -1, 0, 0, clr5, 0, 1),
video::S3DVertex(1, 0, 1, -1, 0, 0, clr5, 1, 1),
video::S3DVertex(1, 1, 1, -1, 0, 0, clr5, 1, 0),
video::S3DVertex(1, 1, 0, -1, 0, 0, clr5, 1, 0),

// right
video::S3DVertex(0, 0, 0, 1, 0, 0, clr5, 0, 1),
video::S3DVertex(0, 0, 1, 1, 0, 0, clr5, 1, 1),
video::S3DVertex(0, 1, 1, 1, 0, 0, clr5, 1, 0),
video::S3DVertex(0, 1, 0, 1, 0, 0, clr5, 1, 0),
};

for (u32 i = 0; i < 24; ++i)
{
Vertices[i].Pos -= core::vector3df(0.5f, 0.5f, 0.5f);
vb->addVertex(&Vertices[i]);
}

// cube mesh
// Create indices
const u16 u[36] =
{
// back
0,2,1,
0,3,2,

// front
4,5,6,
4,6,7,

// bottom
8,10,9,
8,11,10,

// top
12,13,14,
12,14,15,

// left
16,18,17,
16,19,18,

// right
20,21,22,
20,22,23
};

ib->set_used(36);

for (u32 i = 0; i < 36; ++i)
ib->setIndex(i, u[i]);

CMesh* mesh = new CMesh();
CMaterial* mat = new CMaterial("Primitive", "BuiltIn/Shader/SpecularGlossiness/Deferred/Color.xml");

mesh->addMeshBuffer(meshBuffer, "", mat);

mat->setUniform4("uColor", SColor(255, 180, 180, 180));
mat->addAffectMesh(meshBuffer);
mat->applyMaterial();

meshBuffer->recalculateBoundingBox();
mesh->recalculateBoundingBox();

m_mesh[CPrimiviteData::Cube] = mesh;
m_materials[CPrimiviteData::Cube] = mat;

meshBuffer->drop();
}

void CPrimitiveRenderer::initMesh(IMesh* primitiveMesh, CPrimiviteData::EPrimitive primitive)
{
CMesh* mesh = new CMesh();
Expand Down
2 changes: 2 additions & 0 deletions Projects/Skylicht/Components/Source/Primitive/CPrimitiveRenderer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ namespace Skylicht

void initMesh(IMesh* primitiveMesh, CPrimiviteData::EPrimitive primitive);

void initCube();

virtual void beginQuery(CEntityManager* entityManager);

virtual void onQuery(CEntityManager* entityManager, CEntity* entity);
Expand Down
2 changes: 1 addition & 1 deletion Projects/Skylicht/Engine/Source/Culling/CCullingSystem.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ namespace Skylicht
{
CWorldTransformData* transform = (CWorldTransformData*)entity->getDataByIndex(CWorldTransformData::DataTypeIndex);
CWorldInverseTransformData* invTransform = (CWorldInverseTransformData*)entity->getDataByIndex(CWorldInverseTransformData::DataTypeIndex);

{
m_cullings.push_back(culling);

Expand Down
13 changes: 8 additions & 5 deletions Projects/Skylicht/Engine/Source/Culling/CCullingSystem.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ namespace Skylicht
{
struct SBBoxAndMaterial
{
// Local BBox to check culling
core::aabbox3df BBox;

// Material to check render pipeline cull
ArrayMaterial* Materials;

SBBoxAndMaterial(const core::aabbox3df& box, ArrayMaterial* m)
Expand All @@ -60,14 +63,14 @@ namespace Skylicht

virtual void beginQuery(CEntityManager* entityManager);

virtual void onQuery(CEntityManager *entityManager, CEntity *entity);
virtual void onQuery(CEntityManager* entityManager, CEntity* entity);

virtual void init(CEntityManager *entityManager);
virtual void init(CEntityManager* entityManager);

virtual void update(CEntityManager *entityManager);
virtual void update(CEntityManager* entityManager);

virtual void render(CEntityManager *entityManager);
virtual void render(CEntityManager* entityManager);

virtual void postRender(CEntityManager *entityManager);
virtual void postRender(CEntityManager* entityManager);
};
}
1 change: 1 addition & 0 deletions Projects/Skylicht/Engine/Source/Lighting/CDirectionalLight.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ namespace Skylicht
{
// default 2 bounce
m_bakeBounce = 2;
m_castShadow = true;
}

CDirectionalLight::~CDirectionalLight()
Expand Down
6 changes: 5 additions & 1 deletion Projects/Skylicht/Engine/Source/RenderPipeline/CShadowMapRP.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,13 @@ namespace Skylicht
return;

// use direction light
bool castShadow = true;

CDirectionalLight* light = CShaderLighting::getDirectionalLight();
if (light != NULL)
{
m_lightDirection = light->getDirection();
castShadow = light->isCastShadow();
}

m_csm->update(camera, m_lightDirection);
Expand All @@ -170,7 +173,8 @@ namespace Skylicht

m_currentCSM = i;

entityManager->cullingAndRender();
if (castShadow)
entityManager->cullingAndRender();
}

// todo
Expand Down

0 comments on commit f34f898

Please sign in to comment.