1.1 --- a/src/volray.cc	Sun Apr 15 00:11:38 2012 +0300
     1.2 +++ b/src/volray.cc	Sun Apr 15 02:22:13 2012 +0300
     1.3 @@ -259,20 +259,6 @@
     1.4  	glEnd();
     1.5  
     1.6  	glDisable(GL_TEXTURE_1D);
     1.7 -
     1.8 -	glLineWidth(2.0);
     1.9 -	glBegin(GL_LINE_LOOP);
    1.10 -	/*if(uimode == UIMODE_XFER) {
    1.11 -		glColor3f(1, 0, 0);
    1.12 -	} else {*/
    1.13 -		glColor3f(0, 0, 1);
    1.14 -	//}
    1.15 -	glVertex2f(0, 0);
    1.16 -	glVertex2f(1, 0);
    1.17 -	glVertex2f(1, 1);
    1.18 -	glVertex2f(0, 1);
    1.19 -	glEnd();
    1.20 -
    1.21  	glPopMatrix();
    1.22  }
    1.23  
    1.24 @@ -342,6 +328,21 @@
    1.25  	prev_y = y;
    1.26  }
    1.27  
    1.28 +void modxfer(int dx, int dy, int max_x, int max_y)
    1.29 +{
    1.30 +	if(!dx && !dy)
    1.31 +		return;
    1.32 +
    1.33 +	xfer_mean += dx / (float)max_x;
    1.34 +	xfer_sdev += 0.5 * dy / (float)max_y;
    1.35 +
    1.36 +	xfer_mean = xfer_mean < 0.0 ? 0.0 : (xfer_mean > 1.0 ? 1.0 : xfer_mean);
    1.37 +	xfer_sdev = xfer_sdev < 0.0 ? 0.0 : (xfer_sdev > 1.0 ? 1.0 : xfer_sdev);
    1.38 +
    1.39 +	xfertex_needs_recalc = true;
    1.40 +	post_redisplay();
    1.41 +}
    1.42 +
    1.43  void volray_motion(int x, int y)
    1.44  {
    1.45  	int dx = x - prev_x;
    1.46 @@ -351,16 +352,6 @@
    1.47  
    1.48  	/*switch(uimode) {
    1.49  	case UIMODE_XFER:
    1.50 -		if(dx || dy) {
    1.51 -			xfer_mean += dx / (float)win_xsz;
    1.52 -			xfer_sdev += 0.5 * dy / (float)win_ysz;
    1.53 -
    1.54 -			xfer_mean = xfer_mean < 0.0 ? 0.0 : (xfer_mean > 1.0 ? 1.0 : xfer_mean);
    1.55 -			xfer_sdev = xfer_sdev < 0.0 ? 0.0 : (xfer_sdev > 1.0 ? 1.0 : xfer_sdev);
    1.56 -
    1.57 -			xfertex_needs_recalc = true;
    1.58 -			post_redisplay();
    1.59 -		}
    1.60  		break;
    1.61  
    1.62  	case UIMODE_CURSOR: