michael/charcoal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lit pipelines work!

Browse Source 
Problem was that I didn't set the material (or the normals)
This commit is contained in:
elipzer 2018-10-17 15:09:32 -04:00
parent 8ee0ab2edb
commit fd4cd2a407
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CharcoalBuiltin/LitPipeline.h
View File

@ -36,7 +36,7 @@ namespace charcoal
{ {
glutil::uniform_matrix(0, get_camera()->get_world_to_view_matrix()); glutil::uniform_matrix(0, get_camera()->get_world_to_view_matrix());
glutil::uniform_vec3(4, get_camera()->get_position()); glutil::uniform_vec3(4, get_camera()->get_position());
glutil::uniform_uint(5, m_lights.size()); glutil::uniform_uint(5, (unsigned int)m_lights.size());
glutil::uniform_lights(6, m_lights); glutil::uniform_lights(6, m_lights);
} }
private: private:

2
CharcoalBuiltin/MeshGenerator.h
View File

@ -20,7 +20,7 @@ namespace charcoal
namespace meshgenerator namespace meshgenerator
{ {
template <typename VertexType, typename IndexType> template <typename VertexType, typename IndexType>
Mesh<VertexType, IndexType>* set_material(Mesh<VertexType, IndexType>* mesh, const Material& material) Mesh<VertexType, IndexType>* set_material(Mesh<VertexType, IndexType>* mesh, const PhongMaterial& material)
{ {
for (unsigned int i = 0; i < mesh->vertex_count; ++i) for (unsigned int i = 0; i < mesh->vertex_count; ++i)
{ {

16
Example/MyBuiltinLitScene.cpp
View File

@ -11,10 +11,22 @@
MyBuiltinLitScene::MyBuiltinLitScene(Application& application) MyBuiltinLitScene::MyBuiltinLitScene(Application& application)
: Scene(application), : Scene(application),
m_shape(meshgenerator::gen_cube_p<lit::Vertex, lit::Index>(DRAW_TRIANGLES, 2.0f, 2.0f, 2.0f), DrawMode::DRAW_TRIANGLES), m_shape(
meshgenerator::set_material<lit::Vertex, lit::Index>(
meshgenerator::gen_cube_pn<lit::Vertex, lit::Index>(DRAW_TRIANGLES, 2.0f, 2.0f, 2.0f),
PhongMaterial(1.0f, 1.0f, 0.2f, 1.0f)
), DrawMode::DRAW_TRIANGLES
),
m_camera((float)TAU_1_4, (float)m_screen_size.x / m_screen_size.y, 1.0f, 10.0f, vec3(0.0f, 0.0f, 5.0f)), m_camera((float)TAU_1_4, (float)m_screen_size.x / m_screen_size.y, 1.0f, 10.0f, vec3(0.0f, 0.0f, 5.0f)),
m_batch(&m_shape, 2), m_batch(&m_shape, 2),
m_light(Position(0.0f, 5.0f, 0.0f), PhongLight::Power(0.1f, 100.0f, 1.0f), ColorRGB(1.0f, 1.0f, 1.0f), ColorRGB(1.0f, 1.0f, 1.0f), ColorRGB(1.0f, 1.0f, 1.0f), PhongLight::Fade(1.0f, 0.1f, 0.01f)) m_light(
Position(0.0f, 2.0f, 2.0f),
PhongLight::Power(0.2f, 1.0f, 1.0f),
ColorRGB(1.0f, 1.0f, 1.0f),
ColorRGB(1.0f, 1.0f, 1.0f),
ColorRGB(1.0f, 1.0f, 1.0f),
PhongLight::Fade(1.0f, 0.1f, 0.01f)
)
{ {
m_pipeline.add_batch(&m_batch); m_pipeline.add_batch(&m_batch);
m_pipeline.set_camera(&m_camera); m_pipeline.set_camera(&m_camera);