X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp.cpp;fp=src%2Fapp.cpp;h=6a87042cffe553f621939e944bd6d81c37b5a39c;hb=e74f1ad236429f05db90c0ace825277e2a3fbc05;hp=a6f81f1210ecb677e0043341792ab8a0f9dba8ae;hpb=fc73b44e0f90affd42cac2f944f46633a6b8364e;p=blank.git diff --git a/src/app.cpp b/src/app.cpp index a6f81f1..6a87042 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -13,7 +13,8 @@ Application::Application(const Config &config) , window() , ctx(window.CreateContext()) , init_glew() -, program() +, chunk_prog() +, entity_prog() , cam() , world(config.world) , interface(config.interface, world) @@ -134,12 +135,12 @@ void Application::Update(int dt) { void Application::Render() { GLContext::Clear(); - program.Activate(); + chunk_prog.SetProjection(cam.Projection()); + entity_prog.SetProjection(cam.Projection()); - program.SetProjection(cam.Projection()); - world.Render(program); + world.Render(chunk_prog, entity_prog); - interface.Render(program); + interface.Render(entity_prog); window.Flip(); }