X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=vrtris;a=blobdiff_plain;f=src%2Fgamescr.c;h=9d156593c4febf73c47fb198e9e6fd2010431c29;hp=a55f432657cf7fb2f68236d8ef069d13252c0575;hb=96757b3e8d4c7ad71ebcae67c40c5fed14c471ce;hpb=7e20f7693be642b006fa6c4d65f6da1b00b0621f

diff --git a/src/gamescr.c b/src/gamescr.c
index a55f432..9d15659 100644
--- a/src/gamescr.c
+++ b/src/gamescr.c
@@ -2,12 +2,17 @@
 #include <time.h>
 #include <assert.h>
 #include <imago2.h>
+#ifdef BUILD_VR
+#include <goatvr.h>
+#endif
 #include "opengl.h"
 #include "game.h"
 #include "screen.h"
 #include "cmesh.h"
 #include "blocks.h"
 #include "logger.h"
+#include "gameinp.h"
+#include "color.h"
 
 int init_starfield(void);
 void draw_starfield(void);
@@ -18,7 +23,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);
@@ -144,17 +149,91 @@ static void start(void)
 	next_block = rand() % NUM_BLOCKS;
 
 	memset(pfield, 0, PF_COLS * PF_ROWS * sizeof *pfield);
+
+	ginp_repeat(500, 75, GINP_LEFT | GINP_RIGHT | GINP_DOWN);
 }
 
 static void stop(void)
 {
 }
 
+#define JTHRES	0.6
+
+#define CHECK_BUTTON(idx, gbn) \
+	if(joy_bnstate & (1 << idx)) { \
+		ginp_bnstate |= gbn; \
+	}
+
+static void update_input(float dtsec)
+{
+#ifdef BUILD_VR
+	int num_vr_sticks;
+
+	if((num_vr_sticks = goatvr_num_sticks()) > 0) {
+		float p[2];
+
+		goatvr_stick_pos(0, p);
+
+		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];
+		}
+	}
+#endif	/* BUILD_VR */
+
+	ginp_bnstate = 0;
+
+	/* joystick axis */
+	if(joy_axis[GPAD_LSTICK_X] >= JTHRES) {
+		ginp_bnstate |= GINP_RIGHT;
+	} else if(joy_axis[GPAD_LSTICK_X] <= -JTHRES) {
+		ginp_bnstate |= GINP_LEFT;
+	}
+
+	if(joy_axis[GPAD_LSTICK_Y] >= JTHRES) {
+		ginp_bnstate |= GINP_DOWN;
+	} else if(joy_axis[GPAD_LSTICK_Y] <= -JTHRES) {
+		ginp_bnstate |= GINP_UP;
+	}
+
+	CHECK_BUTTON(GPAD_LEFT, GINP_LEFT);
+	CHECK_BUTTON(GPAD_RIGHT, GINP_RIGHT);
+	CHECK_BUTTON(GPAD_UP, GINP_UP);
+	CHECK_BUTTON(GPAD_DOWN, GINP_DOWN);
+	CHECK_BUTTON(GPAD_A, GINP_ROTATE);
+	CHECK_BUTTON(GPAD_START, GINP_PAUSE);
+
+	update_ginp();
+
+	if(GINP_PRESS(GINP_LEFT)) {
+		game_keyboard('a', 1);
+	}
+	if(GINP_PRESS(GINP_RIGHT)) {
+		game_keyboard('d', 1);
+	}
+	if(GINP_PRESS(GINP_DOWN)) {
+		game_keyboard('s', 1);
+	}
+	if(GINP_PRESS(GINP_UP)) {
+		game_keyboard('\t', 1);
+	}
+	if(GINP_PRESS(GINP_ROTATE)) {
+		game_keyboard('w', 1);
+	}
+	if(GINP_PRESS(GINP_PAUSE)) {
+		game_keyboard('p', 1);
+	}
+}
+
 static void update(float dtsec)
 {
 	static long prev_tick;
 	long dt;
 
+	update_input(dtsec);
+
 	if(pause) {
 		prev_tick = time_msec;
 		return;
@@ -228,7 +307,9 @@ 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);
@@ -252,20 +333,41 @@ 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();
 }
 
 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);
 
@@ -319,6 +421,7 @@ static void keyboard(int key, int pressed)
 
 	switch(key) {
 	case 'a':
+	case KEY_LEFT:
 		if(!pause) {
 			next_pos[1] = pos[1] - 1;
 			if(collision(cur_block, next_pos)) {
@@ -330,6 +433,7 @@ static void keyboard(int key, int pressed)
 		break;
 
 	case 'd':
+	case KEY_RIGHT:
 		if(!pause) {
 			next_pos[1] = pos[1] + 1;
 			if(collision(cur_block, next_pos)) {
@@ -341,6 +445,8 @@ static void keyboard(int key, int pressed)
 		break;
 
 	case 'w':
+	case KEY_UP:
+	case ' ':
 		if(!pause) {
 			prev_rot = cur_rot;
 			cur_rot = (cur_rot + 1) & 3;
@@ -353,6 +459,7 @@ static void keyboard(int key, int pressed)
 		break;
 
 	case 's':
+	case KEY_DOWN:
 		/* ignore drops until the first update after a spawn */
 		if(cur_block >= 0 && !just_spawned && !pause) {
 			next_pos[0] = pos[0] + 1;
@@ -366,6 +473,7 @@ static void keyboard(int key, int pressed)
 
 	case '\n':
 	case '\t':
+	case '0':
 		if(!pause && cur_block >= 0) {
 			next_pos[0] = pos[0] + 1;
 			while(!collision(cur_block, next_pos)) {