Differential D430 Diff 1344 source/blender/editors/curve/editcurve.c

Changeset View

Standalone View

source/blender/editors/curve/editcurve.c

Context not available.
	BezTriple bezt, beztOrig;	BezTriple bezt, beztOrig;
		campbellbartonAuthorUnsubmitted Not Done Inline Actions Dont think this is needed - just `BLI_assert(factor >= 0.0f && factor <= 1.0f)` campbellbarton: Dont think this is needed - just `BLI_assert(factor >= 0.0f && factor <= 1.0f)`
	BPoint bp, bpOrig;	BPoint bp, bpOrig;
	float val, newval, offset;	float val, newval, offset;
	int a, i;	int a, i, ind_prev, ind_next;
	bool changed = false;	bool changed = false;

	for (nu = editnurb->first; nu; nu = nu->next) {	for (nu = editnurb->first; nu; nu = nu->next) {
	if (nu->bezt) {	if (nu->bezt) {
	changed = false;	changed = false;
		/* duplicate the curve to use in weight calculation */
	beztOrig = MEM_dupallocN(nu->bezt);	beztOrig = MEM_dupallocN(nu->bezt);
	for (bezt = &nu->bezt[1], a = 1; a < nu->pntsu - 1; a++, bezt++) {	/* for all the curve points */
		for (bezt = &nu->bezt[0], a = 0; a < nu->pntsu; a++, bezt++) {
		/* respect selection */
		walidUnsubmitted Not Done Inline Actions ops, missed to change this one :/ walid: ops, missed to change this one :/
	if (bezt->f2 & SELECT) {	if (bezt->f2 & SELECT) {
		/* iterate over 3 dimensions */
	for (i = 0; i < 3; i++) {	for (i = 0; i < 3; i++) {
		/* get single dimension pos of the mid handle */
	val = bezt->vec[1][i];	val = bezt->vec[1][i];
	newval = ((beztOrig + (a - 1))->vec[1][i] * 0.5f) + ((beztOrig + (a + 1))->vec[1][i] * 0.5f);	/* respect cyclic in getting the previous/next points' indices */
		campbellbartonAuthorUnsubmitted Not Done Inline Actions No need to set these for every x/y/z axis. Theres no check for cyclic. campbellbarton: - No need to set these for every x/y/z axis. - Theres no check for cyclic.
		ind_prev = (a - 1 + nu->pntsu) % nu->pntsu;
		ind_next = (a + 1 + nu->pntsu) % nu->pntsu;
		/* get the weights of the previous/next mid handles and calc offset */
		newval = ((beztOrig + (ind_prev))->vec[1][i] * 0.5f) + ((beztOrig + (ind_next))->vec[1][i] * 0.5f);
	offset = (val * ((1.0f / 6.0f) * 5.0f)) + (newval * (1.0f / 6.0f)) - val;	offset = (val * ((1.0f / 6.0f) * 5.0f)) + (newval * (1.0f / 6.0f)) - val;
	/* offset handles */	/* offset midpoint and 2 handles */
	bezt->vec[1][i] += offset;	bezt->vec[1][i] += offset;
	bezt->vec[0][i] += offset;	bezt->vec[0][i] += offset;
	bezt->vec[2][i] += offset;	bezt->vec[2][i] += offset;
		campbellbartonAuthorUnsubmitted Not Done Inline Actions again, just remove. campbellbarton: again, just remove.
Context not available.
	else if (nu->bp) {	else if (nu->bp) {
	bpOrig = MEM_dupallocN(nu->bp);	bpOrig = MEM_dupallocN(nu->bp);
	/* Same as above, keep these the same! */	/* Same as above, keep these the same! */
	for (bp = &nu->bp[1], a = 1; a < nu->pntsu - 1; a++, bp++) {	for (bp = &nu->bp[0], a = 0; a < nu->pntsu; a++, bp++) {
	if (bp->f1 & SELECT) {	if (bp->f1 & SELECT) {
	for (i = 0; i < 3; i++) {	for (i = 0; i < 3; i++) {
	val = bp->vec[i];	val = bp->vec[i];
	newval = ((bpOrig + (a - 1))->vec[i] * 0.5f) + ((bpOrig + (a + 1))->vec[i] * 0.5f);	ind_prev = (a - 1 + nu->pntsu) % nu->pntsu;
		ind_next = (a + 1 + nu->pntsu) % nu->pntsu;
		newval = ((bpOrig + (ind_prev))->vec[i] * 0.5f) + ((bpOrig + (ind_next))->vec[i] * 0.5f);
	offset = (val * ((1.0f / 6.0f) * 5.0f)) + (newval * (1.0f / 6.0f)) - val;	offset = (val * ((1.0f / 6.0f) * 5.0f)) + (newval * (1.0f / 6.0f)) - val;

	bp->vec[i] += offset;	bp->vec[i] += offset;
Context not available.
		walidUnsubmitted Not Done Inline Actions we could be a bit cryptic and make it for(bp = &nu->bp[bias], a = bias; a < nu->pntsu - bias; a++, bp++) and only set bias = 0 or bias = 1 if cyclic flag was raised, should you make it cryptic, or leave it very simple like that? walid: we could be a bit cryptic and make it for(bp = &nu->bp[bias], a = bias; a < nu->pntsu - bias…