# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1334435477 -10800
# Node ID 437e1ba9cf395e51afc519c13850fbf2a782e928
# Parent  7e5a2dd9bca68d1de182ef4bf3d980204426e3a1
fixed on osx

diff -r 7e5a2dd9bca6 -r 437e1ba9cf39 sdr/volray.p.glsl
--- a/sdr/volray.p.glsl	Sat Apr 14 22:51:41 2012 +0300
+++ b/sdr/volray.p.glsl	Sat Apr 14 23:31:17 2012 +0300
@@ -78,7 +78,7 @@
 	float energy = 1.0;
 	float t = t0;
 	vec3 col = vec3(0.0, 0.0, 0.0);
-	const vec3 ldir = normalize(vec3(-1, 1, -4));
+	vec3 ldir = normalize(vec3(-1, 1, -4));
 
 
 	while(t < t1) {
diff -r 7e5a2dd9bca6 -r 437e1ba9cf39 src/volray.cc
--- a/src/volray.cc	Sat Apr 14 22:51:41 2012 +0300
+++ b/src/volray.cc	Sat Apr 14 23:31:17 2012 +0300
@@ -50,6 +50,8 @@
 
 static Volume *volume;
 
+static bool dbg_noray;
+
 
 bool volray_init()
 {
@@ -134,10 +136,13 @@
 		create_transfer_map(xfer_mean, xfer_sdev);
 	}
 
+	glClear(GL_COLOR_BUFFER_BIT);
+
+	if(dbg_noray)
+		return;
+
 	draw_demo();
 
-	glClear(GL_COLOR_BUFFER_BIT);
-
 	if(volume) {
 		render_volume();
 	}
@@ -203,6 +208,8 @@
 
 void volray_draw_slice(void)
 {
+	glClear(GL_COLOR_BUFFER_BIT);
+
 	glActiveTexture(GL_TEXTURE0);
 	glBindTexture(GL_TEXTURE_3D, volume->get_texture());
 	glEnable(GL_TEXTURE_3D);
@@ -231,6 +238,8 @@
 
 void volray_draw_xfer(void)
 {
+	glClear(GL_COLOR_BUFFER_BIT);
+
 	glMatrixMode(GL_MODELVIEW);
 	glPushMatrix();
 	glTranslatef(-1, -1, 0);
@@ -424,6 +433,9 @@
 		}
 	}
 
+	if(getenv("DBG_NORAY")) {
+		dbg_noray = true;
+	}
 	return 0;
 }