qvolray
diff src/volray.cc @ 18:3d05c261a2f4
demo metaballs crash & burn
author | John Tsiombikas <nuclear@member.fsf.org> |
---|---|
date | Wed, 11 Apr 2012 06:08:59 +0300 |
parents | 17d9dc2edc91 |
children | 784d3d321caa |
line diff
1.1 --- a/src/volray.cc Wed Apr 11 01:44:45 2012 +0200 1.2 +++ b/src/volray.cc Wed Apr 11 06:08:59 2012 +0300 1.3 @@ -14,6 +14,7 @@ 1.4 #include "sdr.h" 1.5 #include "volume.h" 1.6 #include "ui.h" 1.7 +#include "demo.h" 1.8 1.9 #define XFER_MAP_SZ 512 1.10 1.11 @@ -49,7 +50,7 @@ 1.12 static float cur_z = 0.0; 1.13 static float ray_step = 0.01; 1.14 1.15 -static const Volume *volume; 1.16 +static Volume *volume; 1.17 1.18 1.19 bool volray_init() 1.20 @@ -71,14 +72,21 @@ 1.21 set_uniform_int(slice_sdr, "volume", 0); 1.22 set_uniform_int(slice_sdr, "xfer_tex", 1); 1.23 1.24 + init_demo(); 1.25 + 1.26 return true; 1.27 } 1.28 1.29 -void volray_setvolume(const Volume *vol) 1.30 +void volray_setvolume(Volume *vol) 1.31 { 1.32 volume = vol; 1.33 } 1.34 1.35 +Volume *volray_getvolume() 1.36 +{ 1.37 + return volume; 1.38 +} 1.39 + 1.40 void volray_draw(void) 1.41 { 1.42 /* recalculate primary ray texture if needed */ 1.43 @@ -90,6 +98,8 @@ 1.44 create_transfer_map(xfer_mean, xfer_sdev); 1.45 } 1.46 1.47 + draw_demo(); 1.48 + 1.49 glClear(GL_COLOR_BUFFER_BIT); 1.50 1.51 if(volume) {