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

Support multiple tangents for BI render & viewport

Browse Source 
Normal Map node support for GLSL mode and the internal render (multiple tangents support).

The Normal Map node is a useful node which is present in the Cycles render.
It makes it possible to use normal mapping without additional material node in a node tree.
This patch implements Normal Map node for GLSL mode and the internal render.

Previously only the active UV layer was used to calculate tangents.
This commit is contained in:
Alexander Romanov
2016-04-26 18:43:02 +10:00
committed by Campbell Barton
parent 98babfa2b8
commit 5abae51a6e
22 changed files with 751 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/blenkernel/intern/material.c
View File

@@ -1148,7 +1148,7 @@ static void init_render_nodetree(bNodeTree *ntree, Material *basemat, int r_mode
/* parses the geom+tex nodes */
ntreeShaderGetTexcoMode(ntree, r_mode, &basemat->texco, &basemat->mode_l);
basemat->nmap_tangent_names_count = 0;
for (node = ntree->nodes.first; node; node = node->next) {
if (node->id) {
if (GS(node->id->name) == ID_MA) {
@@ -1170,6 +1170,21 @@ static void init_render_nodetree(bNodeTree *ntree, Material *basemat, int r_mode
else if (node->type == NODE_GROUP)
init_render_nodetree((bNodeTree *)node->id, basemat, r_mode, amb);
}
else if (node->typeinfo->type == SH_NODE_NORMAL_MAP) {
basemat->mode2_l |= MA_TANGENT_CONCRETE;
NodeShaderNormalMap *nm = node->storage;
bool taken_into_account = false;
for (int i = 0; i < basemat->nmap_tangent_names_count; i++) {
if (STREQ(basemat->nmap_tangent_names[i], nm->uv_map)) {
taken_into_account = true;
break;
}
}
if (!taken_into_account) {
BLI_assert(basemat->nmap_tangent_names_count < MAX_MTFACE + 1);
strcpy(basemat->nmap_tangent_names[basemat->nmap_tangent_names_count++], nm->uv_map);
}
}
}
}