projects
/
demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
quick backup
[demo]
/
src
/
renderer.cc
diff --git
a/src/renderer.cc
b/src/renderer.cc
index
180f003
..
353d0db
100644
(file)
--- a/
src/renderer.cc
+++ b/
src/renderer.cc
@@
-1,5
+1,11
@@
+#include "global.h"
+
+#include "camera.h"
+#include "object.h"
#include "renderer.h"
#include "renderer.h"
+#include "scene.h"
#include "shader.h"
#include "shader.h"
+#include "shader_manager.h"
Renderer::Renderer()
{
Renderer::Renderer()
{
@@
-8,18
+14,26
@@
Renderer::Renderer()
sprog = 0;
}
sprog = 0;
}
-Renderer::Renderer(ShaderProgram *sprog, Scene *scene, Camera *camera)
+Renderer::~Renderer()
{
{
- this->scene = scene;
- this->sprog = sprog;
- this->camera = camera;
}
}
-Renderer::~Renderer()
+bool Renderer::create()
+{
+ if(!(sprog = sdr_man->create_shader_program("default.v.glsl", "default.f.glsl"))) {
+ return false;
+ }
+ return true;
+}
+
+void Renderer::draw() const
{
{
+ if(!camera || !scene)
+ return;
+
+ // sprog->set_uniform_matrix(mview_loc, camera->get_view_matrix());
}
}
-void Renderer::set_program(ShaderProgram *sprog)
+void Renderer::draw_object(Object *object) const
{
{
- this->sprog = sprog;
}
\ No newline at end of file
}
\ No newline at end of file