Differential D4602 Diff 14445 source/blender/gpu/shaders/gpu_shader_material.glsl

Changeset View

Standalone View

source/blender/gpu/shaders/gpu_shader_material.glsl

Context not available.
	color = vec4(1.0);	color = vec4(1.0);
	}	}

	void node_tex_voronoi(vec3 co, float scale, float exponent, float coloring, float metric, float feature, out vec4 color, out float fac)	void node_tex_voronoi_neighbors(vec3 p, float metric, float e, out float da[4], out vec3 pa[4])
	{	{
	vec3 p = co * scale;	/* Compute the distance to and the position of the closest neighbors to p.
		*
		* The neighbors are randomly placed, 1 each in a 3x3x3 grid (Worley pattern).
		* The distances and points are returned in ascending order, i.e. da[0] and pa[0] will
		* contain the distance to the closest point and its coordinates respectively.
		*/
	int xx, yy, zz, xi, yi, zi;	int xx, yy, zz, xi, yi, zi;
	float da[4];
	vec3 pa[4];

	xi = floor_to_int(p[0]);	xi = floor_to_int(p[0]);
	yi = floor_to_int(p[1]);	yi = floor_to_int(p[1]);
		LazyDodoUnsubmitted Not Done Inline Actions exponent needs to be e LazyDodo: exponent needs to be e
Context not available.
	}	}

	vp += vec3(xx, yy, zz);	vp += vec3(xx, yy, zz);
	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]) {
	da[3] = da[2];
	da[2] = da[1];
	da[1] = d;

	pa[3] = pa[2];
	pa[2] = pa[1];
	pa[1] = vp;
	}
	else if (d < da[2]) {
	da[3] = da[2];
	da[2] = d;

	pa[3] = pa[2];	int insertPt;
	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;
	}	}
	}	}
	}	}
	}	}
		}

		void node_tex_voronoi(vec3 co, float scale, float exponent, float coloring, float metric, float feature, out vec4 color, out float fac, out vec3 pOut)
		{
		float da[4];
		vec3 pa[4];

		node_tex_voronoi_neighbors(co * scale, metric, e, da, pa);
		LazyDodoUnsubmitted Not Done Inline Actions e needs to be exponent LazyDodo: e needs to be exponent

		/* Default: F1 => Closest point */
		int idx = 0;
		vec3 vOffset = vec3(0.0, 0.0, 0.0);
		float dOffset = 0.0;
		pOut = co;

		if (feature == 1.0) { /* F2 */
		idx = 1;
		}
		else if (feature == 2.0) { /* F3 */
		idx = 2;
		}
		else if (feature == 3.0) { /* F4 */
		idx = 3;
		}
		else if (feature == 4.0) { /* F2F1 */
		/* F2 - F1 */
		idx = 1;
		pOut = pa[0];
		vOffset = pa[0];
		dOffset = da[0];
		}
		outVector = pa[idx] - pOut;
		LazyDodoUnsubmitted Not Done Inline Actions outVector doesn't exist, probably pOut? LazyDodo: outVector doesn't exist, probably pOut?
		linux_drAuthorUnsubmitted Not Done Inline Actions Looks like there's a little algorithmic corruption that happened here. It's not a simple variable rename. Let me untangle it. linux_dr: Looks like there's a little algorithmic corruption that happened here. It's not a simple…
	if (coloring == 0.0) {	if (coloring == 0.0) {
	/* Intensity output */	/* Intensity output */
	if (feature == 0.0) { /* F1 */	fac = abs(da[idx] - dOffset);
	fac = abs(da[0]);	color = vec4(fac, fac, fac, 1);
	}
	else if (feature == 1.0) { /* F2 */
	fac = abs(da[1]);
	}
	else if (feature == 2.0) { /* F3 */
	fac = abs(da[2]);
	}
	else if (feature == 3.0) { /* F4 */
	fac = abs(da[3]);
	}
	else if (feature == 4.0) { /* F2F1 */
	fac = abs(da[1] - da[0]);
	}
	color = vec4(fac, fac, fac, 1.0);
	}	}
	else {	else {
	/* Color output */	/* Color output */
	vec3 col = vec3(fac, fac, fac);	vec3 col = pa[idx] - vOffset;
	if (feature == 0.0) { /* F1 */	color = vec4(cellnoise_color(col), 1);
	col = pa[0];
	}
	else if (feature == 1.0) { /* F2 */
	col = pa[1];
	}
	else if (feature == 2.0) { /* F3 */
	col = pa[2];
	}
	else if (feature == 3.0) { /* F4 */
	col = pa[3];
	}
	else if (feature == 4.0) { /* F2F1 */
	col = abs(pa[1] - pa[0]);
	}

	color = vec4(cellnoise_color(col), 1.0);
	fac = (color.x + color.y + color.z) * (1.0 / 3.0);	fac = (color.x + color.y + color.z) * (1.0 / 3.0);
	}	}
	}	}
Context not available.