archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T47288 Vector transform not behaving correctly with camera space and cycles

Browse Source
This commit is contained in:
Alexander Romanov
2016-02-01 18:46:32 +03:00
parent 80a5409033
commit 25de685d36
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/gpu/shaders/gpu_shader_material.glsl
View File

@@ -384,6 +384,12 @@ void vec_math_negate(vec3 v, out vec3 outv)
outv = -v;
}
void invert_z(vec3 v, out vec3 outv)
{
v.z = -v.z;
outv = v;
}
void normal(vec3 dir, vec3 nor, out vec3 outnor, out float outdot)
{
outnor = nor;

20
source/blender/nodes/shader/nodes/node_shader_vectTransform.c
View File

@@ -163,6 +163,8 @@ static int gpu_shader_vect_transform(GPUMaterial *mat, bNode *node, bNodeExecDat
const char *ptransform = "point_transform_m4v3";
const char *func_name = 0;
bool new_shading = GPU_material_use_new_shading_nodes(mat);
NodeShaderVectTransform *nodeprop = (NodeShaderVectTransform *)node->storage;
if (in[0].hasinput)
@@ -173,8 +175,22 @@ static int gpu_shader_vect_transform(GPUMaterial *mat, bNode *node, bNodeExecDat
fromto = get_gpulink_matrix_from_to(nodeprop->convert_from, nodeprop->convert_to);
func_name = (nodeprop->type == SHD_VECT_TRANSFORM_TYPE_POINT) ? ptransform : vtransform;
if (fromto)
ret = GPU_link(mat, func_name, inputlink, fromto, &out[0].link);
if (fromto) {
if (new_shading) {
/* For cycles we have inverted Z */
/* TODO: pass here the correct matrices */
if (nodeprop->convert_from == SHD_VECT_TRANSFORM_SPACE_CAMERA && nodeprop->convert_to != SHD_VECT_TRANSFORM_SPACE_CAMERA) {
ret = GPU_link(mat, "invert_z", inputlink, &inputlink);
}
ret = GPU_link(mat, func_name, inputlink, fromto, &out[0].link);
if (nodeprop->convert_to == SHD_VECT_TRANSFORM_SPACE_CAMERA && nodeprop->convert_from != SHD_VECT_TRANSFORM_SPACE_CAMERA) {
ret = GPU_link(mat, "invert_z", out[0].link, &out[0].link);
}
}
else {
ret = GPU_link(mat, func_name, inputlink, fromto, &out[0].link);
}
}
else
ret = GPU_link(mat, "set_rgb", inputlink, &out[0].link);