
This patch continue the efforts to split the `gpu_shader_material` file started in D5569. Dependency resolution is now recursive. Each shading node gets its own file. Additionally, some utility files are added to be shared between files, like `math_util`, `color_util`, and `hash`. Some files are always included because they may be used in the execution function, like `world_normals`. Some glsl functions appeared to be unused, so they were removed, like `output_node`, `bits_to_01`, and `exp_blender`. Other functions have been renamed to be more general and get used as utils, like `texco_norm` which became `vector_normalize`. A lot of the opengl tests fails, but those same tests also fail in master, so this is probably unrelated to this patch. Reviewers: brecht Differential Revision: https://developer.blender.org/D5616
13 lines
409 B
GLSL
13 lines
409 B
GLSL
void node_displacement_object(
|
|
float height, float midlevel, float scale, vec3 N, mat4 obmat, out vec3 result)
|
|
{
|
|
N = (vec4(N, 0.0) * obmat).xyz;
|
|
result = (height - midlevel) * scale * normalize(N);
|
|
result = (obmat * vec4(result, 0.0)).xyz;
|
|
}
|
|
|
|
void node_displacement_world(float height, float midlevel, float scale, vec3 N, out vec3 result)
|
|
{
|
|
result = (height - midlevel) * scale * normalize(N);
|
|
}
|