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

Fix #21545: geometry node front/back incorrectly depended on camera angle, can

Browse Source 
actually be implemented simpler now.
This commit is contained in:
Brecht Van Lommel
2010-04-06 10:24:57 +00:00
parent 2275b69ff8
commit 080c49d176
3 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/nodes/intern/SHD_nodes/SHD_geom.c
View File

@@ -54,7 +54,6 @@ static void node_shader_exec_geom(void *data, bNode *node, bNodeStack **in, bNod
NodeGeometry *ngeo= (NodeGeometry*)node->storage;
ShadeInputUV *suv= &shi->uv[shi->actuv];
static float defaultvcol[4] = {1.0f, 1.0f, 1.0f, 1.0f};
static float front= 0.0;
int i;
if(ngeo->uvname[0]) {
@@ -109,14 +108,8 @@ static void node_shader_exec_geom(void *data, bNode *node, bNodeStack **in, bNod
out[GEOM_OUT_NORMAL]->datatype= NS_OSA_VECTORS;
}
/* front/back
* check the original un-flipped normals to determine front or back side */
if (shi->orignor[2] < FLT_EPSILON) {
front= 1.0f;
} else {
front = 0.0f;
}
out[GEOM_OUT_FRONTBACK]->vec[0]= front;
/* front/back, normal flipping was stored */
out[GEOM_OUT_FRONTBACK]->vec[0]= (shi->flippednor)? 0.0f: 1.0f;
}
}

3
source/blender/render/extern/include/RE_shader_ext.h vendored
View File

@@ -166,9 +166,6 @@ typedef struct ShadeInput
int depth; /* 1 or larger on raytrace shading */
int volume_depth; /* number of intersections through volumes */
/* stored copy of original face normal (facenor)
* before flipping. Used in Front/back output on geometry node */
float orignor[3];
/* for strand shading, normal at the surface */
float surfnor[3], surfdist;

6
source/blender/render/intern/source/shadeinput.c
View File

@@ -276,11 +276,6 @@ void shade_input_set_triangle_i(ShadeInput *shi, ObjectInstanceRen *obi, VlakRen
/* facenormal copy, can get flipped */
shi->flippednor= RE_vlakren_get_normal(&R, obi, vlr, shi->facenor);
/* copy of original pre-flipped normal, for geometry->front/back node output */
VECCOPY(shi->orignor, shi->facenor);
if(shi->flippednor)
VECMUL(shi->orignor, -1.0f);
/* calculate vertexnormals */
if(vlr->flag & R_SMOOTH) {
VECCOPY(shi->n1, shi->v1->n);
@@ -372,7 +367,6 @@ void shade_input_set_strand(ShadeInput *shi, StrandRen *strand, StrandPoint *spo
/* facenormal, simply viewco flipped */
VECCOPY(shi->facenor, spoint->nor);
VECCOPY(shi->orignor, shi->facenor);
/* shade_input_set_normals equivalent */
if(shi->mat->mode & MA_TANGENT_STR) {