projects
/
laserbrain_demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
started the renderer abstraction and the cubemap renderer
[laserbrain_demo]
/
src
/
app.cc
diff --git
a/src/app.cc
b/src/app.cc
index
d2f9476
..
1cf21bd
100644
(file)
--- a/
src/app.cc
+++ b/
src/app.cc
@@
-13,6
+13,7
@@
#include "ui.h"
#include "opt.h"
#include "post.h"
#include "ui.h"
#include "opt.h"
#include "post.h"
+#include "renderer.h"
#include "blob_exhibit.h"
#define NEAR_CLIP 5.0
#include "blob_exhibit.h"
#define NEAR_CLIP 5.0
@@
-63,6
+64,8
@@
static long prev_msec;
static BlobExhibit *blobs;
static bool show_blobs;
static BlobExhibit *blobs;
static bool show_blobs;
+static Renderer *rend;
+
bool app_init(int argc, char **argv)
{
bool app_init(int argc, char **argv)
{
@@
-139,6
+142,9
@@
bool app_init(int argc, char **argv)
sdr_post_gamma = create_program_load("sdr/post_gamma.v.glsl", "sdr/post_gamma.p.glsl");
}
sdr_post_gamma = create_program_load("sdr/post_gamma.v.glsl", "sdr/post_gamma.p.glsl");
}
+ rend = new Renderer;
+ rend->set_scene(mscn);
+
glUseProgram(0);
if(opt.vr || opt.fullscreen) {
glUseProgram(0);
if(opt.vr || opt.fullscreen) {
@@
-154,6
+160,8
@@
void app_cleanup()
goatvr_shutdown();
}
goatvr_shutdown();
}
+ delete rend;
+
blobs->destroy();
delete blobs->node;
delete blobs;
blobs->destroy();
delete blobs->node;
delete blobs;
@@
-354,7
+362,8
@@
static void draw_scene()
set_light(1, lpos[1], Vec3(0.6, 0.7, 1.0) * 0.6);
set_light(2, lpos[2], Vec3(0.8, 1.0, 0.8) * 0.3);
set_light(1, lpos[1], Vec3(0.6, 0.7, 1.0) * 0.6);
set_light(2, lpos[2], Vec3(0.8, 1.0, 0.8) * 0.3);
- mscn->draw();
+ rend->draw();
+
if(show_blobs) {
blobs->draw();
}
if(show_blobs) {
blobs->draw();
}