@@ -47,61 +47,61 @@ SOFTWARE.
4747#include " twistSplineData.h"
4848
4949
50- #define ROTATE_ORDER_XYZ 0
51- #define ROTATE_ORDER_YZX 1
52- #define ROTATE_ORDER_ZXY 2
53- #define ROTATE_ORDER_XZY 3
54- #define ROTATE_ORDER_YXZ 4
55- #define ROTATE_ORDER_ZYX 5
50+ #define ROTATE_ORDER_XYZ 0
51+ #define ROTATE_ORDER_YZX 1
52+ #define ROTATE_ORDER_ZXY 2
53+ #define ROTATE_ORDER_XZY 3
54+ #define ROTATE_ORDER_YXZ 4
55+ #define ROTATE_ORDER_ZYX 5
5656
5757#define CHECKSTAT (m ) if (!status) {status.perror (m); return status;};
5858
59- MTypeId riderConstraint::id (0x001226FC );
59+ MTypeId riderConstraint::id (0x001226FC );
6060
61- MObject riderConstraint::aRotateOrder;
62- MObject riderConstraint::aGlobalOffset;
63- MObject riderConstraint::aGlobalSpread;
64- MObject riderConstraint::aScaleCompensation;
65- MObject riderConstraint::aUseCycle;
66- MObject riderConstraint::aNormalize;
67- MObject riderConstraint::aNormValue;
61+ MObject riderConstraint::aRotateOrder;
62+ MObject riderConstraint::aGlobalOffset;
63+ MObject riderConstraint::aGlobalSpread;
64+ MObject riderConstraint::aScaleCompensation;
65+ MObject riderConstraint::aUseCycle;
66+ MObject riderConstraint::aNormalize;
67+ MObject riderConstraint::aNormValue;
6868
69- MObject riderConstraint::aUseGlobalMin;
70- MObject riderConstraint::aMinGlobalParam;
71- MObject riderConstraint::aUseGlobalMax;
72- MObject riderConstraint::aMaxGlobalParam;
69+ MObject riderConstraint::aUseGlobalMin;
70+ MObject riderConstraint::aMinGlobalParam;
71+ MObject riderConstraint::aUseGlobalMax;
72+ MObject riderConstraint::aMaxGlobalParam;
7373
7474// inputs
75- MObject riderConstraint::aInputSplines;
76- MObject riderConstraint::aSpline;
77- MObject riderConstraint::aSplineLength;
78- MObject riderConstraint::aEndParam;
79- MObject riderConstraint::aWeight;
75+ MObject riderConstraint::aInputSplines;
76+ MObject riderConstraint::aSpline;
77+ MObject riderConstraint::aSplineLength;
78+ MObject riderConstraint::aEndParam;
79+ MObject riderConstraint::aWeight;
8080
8181
82- MObject riderConstraint::aParams;
83- MObject riderConstraint::aParam;
84- MObject riderConstraint::aUseMin;
85- MObject riderConstraint::aMinParam;
86- MObject riderConstraint::aUseMax;
87- MObject riderConstraint::aMaxParam;
88- MObject riderConstraint::aParentInverseMatrix;
82+ MObject riderConstraint::aParams;
83+ MObject riderConstraint::aParam;
84+ MObject riderConstraint::aUseMin;
85+ MObject riderConstraint::aMinParam;
86+ MObject riderConstraint::aUseMax;
87+ MObject riderConstraint::aMaxParam;
88+ MObject riderConstraint::aParentInverseMatrix;
8989
9090
9191// output
92- MObject riderConstraint::aOutputs;
93- MObject riderConstraint::aTranslate;
94- MObject riderConstraint::aTranslateX;
95- MObject riderConstraint::aTranslateY;
96- MObject riderConstraint::aTranslateZ;
97- MObject riderConstraint::aRotate;
98- MObject riderConstraint::aRotateX;
99- MObject riderConstraint::aRotateY;
100- MObject riderConstraint::aRotateZ;
101- MObject riderConstraint::aScale;
102- MObject riderConstraint::aScaleX;
103- MObject riderConstraint::aScaleY;
104- MObject riderConstraint::aScaleZ;
92+ MObject riderConstraint::aOutputs;
93+ MObject riderConstraint::aTranslate;
94+ MObject riderConstraint::aTranslateX;
95+ MObject riderConstraint::aTranslateY;
96+ MObject riderConstraint::aTranslateZ;
97+ MObject riderConstraint::aRotate;
98+ MObject riderConstraint::aRotateX;
99+ MObject riderConstraint::aRotateY;
100+ MObject riderConstraint::aRotateZ;
101+ MObject riderConstraint::aScale;
102+ MObject riderConstraint::aScaleX;
103+ MObject riderConstraint::aScaleY;
104+ MObject riderConstraint::aScaleZ;
105105
106106MStatus riderConstraint::initialize () {
107107 MStatus status;
@@ -564,10 +564,10 @@ MStatus riderConstraint::compute(const MPlug& plug, MDataBlock& data) {
564564 p *= gSpread ;
565565 p += gOffset ;
566566
567- if (useGlobalMin) { p = std::fmax (minGlobalParam, p); }
568- if (pUseMins[pIdx]) { p = std::fmax (pMins[pIdx], p); }
569- if (useGlobalMax) { p = std::fmin (maxGlobalParam, p); }
570- if (pUseMaxs[pIdx]) { p = std::fmin (pMaxs[pIdx], p); }
567+ if (useGlobalMin) { p = std::fmax (minGlobalParam, p); }
568+ if (pUseMins[pIdx]) { p = std::fmax (pMins[pIdx], p); }
569+ if (useGlobalMax) { p = std::fmin (maxGlobalParam, p); }
570+ if (pUseMaxs[pIdx]) { p = std::fmin (pMaxs[pIdx], p); }
571571
572572 if (doNorm > 0.0 ) {
573573 p = (doNorm) * (p * mp / normVal) + (1.0 - doNorm) * (p);
@@ -589,7 +589,7 @@ MStatus riderConstraint::compute(const MPlug& plug, MDataBlock& data) {
589589 mat[0 ][0 ] = tan[0 ]; mat[1 ][0 ] = norm[0 ]; mat[2 ][0 ] = binorm[0 ]; mat[3 ][0 ] = 0.0 ;
590590 mat[0 ][1 ] = tan[1 ]; mat[1 ][1 ] = norm[1 ]; mat[2 ][1 ] = binorm[1 ]; mat[3 ][1 ] = 0.0 ;
591591 mat[0 ][2 ] = tan[2 ]; mat[1 ][2 ] = norm[2 ]; mat[2 ][2 ] = binorm[2 ]; mat[3 ][2 ] = 0.0 ;
592- mat[0 ][3 ] = 0.0 ; mat[1 ][3 ] = 0.0 ; mat[2 ][3 ] = 0.0 ; mat[3 ][3 ] = 1.0 ;
592+ mat[0 ][3 ] = 0.0 ; mat[1 ][3 ] = 0.0 ; mat[2 ][3 ] = 0.0 ; mat[3 ][3 ] = 1.0 ;
593593 MQuaternion q;
594594 q = MMatrix (mat);
595595 tquats.push_back (std::move (q));
0 commit comments