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

nurbs surface resolution is now per segment rather then being distributed over the whole surface.

Browse Source 
This is what 2D do alredy and makes resolution settings more like subsurf level.

- This makes it impossible to have a lower resolution output then the nurbs cage, however this dosnt seem a very useful feature.
- Using the do-versions from recent curve interpolation fix.

Tested with these files.

http://digilander.libero.it/pafurijaz/Files/Blender/Libellula.zip
http://digilander.libero.it/pafurijaz/Files/Blender/Martello.zip
http://digilander.libero.it/pafurijaz/Files/Blender/Punta.zip
http://digilander.libero.it/pafurijaz/Files/Blender/Phones.zip
http://digilander.libero.it/pafurijaz/Files/Blender/Tubo.zip
http://digilander.libero.it/pafurijaz/Files/Blender/Pipe.zip
http://digilander.libero.it/pafurijaz/Files/Blender/Tire.zip
http://digilander.libero.it/pafurijaz/Files/Blender/Cotton.zip
This commit is contained in:
Campbell Barton
2008-09-26 19:00:49 +00:00
parent 8e1cf42dbd
commit 3ad55e1541
4 changed files with 46 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -659,22 +659,22 @@ void makeNurbfaces(Nurb *nu, float *coord_array, int rowstride)
int i, j, iofs, jofs, cycl, len, resolu, resolv; int i, j, iofs, jofs, cycl, len, resolu, resolv;
int istart, iend, jsta, jen, *jstart, *jend, ratcomp; int istart, iend, jsta, jen, *jstart, *jend, ratcomp;
int totu = nu->pntsu*nu->resolu, totv = nu->pntsv*nu->resolv;
if(nu->knotsu==NULL || nu->knotsv==NULL) return; if(nu->knotsu==NULL || nu->knotsv==NULL) return;
if(nu->orderu>nu->pntsu) return; if(nu->orderu>nu->pntsu) return;
if(nu->orderv>nu->pntsv) return; if(nu->orderv>nu->pntsv) return;
if(coord_array==NULL) return; if(coord_array==NULL) return;
/* allocate and initialize */ /* allocate and initialize */
len= nu->pntsu*nu->pntsv; len = totu * totv;
if(len==0) return; if(len==0) return;
sum= (float *)MEM_callocN(sizeof(float)*len, "makeNurbfaces1"); sum= (float *)MEM_callocN(sizeof(float)*len, "makeNurbfaces1");
resolu= nu->resolu; len= totu*totv;
resolv= nu->resolv;
len= resolu*resolv;
if(len==0) { if(len==0) {
MEM_freeN(sum); MEM_freeN(sum);
return; return;
@@ -695,7 +695,8 @@ void makeNurbfaces(Nurb *nu, float *coord_array, int rowstride)
ustart= fp[nu->orderu-1]; ustart= fp[nu->orderu-1];
if(nu->flagu & CU_CYCLIC) uend= fp[nu->pntsu+nu->orderu-1]; if(nu->flagu & CU_CYCLIC) uend= fp[nu->pntsu+nu->orderu-1];
else uend= fp[nu->pntsu]; else uend= fp[nu->pntsu];
ustep= (uend-ustart)/(resolu-1+(nu->flagu & CU_CYCLIC)); ustep= (uend-ustart)/((nu->flagu & CU_CYCLIC) ? totu : totu - 1);
basisu= (float *)MEM_mallocN(sizeof(float)*KNOTSU(nu), "makeNurbfaces3"); basisu= (float *)MEM_mallocN(sizeof(float)*KNOTSU(nu), "makeNurbfaces3");
fp= nu->knotsv; fp= nu->knotsv;
@@ -703,17 +704,19 @@ void makeNurbfaces(Nurb *nu, float *coord_array, int rowstride)
if(nu->flagv & CU_CYCLIC) vend= fp[nu->pntsv+nu->orderv-1]; if(nu->flagv & CU_CYCLIC) vend= fp[nu->pntsv+nu->orderv-1];
else vend= fp[nu->pntsv]; else vend= fp[nu->pntsv];
vstep= (vend-vstart)/(resolv-1+(nu->flagv & CU_CYCLIC)); vstep= (vend-vstart)/((nu->flagv & CU_CYCLIC) ? totv : totv - 1);
len= KNOTSV(nu); len= KNOTSV(nu);
basisv= (float *)MEM_mallocN(sizeof(float)*len*resolv, "makeNurbfaces3"); basisv= (float *)MEM_mallocN(sizeof(float)*len*totv, "makeNurbfaces3");
jstart= (int *)MEM_mallocN(sizeof(float)*resolv, "makeNurbfaces4"); jstart= (int *)MEM_mallocN(sizeof(float)*totv, "makeNurbfaces4");
jend= (int *)MEM_mallocN(sizeof(float)*resolv, "makeNurbfaces5"); jend= (int *)MEM_mallocN(sizeof(float)*totv, "makeNurbfaces5");
/* precalculation of basisv and jstart,jend */ /* precalculation of basisv and jstart,jend */
if(nu->flagv & CU_CYCLIC) cycl= nu->orderv-1; if(nu->flagv & CU_CYCLIC) cycl= nu->orderv-1;
else cycl= 0; else cycl= 0;
v= vstart; v= vstart;
basis= basisv; basis= basisv;
resolv= totv;
while(resolv--) { while(resolv--) {
basisNurb(v, nu->orderv, (short)(nu->pntsv+cycl), nu->knotsv, basis, jstart+resolv, jend+resolv); basisNurb(v, nu->orderv, (short)(nu->pntsv+cycl), nu->knotsv, basis, jstart+resolv, jend+resolv);
basis+= KNOTSV(nu); basis+= KNOTSV(nu);
@@ -724,12 +727,13 @@ void makeNurbfaces(Nurb *nu, float *coord_array, int rowstride)
else cycl= 0; else cycl= 0;
in= coord_array; in= coord_array;
u= ustart; u= ustart;
resolu= totu;
while(resolu--) { while(resolu--) {
basisNurb(u, nu->orderu, (short)(nu->pntsu+cycl), nu->knotsu, basisu, &istart, &iend); basisNurb(u, nu->orderu, (short)(nu->pntsu+cycl), nu->knotsu, basisu, &istart, &iend);
basis= basisv; basis= basisv;
resolv= nu->resolv; resolv= totv;
while(resolv--) { while(resolv--) {
jsta= jstart[resolv]; jsta= jstart[resolv];
@@ -798,7 +802,7 @@ void makeNurbfaces(Nurb *nu, float *coord_array, int rowstride)
basis+= KNOTSV(nu); basis+= KNOTSV(nu);
} }
u+= ustep; u+= ustep;
if (rowstride!=0) in = (float*) (((unsigned char*) in) + (rowstride - 3*nu->resolv*sizeof(*in))); if (rowstride!=0) in = (float*) (((unsigned char*) in) + (rowstride - 3*totv*sizeof(*in)));
} }
/* free */ /* free */
@@ -954,8 +958,8 @@ float *make_orco_surf(Object *ob)
See also convertblender.c: init_render_surf() See also convertblender.c: init_render_surf()
*/ */
sizeu = nu->resolu; sizeu = nu->pntsu*nu->resolu;
sizev = nu->resolv; sizev = nu->pntsv*nu->resolv;
if (nu->flagu & CU_CYCLIC) sizeu++; if (nu->flagu & CU_CYCLIC) sizeu++;
if (nu->flagv & CU_CYCLIC) sizev++; if (nu->flagv & CU_CYCLIC) sizev++;
if(nu->pntsv>1) tot+= sizeu * sizev; if(nu->pntsv>1) tot+= sizeu * sizev;
@@ -968,8 +972,8 @@ float *make_orco_surf(Object *ob)
nu= cu->nurb.first; nu= cu->nurb.first;
while(nu) { while(nu) {
if(nu->pntsv>1) { if(nu->pntsv>1) {
sizeu = nu->resolu; sizeu = nu->pntsu*nu->resolu;
sizev = nu->resolv; sizev = nu->pntsv*nu->resolv;
if (nu->flagu & CU_CYCLIC) sizeu++; if (nu->flagu & CU_CYCLIC) sizeu++;
if (nu->flagv & CU_CYCLIC) sizev++; if (nu->flagv & CU_CYCLIC) sizev++;
@@ -990,7 +994,7 @@ float *make_orco_surf(Object *ob)
} }
} }
else { else {
float *_tdata= MEM_callocN(nu->resolu*nu->resolv*3*sizeof(float), "temp data"); float *_tdata= MEM_callocN((nu->pntsu*nu->resolu) * (nu->pntsv*nu->resolv) *3*sizeof(float), "temp data");
float *tdata= _tdata; float *tdata= _tdata;
makeNurbfaces(nu, tdata, 0); makeNurbfaces(nu, tdata, 0);
@@ -1005,7 +1009,7 @@ float *make_orco_surf(Object *ob)
if (a==sizev-1 && (nu->flagv & CU_CYCLIC)) if (a==sizev-1 && (nu->flagv & CU_CYCLIC))
use_a= 0; use_a= 0;
tdata = _tdata + 3 * (use_b * nu->resolv + use_a); tdata = _tdata + 3 * (use_b * (nu->pntsv*nu->resolv) + use_a);
fp[0]= (tdata[0]-cu->loc[0])/cu->size[0]; fp[0]= (tdata[0]-cu->loc[0])/cu->size[0];
fp[1]= (tdata[1]-cu->loc[1])/cu->size[1]; fp[1]= (tdata[1]-cu->loc[1])/cu->size[1];

6
source/blender/blenkernel/intern/displist.c
View File

@@ -1342,7 +1342,7 @@ void makeDispListSurf(Object *ob, ListBase *dispbase, int forRender)
makeNurbcurve(nu, data, NULL, NULL, nu->resolu); makeNurbcurve(nu, data, NULL, NULL, nu->resolu);
} }
else { else {
len= nu->resolu*nu->resolv; len= (nu->pntsu*nu->resolu) * (nu->pntsv*nu->resolv);
dl= MEM_callocN(sizeof(DispList), "makeDispListsurf"); dl= MEM_callocN(sizeof(DispList), "makeDispListsurf");
dl->verts= MEM_callocN(len*3*sizeof(float), "dlverts"); dl->verts= MEM_callocN(len*3*sizeof(float), "dlverts");
@@ -1355,8 +1355,8 @@ void makeDispListSurf(Object *ob, ListBase *dispbase, int forRender)
data= dl->verts; data= dl->verts;
dl->type= DL_SURF; dl->type= DL_SURF;
dl->parts= nu->resolu; /* in reverse, because makeNurbfaces works that way */ dl->parts= (nu->pntsu*nu->resolu); /* in reverse, because makeNurbfaces works that way */
dl->nr= nu->resolv; dl->nr= (nu->pntsv*nu->resolv);
if(nu->flagv & CU_CYCLIC) dl->flag|= DL_CYCL_U; /* reverse too! */ if(nu->flagv & CU_CYCLIC) dl->flag|= DL_CYCL_U; /* reverse too! */
if(nu->flagu & CU_CYCLIC) dl->flag|= DL_CYCL_V; if(nu->flagu & CU_CYCLIC) dl->flag|= DL_CYCL_V;

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

@@ -7879,6 +7879,15 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
for(nu= cu->nurb.first; nu; nu= nu->next) { for(nu= cu->nurb.first; nu; nu= nu->next) {
if (nu) { if (nu) {
nu->radius_interp = 3; nu->radius_interp = 3;
/* resolu and resolv are now used differently for surfaces
* rather then using the resolution to define the entire number of divisions,
* use it for the number of divisions per segment
*/
if (nu->pntsv > 1) {
nu->resolu = MAX2( 1, (int)(((float)nu->resolu / (float)nu->pntsu)+0.5f) );
nu->resolv = MAX2( 1, (int)(((float)nu->resolv / (float)nu->pntsv)+0.5f) );
}
} }
} }
} }

21
source/blender/src/editcurve.c
View File

@@ -828,7 +828,6 @@ short extrudeflagNurb(int flag)
MEM_freeN(nu->bp); MEM_freeN(nu->bp);
nu->bp= newbp; nu->bp= newbp;
nu->pntsv++; nu->pntsv++;
if(nu->resolv<3) nu->resolv++;
makeknots(nu, 2, nu->flagv>>1); makeknots(nu, 2, nu->flagv>>1);
} }
else if(v==0 || v== nu->pntsu-1) { /* collumn in v-direction selected */ else if(v==0 || v== nu->pntsu-1) { /* collumn in v-direction selected */
@@ -856,7 +855,6 @@ short extrudeflagNurb(int flag)
MEM_freeN(nu->bp); MEM_freeN(nu->bp);
nu->bp= newbp; nu->bp= newbp;
nu->pntsu++; nu->pntsu++;
if(nu->resolu<3) nu->resolu++;
makeknots(nu, 1, nu->flagu>>1); makeknots(nu, 1, nu->flagu>>1);
} }
} }
@@ -2470,8 +2468,6 @@ void merge_2_nurb(Nurb *nu1, Nurb *nu2)
/* merge */ /* merge */
origu= nu1->pntsu; origu= nu1->pntsu;
nu1->pntsu+= nu2->pntsu; nu1->pntsu+= nu2->pntsu;
nu1->resolu+= nu2->pntsu;
if(nu1->resolv < nu2->resolv) nu1->resolv= nu2->resolv;
if(nu1->orderu<3) nu1->orderu++; if(nu1->orderu<3) nu1->orderu++;
if(nu1->orderv<3) nu1->orderv++; if(nu1->orderv<3) nu1->orderv++;
temp= nu1->bp; temp= nu1->bp;
@@ -2997,7 +2993,6 @@ void addvert_Nurb(int mode)
if(bp) { if(bp) {
nu->pntsu++; nu->pntsu++;
if(nu->resolu<3) nu->resolu++;
makeknots(nu, 1, nu->flagu>>1); makeknots(nu, 1, nu->flagu>>1);
if(mode=='e') { if(mode=='e') {
@@ -4120,8 +4115,8 @@ Nurb *addNurbprim(int type, int stype, int newname)
if ELEM5(stype, 0, 1, 2, 4, 6) { if ELEM5(stype, 0, 1, 2, 4, 6) {
nu = (Nurb*)MEM_callocN(sizeof(Nurb), "addNurbprim"); nu = (Nurb*)MEM_callocN(sizeof(Nurb), "addNurbprim");
nu->type= type; nu->type= type;
nu->resolu= 12; nu->resolu= 4;
nu->resolv= 12; nu->resolv= 4;
} }
switch(stype) { switch(stype) {
@@ -4203,7 +4198,7 @@ Nurb *addNurbprim(int type, int stype, int newname)
nu->pntsv= 1; nu->pntsv= 1;
nu->orderu= 5; nu->orderu= 5;
nu->flagu= 2; /* endpoint */ nu->flagu= 2; /* endpoint */
nu->resolu= 32; nu->resolu= 8;
nu->bp= callocstructN(BPoint, 5, "addNurbprim3"); nu->bp= callocstructN(BPoint, 5, "addNurbprim3");
bp= nu->bp; bp= nu->bp;
@@ -4361,7 +4356,7 @@ Nurb *addNurbprim(int type, int stype, int newname)
} }
nu= addNurbprim(4, 1, newname); /* circle */ nu= addNurbprim(4, 1, newname); /* circle */
nu->resolu= 32; nu->resolu= 4;
nu->flag= CU_SMOOTH; nu->flag= CU_SMOOTH;
BLI_addtail(&editNurb, nu); /* temporal for extrude and translate */ BLI_addtail(&editNurb, nu); /* temporal for extrude and translate */
vec[0]=vec[1]= 0.0; vec[0]=vec[1]= 0.0;
@@ -4394,8 +4389,8 @@ Nurb *addNurbprim(int type, int stype, int newname)
nu->pntsu= 5; nu->pntsu= 5;
nu->pntsv= 1; nu->pntsv= 1;
nu->orderu= 3; nu->orderu= 3;
nu->resolu= 24; nu->resolu= 4;
nu->resolv= 32; nu->resolv= 4;
nu->flag= CU_SMOOTH; nu->flag= CU_SMOOTH;
nu->bp= callocstructN(BPoint, 5, "addNurbprim6"); nu->bp= callocstructN(BPoint, 5, "addNurbprim6");
nu->flagu= 0; nu->flagu= 0;
@@ -4441,8 +4436,8 @@ Nurb *addNurbprim(int type, int stype, int newname)
xzproj= 1; xzproj= 1;
nu= addNurbprim(4, 1, newname); /* circle */ nu= addNurbprim(4, 1, newname); /* circle */
xzproj= 0; xzproj= 0;
nu->resolu= 24; nu->resolu= 4;
nu->resolv= 32; nu->resolv= 4;
nu->flag= CU_SMOOTH; nu->flag= CU_SMOOTH;
BLI_addtail(&editNurb, nu); /* temporal for extrude and translate */ BLI_addtail(&editNurb, nu); /* temporal for extrude and translate */
if(newname && (U.flag & USER_ADD_VIEWALIGNED) == 0) if(newname && (U.flag & USER_ADD_VIEWALIGNED) == 0)