Differential D12719 Diff 42813 source/blender/blenlib/intern/noise.cc

Changeset View

Standalone View

source/blender/blenlib/intern/noise.cc

Show First 20 Lines • Show All 234 Lines • ▼ Show 20 Lines	float hash_float_to_float(float3 k)
return hash_to_float(hash_float(k));		return hash_to_float(hash_float(k));
}		}

float hash_float_to_float(float4 k)		float hash_float_to_float(float4 k)
{		{
return hash_to_float(hash_float(k));		return hash_to_float(hash_float(k));
}		}

		/* Hash floats compatible with Cycles/Eevee shaders */
		JacquesLuckeUnsubmitted Done Inline Actions [3/50] Building CXX object source/blender/blenlib/CMakeFiles/bf_blenlib.dir/intern/noise.cc.o /home/jacques/blender-git/blender/source/blender/blenlib/intern/noise.cc:243:7: warning: no previous declaration for ‘float blender::noise::hash_float2_to_float(blender::float2)’ [-Wmissing-declarations] 243 \| float hash_float2_to_float(float2 k) \| ^~~~~~~~~~~~~~~~~~~~ /home/jacques/blender-git/blender/source/blender/blenlib/intern/noise.cc:248:7: warning: no previous declaration for ‘float blender::noise::hash_float4_to_float(blender::float4)’ [-Wmissing-declarations] 248 \| float hash_float4_to_float(float4 k) \| ^~~~~~~~~~~~~~~~~~~~ I wonder, does this have to be a different function than `hash_float_to_float(float2 k)`? Maybe only one of the two is necessary. If only your new method is the one we should use, fine with me, but I'm not sure. Needs to be investigated. JacquesLucke: ``` [3/50] Building CXX object source/blender/blenlib/CMakeFiles/bf_blenlib.dir/intern/noise.cc.

		float shd_hash_float_to_float(float k)
		{
		return uint_to_float_01(hash(float_as_uint(k)));
		}
		JacquesLuckeUnsubmitted Done Inline Actions This function isn't used. JacquesLucke: This function isn't used.
		charlieAuthorUnsubmitted Done Inline Actions I've included hash functions ready for other shaders. Maybe a separate commit? charlie: I've included hash functions ready for other shaders. Maybe a separate commit?

		float shd_hash_float_to_float(float2 k)
		{
		return uint_to_float_01(hash(float_as_uint(k.x), float_as_uint(k.y)));
		}

		float shd_hash_float_to_float(float3 k)
		{
		return uint_to_float_01(hash(float_as_uint(k.x), float_as_uint(k.y), float_as_uint(k.z)));
		}
		JacquesLuckeUnsubmitted Done Inline Actions That's probably for consistency, but it does look a bit unnecessary to hash the constant `1.0` as well. Fortunately, that will probably be optimized away by the compiler. JacquesLucke: That's probably for consistency, but it does look a bit unnecessary to hash the constant `1.0`…
		charlieAuthorUnsubmitted Done Inline Actions This is a copy of the cycles code. Perhaps it can be optimised later if the compiler doesn't do that. charlie: This is a copy of the cycles code. Perhaps it can be optimised later if the compiler doesn't do…

		float shd_hash_float_to_float(float4 k)
		{
		return uint_to_float_01(
		hash(float_as_uint(k.x), float_as_uint(k.y), float_as_uint(k.z), float_as_uint(k.w)));
		}

		float2 shd_hash_float_to_float2(float2 k)
		{
		return float2(shd_hash_float_to_float(k), shd_hash_float_to_float(float3(k.x, k.y, 1.0)));
		}

		float3 shd_hash_float_to_float3(float k)
		{
		return float3(shd_hash_float_to_float(k),
		shd_hash_float_to_float(float2(k, 1.0)),
		shd_hash_float_to_float(float2(k, 2.0)));
		}

		float3 shd_hash_float_to_float3(float2 k)
		{
		return float3(shd_hash_float_to_float(k),
		shd_hash_float_to_float(float3(k.x, k.y, 1.0)),
		shd_hash_float_to_float(float3(k.x, k.y, 2.0)));
		}

		float3 shd_hash_float_to_float3(float3 k)
		{
		return float3(shd_hash_float_to_float(k),
		shd_hash_float_to_float(float4(k.x, k.y, k.z, 1.0)),
		shd_hash_float_to_float(float4(k.x, k.y, k.z, 2.0)));
		}

		float3 shd_hash_float_to_float3(float4 k)
		{
		return float3(shd_hash_float_to_float(k),
		shd_hash_float_to_float(float4(k.z, k.x, k.w, k.y)),
		shd_hash_float_to_float(float4(k.w, k.z, k.y, k.x)));
		}

		float4 shd_hash_float_to_float4(float4 k)
		{
		return float4(shd_hash_float_to_float(k),
		shd_hash_float_to_float(float4(k.w, k.x, k.y, k.z)),
		shd_hash_float_to_float(float4(k.z, k.w, k.x, k.y)),
		shd_hash_float_to_float(float4(k.y, k.z, k.w, k.x)));
		}

/* ------------		/* ------------
* Perlin Noise		* Perlin Noise
* ------------		* ------------
*		*
* Perlin, Ken. "Improving noise." Proceedings of the 29th annual conference on Computer graphics		* Perlin, Ken. "Improving noise." Proceedings of the 29th annual conference on Computer graphics
* and interactive techniques. 2002.		* and interactive techniques. 2002.
*		*
* This implementation is functionally identical to the implementations in EEVEE, OSL, and SVM. So		* This implementation is functionally identical to the implementations in EEVEE, OSL, and SVM. So
▲ Show 20 Lines • Show All 467 Lines • Show Last 20 Lines