j3d1/KlassischeKeplerKriege
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed much stuff with bad usage of constructor mixed with virtual functions in gl stuff. added model loading with assimp.

Browse source
This commit is contained in:
Andreas Ortmann 2016-09-28 13:00:40 +02:00
parent aedda9d48e
commit 0105bfe430
17 changed files with 402 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

8
game/renderer_ray_tracer/renderer_ray_tracer.cpp
View file

@ -16,7 +16,13 @@ static const char *fss =
namespace endofthejedi {
RendererRayTracer::RendererRayTracer() {
RendererRayTracer::RendererRayTracer()
{
}
void RendererRayTracer::setup()
{
m_shader.init();
m_shader.load(vss, GL_VERTEX_SHADER);
m_shader.load(fss, GL_FRAGMENT_SHADER);
}

4
game/renderer_ray_tracer/renderer_ray_tracer.hpp
View file

@ -11,12 +11,14 @@
namespace endofthejedi {
class RendererRayTracer: Renderer {
class RendererRayTracer : public Renderer {
private:
Shader m_shader;
protected:
public:
RendererRayTracer();
void setup() override;
void render(const game::State *state) override;
};