[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32202] trunk/blender/source/blender: rename makeknots to nurbs_knot_calc_u/v
Campbell Barton
ideasman42 at gmail.com
Thu Sep 30 08:51:33 CEST 2010
Revision: 32202
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32202
Author: campbellbarton
Date: 2010-09-30 08:51:32 +0200 (Thu, 30 Sep 2010)
Log Message:
-----------
rename makeknots to nurbs_knot_calc_u/v
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_curve.h
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/makesrna/intern/rna_curve.c
Modified: trunk/blender/source/blender/blenkernel/BKE_curve.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_curve.h 2010-09-30 05:26:36 UTC (rev 32201)
+++ trunk/blender/source/blender/blenkernel/BKE_curve.h 2010-09-30 06:51:32 UTC (rev 32202)
@@ -69,7 +69,8 @@
void test2DNurb( struct Nurb *nu);
void minmaxNurb( struct Nurb *nu, float *min, float *max);
-void makeknots( struct Nurb *nu, short uv);
+void nurbs_knot_calc_u(Nurb *nu);
+void nurbs_knot_calc_v(Nurb *nu);
void makeNurbfaces(struct Nurb *nu, float *coord_array, int rowstride);
void makeNurbcurve(struct Nurb *nu, float *coord_array, float *tilt_array, float *radius_array, float *weight_array, int resolu, int stride);
Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c 2010-09-30 05:26:36 UTC (rev 32201)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c 2010-09-30 06:51:32 UTC (rev 32202)
@@ -636,7 +636,7 @@
-void makeknots(Nurb *nu, short uv)
+static void makeknots(Nurb *nu, short uv)
{
if(nu->type == CU_NURBS) {
if(uv == 1) {
@@ -668,6 +668,16 @@
}
}
+void nurbs_knot_calc_u(Nurb *nu)
+{
+ makeknots(nu, 1);
+}
+
+void nurbs_knot_calc_v(Nurb *nu)
+{
+ makeknots(nu, 2);
+}
+
static void basisNurb(float t, short order, short pnts, float *knots, float *basis, int *start, int *end)
{
float d, e;
Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c 2010-09-30 05:26:36 UTC (rev 32201)
+++ trunk/blender/source/blender/editors/curve/editcurve.c 2010-09-30 06:51:32 UTC (rev 32202)
@@ -1412,7 +1412,7 @@
nu->bp= newbp;
clamp_nurb_order_v(nu);
- makeknots(nu, 2);
+ nurbs_knot_calc_v(nu);
}
else {
/* is the nurb in V direction selected */
@@ -1461,7 +1461,7 @@
nu->pntsu= newu;
clamp_nurb_order_u(nu);
}
- makeknots(nu, 1);
+ nurbs_knot_calc_u(nu);
}
}
}
@@ -1509,7 +1509,7 @@
nu->pntsv= 2;
nu->orderv= 2;
- makeknots(nu, 2);
+ nurbs_knot_calc_v(nu);
}
}
else {
@@ -1552,7 +1552,7 @@
MEM_freeN(nu->bp);
nu->bp= newbp;
nu->pntsv++;
- makeknots(nu, 2);
+ nurbs_knot_calc_v(nu);
}
else if(v==0 || v== nu->pntsu-1) { /* collumn in v-direction selected */
ok= 1;
@@ -1579,7 +1579,7 @@
MEM_freeN(nu->bp);
nu->bp= newbp;
nu->pntsu++;
- makeknots(nu, 1);
+ nurbs_knot_calc_u(nu);
}
}
}
@@ -1677,7 +1677,7 @@
/* knots */
newnu->knotsu= NULL;
- makeknots(newnu, 1);
+ nurbs_knot_calc_u(newnu);
}
bp++;
}
@@ -1742,14 +1742,14 @@
if(nu->pntsu==newnu->pntsu && nu->knotsu) {
newnu->knotsu= MEM_dupallocN( nu->knotsu );
} else {
- makeknots(newnu, 1);
+ nurbs_knot_calc_u(newnu);
}
}
if (check_valid_nurb_v(newnu)) {
if(nu->pntsv==newnu->pntsv && nu->knotsv) {
newnu->knotsv= MEM_dupallocN( nu->knotsv );
} else {
- makeknots(newnu, 2);
+ nurbs_knot_calc_v(newnu);
}
}
}
@@ -2765,7 +2765,7 @@
nu->pntsu+= amount;
if(nu->type & CU_NURBS) {
- makeknots(nu, 1);
+ nurbs_knot_calc_u(nu);
}
}
} /* End of 'else if(nu->pntsv==1)' */
@@ -2885,8 +2885,8 @@
nu->bp= bpnew;
nu->pntsu= (number_cuts+1)*nu->pntsu-number_cuts;
nu->pntsv= (number_cuts+1)*nu->pntsv-number_cuts;
- makeknots(nu, 1);
- makeknots(nu, 2);
+ nurbs_knot_calc_u(nu);
+ nurbs_knot_calc_v(nu);
} /* End of 'if(sel== nu->pntsu*nu->pntsv)' (subdivide entire NURB) */
else {
/* subdivide in v direction? */
@@ -2930,7 +2930,7 @@
MEM_freeN(nu->bp);
nu->bp= bpnew;
nu->pntsv+= sel;
- makeknots(nu, 2);
+ nurbs_knot_calc_v(nu);
}
else {
/* or in u direction? */
@@ -2970,7 +2970,7 @@
MEM_freeN(nu->bp);
nu->bp= bpnew;
nu->pntsu+= sel;
- makeknots(nu, 1); /* shift knots
+ nurbs_knot_calc_u(nu); /* shift knots
forward */
}
}
@@ -3167,7 +3167,7 @@
nu->orderu= 4;
nu->flagu &= CU_NURB_CYCLIC; /* disable all flags except for cyclic */
nu->flagu |= CU_NURB_BEZIER;
- makeknots(nu, 1);
+ nurbs_knot_calc_u(nu);
a= nu->pntsu*nu->pntsv;
bp= nu->bp;
while(a--) {
@@ -3220,7 +3220,7 @@
if(type== CU_NURBS) {
nu->flagu &= CU_NURB_CYCLIC; /* disable all flags except for cyclic */
nu->flagu |= CU_NURB_BEZIER;
- makeknots(nu, 1);
+ nurbs_knot_calc_u(nu);
}
}
}
@@ -3637,10 +3637,10 @@
if(nu1->type == CU_NURBS) {
/* merge knots */
- makeknots(nu1, 1);
+ nurbs_knot_calc_u(nu1);
/* make knots, for merged curved for example */
- makeknots(nu1, 2);
+ nurbs_knot_calc_v(nu1);
}
MEM_freeN(temp);
@@ -3830,7 +3830,7 @@
/* now join the knots */
if(nu1->type == CU_NURBS) {
if(nu1->knotsu==NULL) {
- makeknots(nu1, 1);
+ nurbs_knot_calc_u(nu1);
}
else {
fp= MEM_mallocN(sizeof(float)*KNOTSU(nu1), "addsegment3");
@@ -4041,7 +4041,7 @@
if(isNurbsel(nu)) {
nu->orderv= 4;
nu->flagv |= CU_NURB_CYCLIC;
- makeknots(nu, 2);
+ nurbs_knot_calc_v(nu);
}
}
}
@@ -4199,7 +4199,7 @@
if(bp) {
nu->pntsu++;
- makeknots(nu, 1);
+ nurbs_knot_calc_u(nu);
if(mode=='e') {
copy_v3_v3(newbp->vec, bp->vec);
@@ -4370,7 +4370,7 @@
while(a--) {
if( bp->f1 & SELECT ) {
nu->flagu ^= CU_NURB_CYCLIC;
- makeknots(nu, 1); /* 1==u type is ignored for cyclic curves */
+ nurbs_knot_calc_u(nu); /* 1==u type is ignored for cyclic curves */
break;
}
bp++;
@@ -4385,11 +4385,11 @@
if( bp->f1 & SELECT) {
if(direction==0 && nu->pntsu>1) {
nu->flagu ^= CU_NURB_CYCLIC;
- makeknots(nu, 1); /* 1==u type is ignored for cyclic curves */
+ nurbs_knot_calc_u(nu); /* 1==u type is ignored for cyclic curves */
}
if(direction==1 && nu->pntsv>1) {
nu->flagv ^= CU_NURB_CYCLIC;
- makeknots(nu, 2); /* 2==v type is ignored for cyclic curves */
+ nurbs_knot_calc_v(nu); /* 2==v type is ignored for cyclic curves */
}
break;
}
@@ -5273,7 +5273,7 @@
clamp_nurb_order_u(nu);
}*/
}
- makeknots(nu, 1);
+ nurbs_knot_calc_u(nu);
}
nu= next;
}
@@ -5713,8 +5713,8 @@
for(a=0;a<4;a++, bp++) mul_m4_v3(mat,bp->vec);
if(cutype==CU_NURBS) {
- nu->knotsu= 0; /* makeknots allocates */
- makeknots(nu, 1);
+ nu->knotsu= NULL; /* nurbs_knot_calc_u allocates */
+ nurbs_knot_calc_u(nu);
}
}
@@ -5747,8 +5747,8 @@
for(a=0;a<5;a++, bp++) mul_m4_v3(mat,bp->vec);
if(cutype==CU_NURBS) {
- nu->knotsu= 0; /* makeknots allocates */
- makeknots(nu, 1);
+ nu->knotsu= NULL; /* nurbs_knot_calc_u allocates */
+ nurbs_knot_calc_u(nu);
}
break;
@@ -5820,7 +5820,7 @@
bp++;
}
- makeknots(nu, 1);
+ nurbs_knot_calc_u(nu);
}
break;
case CU_PRIM_PATCH: /* 4x4 patch */
@@ -5856,8 +5856,8 @@
}
}
- makeknots(nu, 1);
- makeknots(nu, 2);
+ nurbs_knot_calc_u(nu);
+ nurbs_knot_calc_v(nu);
}
break;
case CU_PRIM_TUBE: /* Cylinder */
@@ -5930,7 +5930,7 @@
bp++;
}
nu->flagu= CU_NURB_BEZIER;
- makeknots(nu, 1);
+ nurbs_knot_calc_u(nu);
BLI_addtail(editnurb, nu); /* temporal for spin */
@@ -5938,7 +5938,7 @@
else if ((U.flag & USER_ADD_VIEWALIGNED)) spin_nurb(rv3d->viewmat, obedit, rv3d->viewinv[2], mat[3]);
else spin_nurb(umat, obedit, tmp_vec, mat[3]);
- makeknots(nu, 2);
+ nurbs_knot_calc_v(nu);
a= nu->pntsu*nu->pntsv;
bp= nu->bp;
Modified: trunk/blender/source/blender/makesrna/intern/rna_curve.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_curve.c 2010-09-30 05:26:36 UTC (rev 32201)
+++ trunk/blender/source/blender/makesrna/intern/rna_curve.c 2010-09-30 06:51:32 UTC (rev 32202)
@@ -414,7 +414,7 @@
Nurb *nu= (Nurb*)ptr->data;
clamp_nurb_order_u(nu);
- makeknots(nu, 1);
+ nurbs_knot_calc_u(nu);
rna_Curve_update_data(bmain, scene, ptr);
}
@@ -424,7 +424,7 @@
Nurb *nu= (Nurb*)ptr->data;
clamp_nurb_order_v(nu);
- makeknots(nu, 2);
+ nurbs_knot_calc_v(nu);
rna_Curve_update_data(bmain, scene, ptr);
}
@@ -441,7 +441,7 @@
addNurbPoints(nu, number);
/* update */
- makeknots(nu, 1);
+ nurbs_knot_calc_u(nu);
rna_Curve_update_data_id(NULL, NULL, id);
}
@@ -458,7 +458,7 @@
addNurbPointsBezier(nu, number);
/* update */
- makeknots(nu, 1);
+ nurbs_knot_calc_u(nu);
rna_Curve_update_data_id(NULL, NULL, id);
}
More information about the Bf-blender-cvs
mailing list