rayzor

diff src/main.cc @ 12:d94a69933a71

lots of stuff, can't remember
author John Tsiombikas <nuclear@member.fsf.org>
date Sat, 12 Apr 2014 23:28:24 +0300
parents fe94d9e986ae
children a9a948809c6f
line diff
     1.1 --- a/src/main.cc	Thu Apr 10 08:42:33 2014 +0300
     1.2 +++ b/src/main.cc	Sat Apr 12 23:28:24 2014 +0300
     1.3 @@ -140,7 +140,11 @@
     1.4  	scene = new Scene;
     1.5  
     1.6  	Sphere *sph = new Sphere;
     1.7 -	scene->add_object(sph);
     1.8 +	scene->add(sph);
     1.9 +
    1.10 +	Box *box = new Box;
    1.11 +	scene->add(box);
    1.12 +	box->set_scaling(Vector3(2, 0.25, 2));
    1.13  
    1.14  	Modeller *modeller = new Modeller;
    1.15  	if(!modeller->init()) {
    1.16 @@ -288,6 +292,13 @@
    1.17  			use_asm_swap = !use_asm_swap;
    1.18  			break;
    1.19  
    1.20 +		case 'q':
    1.21 +		case 'x':
    1.22 +			if(kb_isdown(KB_ALT)) {
    1.23 +				quit_app();
    1.24 +			}
    1.25 +			break;
    1.26 +
    1.27  		default:
    1.28  			break;
    1.29  		}