X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fgamescr.c;h=c31700d42e635c4f7089536674d8090801eeca17;hb=e785b2f83fd3aba82cb07ca5dd8d590d817d376c;hp=d2e021937f00912792e989e92c082678b740c716;hpb=325391b617a3f5a1f17e03598baa66d00715422d;p=vrtris diff --git a/src/gamescr.c b/src/gamescr.c index d2e0219..c31700d 100644 --- a/src/gamescr.c +++ b/src/gamescr.c @@ -2,7 +2,10 @@ #include #include #include +#ifdef BUILD_VR #include +#endif +#include #include "opengl.h" #include "game.h" #include "screen.h" @@ -10,6 +13,9 @@ #include "blocks.h" #include "logger.h" #include "gameinp.h" +#include "color.h" + +#define FONTSZ 75 int init_starfield(void); void draw_starfield(void); @@ -20,7 +26,7 @@ static void start(void); static void stop(void); static void update(float dt); static void draw(void); -static void draw_block(int block, const int *pos, int rot); +static void draw_block(int block, const int *pos, int rot, float sat, float alpha); static void drawpf(void); static void reshape(int x, int y); static void keyboard(int key, int pressed); @@ -55,8 +61,11 @@ struct game_screen game_screen = { static struct cmesh *blkmesh, *wellmesh; static unsigned int tex_well; -static float cam_theta, cam_phi, cam_dist = 30; -static int bnstate[16]; +static struct dtx_font *scorefont; + +static float cam_theta, cam_phi, cam_dist; +static float cam_height; +static unsigned int bnstate; static int prev_mx, prev_my; static long tick_interval; @@ -81,6 +90,11 @@ static int pause; static int score, level, lines; static int just_spawned; +#ifdef BUILD_VR +static int vrbn_a = 0, vrbn_x = 4; +static float vrscale = 40.0f; +#endif + #define NUM_LEVELS 21 static const long level_speed[NUM_LEVELS] = { 887, 820, 753, 686, 619, 552, 469, 368, 285, 184, @@ -103,6 +117,13 @@ static const float blkcolor[][4] = { static int init(void) { + if(!(scorefont = dtx_open_font("data/score.font", 0))) { + error_log("failed to open score font\n"); + return -1; + } + dtx_prepare_range(scorefont, FONTSZ, 32, 127); + dtx_save_glyphmap("foo.ppm", dtx_get_glyphmap(scorefont, 0)); + if(init_starfield() == -1) { return -1; } @@ -130,12 +151,15 @@ static void cleanup(void) cmesh_free(blkmesh); cmesh_free(wellmesh); glDeleteTextures(1, &tex_well); + dtx_close_font(scorefont); } static void start(void) { srand(time(0)); + glClearColor(0.12, 0.12, 0.18, 1); + pause = 0; gameover = 0; num_complines = 0; @@ -148,10 +172,37 @@ static void start(void) memset(pfield, 0, PF_COLS * PF_ROWS * sizeof *pfield); ginp_repeat(500, 75, GINP_LEFT | GINP_RIGHT | GINP_DOWN); + + dtx_use_font(scorefont, FONTSZ); + + cam_theta = 0; + cam_phi = 0; + cam_dist = 30; + cam_height = 0; + +#ifdef BUILD_VR + if(goatvr_invr()) { + int bn = goatvr_lookup_button("A"); + if(bn >= 0) vrbn_a = bn; + + bn = goatvr_lookup_button("X"); + if(bn >= 0) vrbn_x = bn; + + /* switch to VR-optimized camera parameters */ + cam_theta = 0; + cam_phi = -2.5; + cam_dist = 20; + cam_height = 3.5; + vrscale = 40.0f; + + goatvr_set_units_scale(vrscale); + } +#endif } static void stop(void) { + goatvr_set_units_scale(1.0f); } #define JTHRES 0.6 @@ -163,20 +214,33 @@ static void stop(void) static void update_input(float dtsec) { +#ifdef BUILD_VR int num_vr_sticks; - if((num_vr_sticks = goatvr_num_sticks()) > 0) { + if(goatvr_invr() && (num_vr_sticks = goatvr_num_sticks()) > 0) { float p[2]; goatvr_stick_pos(0, p); + p[1] *= 0.65; /* drops harder to trigger accidentally */ if(fabs(p[0]) > fabs(joy_axis[GPAD_LSTICK_X])) { joy_axis[GPAD_LSTICK_X] = p[0]; } if(fabs(p[1]) > fabs(joy_axis[GPAD_LSTICK_Y])) { - joy_axis[GPAD_LSTICK_Y] = p[1]; + joy_axis[GPAD_LSTICK_Y] = -p[1]; + } + + if(goatvr_button_state(vrbn_a)) { + joy_bnstate |= 1 << GPAD_A; + } + if(goatvr_button_state(vrbn_x)) { + joy_bnstate |= 1 << GPAD_START; + } + if(goatvr_action(0, GOATVR_ACTION_TRIGGER) || goatvr_action(1, GOATVR_ACTION_TRIGGER)) { + joy_bnstate |= 1 << GPAD_UP; } } +#endif /* BUILD_VR */ ginp_bnstate = 0; @@ -220,6 +284,11 @@ static void update_input(float dtsec) if(GINP_PRESS(GINP_PAUSE)) { game_keyboard('p', 1); } + +#ifdef BUILD_VR + memset(joy_axis, 0, sizeof joy_axis); + joy_bnstate = 0; +#endif } static void update(float dtsec) @@ -302,20 +371,24 @@ static void update(float dtsec) static void draw(void) { - const float lpos[] = {-1, 1, 6, 1}; + static const int nextblk_pos[] = {0, 0}; + static const float lpos[] = {-1, 1, 6, 1}; + float t; glTranslatef(0, 0, -cam_dist); glRotatef(cam_phi, 1, 0, 0); glRotatef(cam_theta, 0, 1, 0); + glTranslatef(0, -cam_height, 0); glLightfv(GL_LIGHT0, GL_POSITION, lpos); draw_starfield(); glPushAttrib(GL_ENABLE_BIT); + glEnable(GL_COLOR_MATERIAL); glBindTexture(GL_TEXTURE_2D, tex_well); glEnable(GL_TEXTURE_2D); - glDisable(GL_LIGHTING); + //glDisable(GL_LIGHTING); glColor3f(1, 1, 1); cmesh_draw(wellmesh); glPopAttrib(); @@ -326,20 +399,74 @@ static void draw(void) drawpf(); if(cur_block >= 0) { - draw_block(cur_block, pos, cur_rot); + draw_block(cur_block, pos, cur_rot, 1.0f, 1.0f); } + glPopMatrix(); + + glPushAttrib(GL_ENABLE_BIT); + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + + glPushMatrix(); + t = (float)time_msec / 1000.0f; + glTranslatef(-PF_COLS / 2 + 0.5 + PF_COLS + 3, PF_ROWS / 2 - 0.5, 0); + glTranslatef(1.5, -1, 0); + glRotatef(cos(t) * 8.0f, 1, 0, 0); + glRotatef(sin(t * 1.2f) * 10.0f, 0, 1, 0); + glTranslatef(-1.5, 1, 0); + draw_block(next_block, nextblk_pos, 0, 0.25f, 0.75f); + glPopMatrix(); + glPopAttrib(); + + glPushAttrib(GL_ENABLE_BIT); + glDisable(GL_LIGHTING); + + glPushMatrix(); + glTranslatef(-11, 6, 0); + glScalef(0.05, 0.05, 0.05); + + glColor3f(1, 1, 1); + dtx_string("Score"); + glTranslatef(0, -dtx_line_height() * 1.5, 0); + glPushMatrix(); + glScalef(1.5, 1.5, 1.5); + dtx_printf("%d", score); + glPopMatrix(); + + glTranslatef(0, -dtx_line_height() * 2, 0); + dtx_string("Level"); + glTranslatef(0, -dtx_line_height() * 1.5, 0); + glPushMatrix(); + glScalef(1.5, 1.5, 1.5); + dtx_printf("%d", level); + glPopMatrix(); + + glTranslatef(0, -dtx_line_height() * 2, 0); + dtx_string("Lines"); + glTranslatef(0, -dtx_line_height() * 1.5, 0); + glPushMatrix(); + glScalef(1.5, 1.5, 1.5); + dtx_printf("%d", lines); + glPopMatrix(); glPopMatrix(); + glPopAttrib(); } static const float blkspec[] = {0.85, 0.85, 0.85, 1}; -static void draw_block(int block, const int *pos, int rot) +static void draw_block(int block, const int *pos, int rot, float sat, float alpha) { int i; unsigned char *p = blocks[block][rot]; + float col[4], hsv[3]; + + rgb_to_hsv(blkcolor[block][0], blkcolor[block][1], blkcolor[block][2], + hsv, hsv + 1, hsv + 2); + hsv_to_rgb(hsv[0], hsv[1] * sat, hsv[2], col, col + 1, col + 2); + col[3] = alpha; - glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, blkcolor[block]); + glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, col); glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, blkspec); glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, 50.0f); @@ -488,7 +615,11 @@ static void keyboard(int key, int pressed) static void mouse(int bn, int pressed, int x, int y) { - bnstate[bn] = pressed; + if(pressed) { + bnstate |= 1 << bn; + } else { + bnstate &= ~(1 << bn); + } prev_mx = x; prev_my = y; } @@ -500,21 +631,39 @@ static void motion(int x, int y) prev_mx = x; prev_my = y; - if(bnstate[0]) { + if(bnstate & 1) { cam_theta += dx * 0.5; cam_phi += dy * 0.5; if(cam_phi < -90) cam_phi = -90; if(cam_phi > 90) cam_phi = 90; } - if(bnstate[2]) { + if(bnstate & 2) { + cam_height += dy * 0.1; + } + if(bnstate & 4) { cam_dist += dy * 0.1; if(cam_dist < 0) cam_dist = 0; } + +#ifdef DBG_PRINT_VIEW + if(bnstate) { + debug_log("Camera params\n"); + debug_log(" theta: %g phi: %g dist: %g height: %g\n", cam_theta, + cam_phi, cam_dist, cam_height); + } +#endif } static void wheel(int dir) { + /* debug code, used to figure out the best scales */ + /* + vrscale += dir * 0.01; + if(vrscale < 0.01) vrscale = 0.01; + goatvr_set_units_scale(vrscale); + debug_log("VR scale: %g\n", vrscale); + */ } static void update_cur_block(void)