oculus1

diff src/main.cc @ 25:9dc19419f52b

merged
author John Tsiombikas <nuclear@member.fsf.org>
date Fri, 04 Oct 2013 14:50:50 +0300
parents 8419d8a13cee ef4c9d8eeca7
children 75ab0d4ce2bb
line diff
     1.1 --- a/src/main.cc	Fri Oct 04 14:50:26 2013 +0300
     1.2 +++ b/src/main.cc	Fri Oct 04 14:50:50 2013 +0300
     1.3 @@ -500,26 +500,6 @@
     1.4  {
     1.5  	width = x;
     1.6  	height = y;
     1.7 -
     1.8 -	if(!use_vr) {
     1.9 -		rtarg_width = width;
    1.10 -		rtarg_height = height;
    1.11 -
    1.12 -		int new_tex_width = next_pow2(width);
    1.13 -		int new_tex_height = next_pow2(height);
    1.14 -
    1.15 -		if(new_tex_width != rtarg_tex_width || new_tex_height != rtarg_tex_width) {
    1.16 -			// TODO
    1.17 -			exit(1);
    1.18 -		}
    1.19 -
    1.20 -		rtarg_tex_width = new_tex_width;
    1.21 -		rtarg_tex_height = new_tex_height;
    1.22 -
    1.23 -		tex_scale_x = (float)rtarg_width / (float)rtarg_tex_width;
    1.24 -		tex_scale_y = (float)rtarg_height / (float)rtarg_tex_height;
    1.25 -
    1.26 -	}
    1.27  }
    1.28  
    1.29  static void keyb(unsigned char key, int x, int y)
    1.30 @@ -535,6 +515,13 @@
    1.31  	case 'f':
    1.32  		toggle_fullscreen();
    1.33  		break;
    1.34 +
    1.35 +	case '\\':
    1.36 +		{
    1.37 +			extern bool dbg_enable;
    1.38 +			dbg_enable = !dbg_enable;
    1.39 +		}
    1.40 +		break;
    1.41  	}
    1.42  
    1.43  	keystate[key] = true;