Differential D5132 Diff 16062 source/blender/editors/space_image/image_ops.c

Changeset View

Standalone View

Context not available.
	const bool zoom_to_pos)	const bool zoom_to_pos)
	{	{
	float factor;	float factor;
		float delta;

	if (viewzoom == USER_ZOOM_CONT) {	if (viewzoom != USER_ZOOM_SCALE) {
	double time = PIL_check_seconds_timer();
	float time_step = (float)(time - vpd->timer_lastdraw);
	float fac;
	float zfac;

	if (U.uiflag & USER_ZOOM_HORIZ) {	if (U.uiflag & USER_ZOOM_HORIZ) {
	fac = (float)(x - vpd->origx);	delta = (float)(x - vpd->origx);
	}	}
	else {	else {
	fac = (float)(y - vpd->origy);	delta = (float)(y - vpd->origy);
	}	}
		}
		else {
		delta = x - vpd->origx + y - vpd->origy;
		}

	if (zoom_invert) {	if (zoom_invert) {
	fac = -fac;	delta = -delta;
	}	}

		if (viewzoom == USER_ZOOM_CONT) {
		double time = PIL_check_seconds_timer();
		float time_step = (float)(time - vpd->timer_lastdraw);
		float zfac;

	/* oldstyle zoom */	/* oldstyle zoom */
	zfac = 1.0f + ((fac / 20.0f) * time_step);	zfac = 1.0f + ((delta / 20.0f) * time_step);
	vpd->timer_lastdraw = time;	vpd->timer_lastdraw = time;
	/* this is the final zoom, but instead make it into a factor */	/* this is the final zoom, but instead make it into a factor */
	// zoom = vpd->sima->zoom * zfac;
	factor = (vpd->sima->zoom * zfac) / vpd->zoom;	factor = (vpd->sima->zoom * zfac) / vpd->zoom;
	}	}
	else {	else {
	/* for now do the same things for scale and dolly */
	float delta = x - vpd->origx + y - vpd->origy;

	if (zoom_invert) {
	delta *= -1.0f;
	}

	factor = 1.0f + delta / 300.0f;	factor = 1.0f + delta / 300.0f;
	}	}

Context not available.