kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

- more nurbs fixes... as it turns out, rendering of cyclic UV didn't

Browse Source 
really work at all. Fortunately no one actually *USES* nurbs so
   no one noticed. This is bug from NaN days (strubi, I am looking at
   you here) which I guess says a lot (or a little) about NURBS usage.
   And as usual, the correct code is shorter.
 - added do_version copy of ME_OPT_EDGES flag
This commit is contained in:
Daniel Dunbar 2005-08-13 05:05:18 +00:00
parent 7b1dcf4c42
commit 74dc0e191d
3 changed files with 24 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source/blender/blenkernel/intern/curve.c
View File

@ -1061,8 +1061,6 @@ See also blenderWorldManipulation.c: init_render_surf()
*/
sizeu = nu->resolu; sizev = nu->resolv;
if (nu->flagu & CU_CYCLIC) sizeu++;
if (nu->flagv & CU_CYCLIC) sizev++;
if(nu->pntsv>1) tot+= sizeu * sizev;
nu= nu->next;
@ -1075,9 +1073,6 @@ See also blenderWorldManipulation.c: init_render_surf()
if(nu->pntsv>1) {
sizeu = nu->resolu;
sizev = nu->resolv;
if (nu->flagu & CU_CYCLIC) sizeu++;
if (nu->flagv & CU_CYCLIC) sizev++;
if(cu->flag & CU_UV_ORCO) {
for(b=0; b< sizeu; b++) {
@ -1098,30 +1093,14 @@ See also blenderWorldManipulation.c: init_render_surf()
else {
makeNurbfaces(nu, data, sizeof(*data)*sizev*3);
for(b=0; b<nu->resolu; b++) {
for(a=0; a<nu->resolv; a++) {
for(b=0; b<sizeu; b++) {
for(a=0; a<sizev; a++) {
data = cu->orco + 3 * (b * sizev + a);
data[0]= (data[0]-cu->loc[0])/cu->size[0];
data[1]= (data[1]-cu->loc[1])/cu->size[1];
data[2]= (data[2]-cu->loc[2])/cu->size[2];
}
}
/* copy U/V-cyclic orco's */
if (nu->flagv & CU_CYCLIC) {
b = sizeu - 1;
for(a=0; a< sizev; a++) {
data = cu->orco + 3 * (b * sizev + a);
VECCOPY(data, cu->orco + 3*a);
}
}
if (nu->flagu & CU_CYCLIC) {
a = sizev - 1;
for(b=0; b< sizeu; b++) {
data = cu->orco + 3 * (b * sizev + a);
VECCOPY(data, cu->orco + 3 * b*sizev);
}
}
}
}
nu= nu->next;

2
source/blender/blenloader/intern/readfile.c
View File

@ -4841,6 +4841,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
smd->modifier.mode |= 1;
if (me->subdivr!=0)
smd->modifier.mode |= 2;
if (me->flag&ME_OPT_EDGES)
smd->flags |= eSubsurfModifierFlag_ControlEdges;
BLI_addtail(&ob->modifiers, smd);
}

58
source/blender/renderconverter/intern/convertBlenderScene.c
View File

@ -1818,8 +1818,8 @@ static void init_render_surf(Object *ob)
data= dl->verts;
dl->type= DL_SURF;
/* if nurbs cyclic (u/v) set flags in displist accordingly */
if(nu->flagv & CU_CYCLIC) dl->flag |= DL_CYCL_V;
if(nu->flagu & CU_CYCLIC) dl->flag |= DL_CYCL_U;
if(nu->flagv & CU_CYCLIC) dl->flag |= DL_CYCL_U;
if(nu->flagu & CU_CYCLIC) dl->flag |= DL_CYCL_V;
makeNurbfaces(nu, data, 0);
}
@ -1848,8 +1848,10 @@ static void init_render_surf(Object *ob)
while(dl) {
/* watch out: u ^= y, v ^= x !! */
if(dl->type==DL_SURF) {
int nsizeu, nsizev;
startvert= R.totvert;
sizeu = dl->parts; sizev = dl->nr;
nsizeu = sizeu = dl->parts; nsizev = sizev = dl->nr;
data= dl->verts;
for (u = 0; u < sizeu; u++) {
@ -1869,68 +1871,48 @@ static void init_render_surf(Object *ob)
MTC_Mat4MulVecfl(mat, ver->co);
}
/* if V-cyclic, add extra vertices at end of the row */
if (dl->flag & DL_CYCL_V) {
if (dl->flag & DL_CYCL_U) {
ver= RE_findOrAddVert(R.totvert++);
VECCOPY(ver->co, v1->co);
if(orco) {
ver->orco= orco;
orco+= 3;
ver->orco= cu->orco + 3*(u*sizev + 0);
}
}
}
if (dl->flag & DL_CYCL_V) sizev++; /* adapt U dimension */
/* Done before next loop to get corner vert */
if (dl->flag & DL_CYCL_U) nsizev++;
if (dl->flag & DL_CYCL_V) nsizeu++;
/* if U cyclic, add extra row at end of column */
if (dl->flag & DL_CYCL_U) {
for (v = 0; v < sizev; v++) {
if (dl->flag & DL_CYCL_V) {
for (v = 0; v < nsizev; v++) {
v1= RE_findOrAddVert(startvert + v);
ver= RE_findOrAddVert(R.totvert++);
VECCOPY(ver->co, v1->co);
if(orco) {
ver->orco= orco;
orco +=3;
ver->orco= cu->orco + 3*(0*sizev + v);
}
}
sizeu++;
}
}
sizeu = nsizeu;
sizev = nsizev;
startvlak= R.totvlak;
/* process generic surface */
for(u = 0; u < sizeu - 1; u++) {
/*
^ ()----p4----p3----()
| | | | |
u | | | |
| | | |
()----p1----p2----()
v ->
*/
p1 = startvert + u * sizev; /* walk through face list */
p2 = p1 + 1;
p3 = p2 + sizev;
p4 = p3 - 1;
for(v = 0; v < sizev - 1; v++) {
v1= RE_findOrAddVert(p1);
v2= RE_findOrAddVert(p2);
v3= RE_findOrAddVert(p3);
v4= RE_findOrAddVert(p4);
/* normal len can be 0 if there are double nurbs control vertices
so zero area faces can be generated
->> there is at the moment no proper way to fix this except
generating empty render faces */
vlr= RE_findOrAddVlak(R.totvlak++);
vlr->ob= vlr_set_ob(ob);
vlr->v1= v1; vlr->v2= v2; vlr->v3= v3; vlr->v4= v4;
@ -1956,7 +1938,7 @@ static void init_render_surf(Object *ob)
}
/* fix normals for U resp. V cyclic faces */
sizeu--; sizev--; /* dec size for face array */
if (dl->flag & DL_CYCL_U) {
if (dl->flag & DL_CYCL_V) {
for (v = 0; v < sizev; v++)
{
@ -1969,7 +1951,7 @@ static void init_render_surf(Object *ob)
VecAddf(vlr->v4->n, vlr->v4->n, vlr1->n);
}
}
if (dl->flag & DL_CYCL_V) {
if (dl->flag & DL_CYCL_U) {
for (u = 0; u < sizeu; u++)
{
@ -1999,7 +1981,7 @@ static void init_render_surf(Object *ob)
normals of the surrounding faces to all of the duplicates of []
*/
if ((dl->flag & DL_CYCL_U) && (dl->flag & DL_CYCL_V))
if ((dl->flag & DL_CYCL_V) && (dl->flag & DL_CYCL_U))
{
vlr= RE_findOrAddVlak(UVTOINDEX(sizeu - 1, sizev - 1)); /* (m,n) */
vlr1= RE_findOrAddVlak(UVTOINDEX(0,0)); /* (0,0) */