projects
/
vrfileman
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed Mesh wireframe rendering for non-indexed meshes
[vrfileman]
/
src
/
app.cc
diff --git
a/src/app.cc
b/src/app.cc
index
c3f6b39
..
0c82972
100644
(file)
--- a/
src/app.cc
+++ b/
src/app.cc
@@
-8,6
+8,9
@@
#include "backdrop.h"
#include "goatvr.h"
#include "opt.h"
#include "backdrop.h"
#include "goatvr.h"
#include "opt.h"
+#include "fs.h"
+
+static void draw_scene();
int win_width, win_height;
float win_aspect;
int win_width, win_height;
float win_aspect;
@@
-19,7
+22,6
@@
static bool should_swap;
static float cam_theta, cam_phi;
static float cam_height = 1.65;
static float cam_theta, cam_phi;
static float cam_height = 1.65;
-static Mesh *mesh_torus;
static bool bnstate[16];
static int prev_x, prev_y;
static bool bnstate[16];
static int prev_x, prev_y;
@@
-65,13
+67,14
@@
bool app_init(int argc, char **argv)
Mesh::use_custom_sdr_attr = false;
Mesh::use_custom_sdr_attr = false;
- mesh_torus = new Mesh;
- gen_torus(mesh_torus, 1.0, 0.25, 32, 32);
-
if(!init_backdrop()) {
return false;
}
if(!init_backdrop()) {
return false;
}
+ if(!init_fs()) {
+ return false;
+ }
+
return true;
}
return true;
}
@@
-80,7
+83,6
@@
void app_cleanup()
if(opt.vr) {
goatvr_shutdown();
}
if(opt.vr) {
goatvr_shutdown();
}
- delete mesh_torus;
cleanup_backdrop();
}
cleanup_backdrop();
}
@@
-105,7
+107,7
@@
void app_draw()
glMatrixMode(GL_MODELVIEW);
glLoadMatrixf(view_matrix[0]);
glMatrixMode(GL_MODELVIEW);
glLoadMatrixf(view_matrix[0]);
- draw_backdrop();
+ draw_scene();
}
goatvr_draw_done();
}
goatvr_draw_done();
@@
-126,7
+128,7
@@
void app_draw()
glMatrixMode(GL_MODELVIEW);
glLoadMatrixf(view_matrix[0]);
glMatrixMode(GL_MODELVIEW);
glLoadMatrixf(view_matrix[0]);
- draw_backdrop();
+ draw_scene();
app_swap_buffers();
app_redraw(); // since we added animation we need to redisplay even in non-VR mode
app_swap_buffers();
app_redraw(); // since we added animation we need to redisplay even in non-VR mode
@@
-134,6
+136,12
@@
void app_draw()
assert(glGetError() == GL_NO_ERROR);
}
assert(glGetError() == GL_NO_ERROR);
}
+static void draw_scene()
+{
+ draw_backdrop();
+ draw_fs();
+}
+
void app_reshape(int x, int y)
{
glViewport(0, 0, x, y);
void app_reshape(int x, int y)
{
glViewport(0, 0, x, y);