qvolray

diff src/volray.cc @ 36:70b937008134

demo :)
author John Tsiombikas <nuclear@member.fsf.org>
date Sun, 15 Apr 2012 07:19:01 +0300
parents 6ca076bf5084
children 450d4c50470f
line diff
     1.1 --- a/src/volray.cc	Sun Apr 15 02:22:13 2012 +0300
     1.2 +++ b/src/volray.cc	Sun Apr 15 07:19:01 2012 +0300
     1.3 @@ -48,6 +48,7 @@
     1.4  static bool clip_z;
     1.5  static float ray_step = 0.01;
     1.6  
     1.7 +static Demo *demo;
     1.8  static Volume *volume;
     1.9  
    1.10  static bool dbg_noray;
    1.11 @@ -72,7 +73,10 @@
    1.12  	set_uniform_int(slice_sdr, "volume", 0);
    1.13  	set_uniform_int(slice_sdr, "xfer_tex", 1);
    1.14  
    1.15 -	init_demo();
    1.16 +	demo = new Demo;
    1.17 +	if(!demo->init()) {
    1.18 +		return false;
    1.19 +	}
    1.20  
    1.21  	return true;
    1.22  }
    1.23 @@ -141,7 +145,7 @@
    1.24  	if(dbg_noray)
    1.25  		return;
    1.26  
    1.27 -	draw_demo();
    1.28 +	demo->draw();
    1.29  
    1.30  	if(volume) {
    1.31  		render_volume();