Differential D4602 Diff 14445 intern/cycles/kernel/shaders/node_texture.h

Changeset View

Standalone View

intern/cycles/kernel/shaders/node_texture.h

Context not available.
	return color(r, g, b);	return color(r, g, b);
	}	}

	void voronoi(point p, float e, float da[4], point pa[4])	void voronoi(point p, string metric, float e, float da[4], point pa[4])
	{	{
	/* returns distances in da and point coords in pa */	/* returns distances in da and point coords in pa */
	int xx, yy, zz, xi, yi, zi;	int xx, yy, zz, xi, yi, zi;
Context not available.
	point ip = point(xx, yy, zz);	point ip = point(xx, yy, zz);
	point vp = (point)cellnoise_color(ip);	point vp = (point)cellnoise_color(ip);
	point pd = p - (vp + ip);	point pd = p - (vp + ip);
	float d = dot(pd, pd);	float d = 0.0;
		if (metric == "distance") {
	vp += point(xx, yy, zz);	d = dot(pd, pd);

	if (d < da[0]) {
	da[3] = da[2];
	da[2] = da[1];
	da[1] = da[0];
	da[0] = d;

	pa[3] = pa[2];
	pa[2] = pa[1];
	pa[1] = pa[0];
	pa[0] = vp;
	}	}
	else if (d < da[1]) {	else if (metric == "manhattan") {
	da[3] = da[2];	d = fabs(pd[0]) + fabs(pd[1]) + fabs(pd[2]);
	da[2] = da[1];
	da[1] = d;

	pa[3] = pa[2];
	pa[2] = pa[1];
	pa[1] = vp;
	}	}
	else if (d < da[2]) {	else if (metric == "chebychev") {
	da[3] = da[2];	d = max(fabs(pd[0]), max(fabs(pd[1]), fabs(pd[2])));
	da[2] = d;	}
		else if (metric == "minkowski") {
		d = pow(pow(fabs(pd[0]), e) + pow(fabs(pd[1]), e) + pow(fabs(pd[2]), e), 1.0/e);
		}

		vp += point(xx, yy, zz);

	pa[3] = pa[2];	int insertPt;
		linux_drAuthorUnsubmitted Done Inline Actions @Clément Foucault (fclem), this is one particular piece of code I wanted to ask you about. I know you just changed this to use a `vec4` and swizzlers. If this is a real efficiency gain, that’s great, we should use that. (I can’t even run this on my hardware to test it now). If the performance difference isn’t noticeable, I think my changes here may be more readable. What do you think? linux_dr: @fclem, this is one particular piece of code I wanted to ask you about. I know you just changed…
	pa[2] = vp;	for(insertPt = 4; (insertPt > 0) && (d < da[insertPt - 1]); insertPt--) {
		if (insertPt < 4) {
		da[insertPt] = da[insertPt - 1];
		pa[insertPt] = pa[insertPt - 1];
		}
	}	}
	else if (d < da[3]) {	if (insertPt < 4) {
	da[3] = d;	da[insertPt] = d;
	pa[3] = vp;	pa[insertPt] = vp;
	}	}
	}	}
	}	}
Context not available.