diff --git a/include/obj/NiBSplineTransformInterpolator.h b/include/obj/NiBSplineTransformInterpolator.h
index 65f8a8ab57a5373678c920dee6cf49a392c01e6c..fbed51834a89beca261c0dcc8965919786a52d6f 100644
--- a/include/obj/NiBSplineTransformInterpolator.h
+++ b/include/obj/NiBSplineTransformInterpolator.h
@@ -147,9 +147,9 @@ protected:
/*! Base scale when scale curve not defined. */
float scale;
/*! Starting offset for the translation data. (USHRT_MAX for no data.) */
- unsigned int translateOffset;
+ unsigned int translationOffset;
/*! Starting offset for the rotation data. (USHRT_MAX for no data.) */
- unsigned int rotateOffset;
+ unsigned int rotationOffset;
/*! Starting offset for the scale data. (USHRT_MAX for no data.) */
unsigned int scaleOffset;
public:
diff --git a/src/obj/NiBSplineCompTransformInterpolator.cpp b/src/obj/NiBSplineCompTransformInterpolator.cpp
index 15b683618c68c494940e7d903dabc1eab31126a8..df82f17fccf165a592ac17e3d812e7b6f209b9cd 100644
--- a/src/obj/NiBSplineCompTransformInterpolator.cpp
+++ b/src/obj/NiBSplineCompTransformInterpolator.cpp
@@ -164,10 +164,10 @@ void NiBSplineCompTransformInterpolator::SetScaleMultiplier( float value ) {
vector< Quaternion > NiBSplineCompTransformInterpolator::GetQuatRotateControlData() const
{
vector< Quaternion > value;
- if ((rotateOffset != USHRT_MAX) && splineData && basisData) { // has rotation data
+ if ((rotationOffset != USHRT_MAX) && splineData && basisData) { // has rotation data
int nctrl = basisData->GetNumControlPt();
int npts = nctrl * SizeofQuat;
- vector<short> points = splineData->GetShortControlPointRange(rotateOffset, npts);
+ vector<short> points = splineData->GetShortControlPointRange(rotationOffset, npts);
value.reserve(nctrl);
for (int i=0; i<npts; ) {
Quaternion key;
@@ -184,10 +184,10 @@ vector< Quaternion > NiBSplineCompTransformInterpolator::GetQuatRotateControlDat
vector< Vector3 > NiBSplineCompTransformInterpolator::GetTranslateControlData() const
{
vector< Vector3 > value;
- if ((translateOffset != USHRT_MAX) && splineData && basisData) { // has translation data
+ if ((translationOffset != USHRT_MAX) && splineData && basisData) { // has translation data
int nctrl = basisData->GetNumControlPt();
int npts = nctrl * SizeofTrans;
- vector<short> points = splineData->GetShortControlPointRange(translateOffset, npts);
+ vector<short> points = splineData->GetShortControlPointRange(translationOffset, npts);
value.reserve(nctrl);
for (int i=0; i<npts; ) {
Vector3 key;
@@ -219,10 +219,10 @@ vector< float > NiBSplineCompTransformInterpolator::GetScaleControlData() const
vector< Key<Quaternion> > NiBSplineCompTransformInterpolator::SampleQuatRotateKeys(int npoints, int degree) const
{
vector< Key<Quaternion> > value;
- if ((rotateOffset != USHRT_MAX) && splineData && basisData) { // has rotation data
+ if ((rotationOffset != USHRT_MAX) && splineData && basisData) { // has rotation data
int nctrl = basisData->GetNumControlPt();
int npts = nctrl * SizeofQuat;
- vector<short> points = splineData->GetShortControlPointRange(rotateOffset, npts);
+ vector<short> points = splineData->GetShortControlPointRange(rotationOffset, npts);
vector<float> control(npts);
vector<float> output(npoints*SizeofQuat);
for (int i=0, j=0; i<nctrl; ++i) {
@@ -257,10 +257,10 @@ vector< Key<Quaternion> > NiBSplineCompTransformInterpolator::SampleQuatRotateKe
vector< Key<Vector3> > NiBSplineCompTransformInterpolator::SampleTranslateKeys(int npoints, int degree) const
{
vector< Key<Vector3> > value;
- if ((translateOffset != USHRT_MAX) && splineData && basisData) { // has rotation data
+ if ((translationOffset != USHRT_MAX) && splineData && basisData) { // has rotation data
int nctrl = basisData->GetNumControlPt();
int npts = nctrl * SizeofTrans;
- vector<short> points = splineData->GetShortControlPointRange(translateOffset, npts);
+ vector<short> points = splineData->GetShortControlPointRange(translationOffset, npts);
vector<float> control(npts);
vector<float> output(npoints*SizeofTrans);
for (int i=0, j=0; i<nctrl; ++i) {
diff --git a/src/obj/NiBSplineTransformInterpolator.cpp b/src/obj/NiBSplineTransformInterpolator.cpp
index 4cd746d4574158f31b198eca7ced4bda37ed8757..b1c729954a68dedaf586a9c4d87befce2fb153e4 100644
--- a/src/obj/NiBSplineTransformInterpolator.cpp
+++ b/src/obj/NiBSplineTransformInterpolator.cpp
@@ -25,7 +25,7 @@ using namespace Niflib;
//Definition of TYPE constant
const Type NiBSplineTransformInterpolator::TYPE("NiBSplineTransformInterpolator", &NiBSplineInterpolator::TYPE );
-NiBSplineTransformInterpolator::NiBSplineTransformInterpolator() : scale(0.0f), translateOffset((unsigned int)0), rotateOffset((unsigned int)0), scaleOffset((unsigned int)0) {
+NiBSplineTransformInterpolator::NiBSplineTransformInterpolator() : scale(0.0f), translationOffset((unsigned int)0), rotationOffset((unsigned int)0), scaleOffset((unsigned int)0) {
//--BEGIN CONSTRUCTOR CUSTOM CODE--//
//--END CUSTOM CODE--//
}
@@ -51,8 +51,8 @@ void NiBSplineTransformInterpolator::Read( istream& in, list<unsigned int> & lin
NifStream( translation, in, info );
NifStream( rotation, in, info );
NifStream( scale, in, info );
- NifStream( translateOffset, in, info );
- NifStream( rotateOffset, in, info );
+ NifStream( translationOffset, in, info );
+ NifStream( rotationOffset, in, info );
NifStream( scaleOffset, in, info );
//--BEGIN POST-READ CUSTOM CODE--//
@@ -67,8 +67,8 @@ void NiBSplineTransformInterpolator::Write( ostream& out, const map<NiObjectRef,
NifStream( translation, out, info );
NifStream( rotation, out, info );
NifStream( scale, out, info );
- NifStream( translateOffset, out, info );
- NifStream( rotateOffset, out, info );
+ NifStream( translationOffset, out, info );
+ NifStream( rotationOffset, out, info );
NifStream( scaleOffset, out, info );
//--BEGIN POST-WRITE CUSTOM CODE--//
@@ -85,8 +85,8 @@ std::string NiBSplineTransformInterpolator::asString( bool verbose ) const {
out << " Translation: " << translation << endl;
out << " Rotation: " << rotation << endl;
out << " Scale: " << scale << endl;
- out << " Translate Offset: " << translateOffset << endl;
- out << " Rotate Offset: " << rotateOffset << endl;
+ out << " Translation Offset: " << translationOffset << endl;
+ out << " Rotation Offset: " << rotationOffset << endl;
out << " Scale Offset: " << scaleOffset << endl;
return out.str();
@@ -139,10 +139,10 @@ void NiBSplineTransformInterpolator::SetScale( float value ) {
vector< Quaternion > NiBSplineTransformInterpolator::GetQuatRotateControlData() const
{
vector< Quaternion > value;
- if ((rotateOffset != USHRT_MAX) && splineData && basisData) { // has rotation data
+ if ((rotationOffset != USHRT_MAX) && splineData && basisData) { // has rotation data
int nctrl = basisData->GetNumControlPt();
int npts = nctrl * SizeofQuat;
- vector<float> points = splineData->GetFloatControlPointRange(rotateOffset, npts);
+ vector<float> points = splineData->GetFloatControlPointRange(rotationOffset, npts);
value.reserve(nctrl);
for (int i=0; i<npts; ) {
Quaternion key;
@@ -159,10 +159,10 @@ vector< Quaternion > NiBSplineTransformInterpolator::GetQuatRotateControlData()
vector< Vector3 > NiBSplineTransformInterpolator::GetTranslateControlData() const
{
vector< Vector3 > value;
- if ((translateOffset != USHRT_MAX) && splineData && basisData) { // has translation data
+ if ((translationOffset != USHRT_MAX) && splineData && basisData) { // has translation data
int nctrl = basisData->GetNumControlPt();
int npts = nctrl * SizeofTrans;
- vector<float> points = splineData->GetFloatControlPointRange(translateOffset, npts);
+ vector<float> points = splineData->GetFloatControlPointRange(translationOffset, npts);
value.reserve(nctrl);
for (int i=0; i<npts; ) {
Vector3 key;
@@ -194,10 +194,10 @@ vector< float > NiBSplineTransformInterpolator::GetScaleControlData() const
vector< Key<Quaternion> > NiBSplineTransformInterpolator::SampleQuatRotateKeys(int npoints, int degree) const
{
vector< Key<Quaternion> > value;
- if ((rotateOffset != USHRT_MAX) && splineData && basisData) { // has rotation data
+ if ((rotationOffset != USHRT_MAX) && splineData && basisData) { // has rotation data
int nctrl = basisData->GetNumControlPt();
int npts = nctrl * SizeofQuat;
- vector<float> points = splineData->GetFloatControlPointRange(rotateOffset, npts);
+ vector<float> points = splineData->GetFloatControlPointRange(rotationOffset, npts);
vector<float> control(npts);
vector<float> output(npoints*SizeofQuat);
for (int i=0, j=0; i<nctrl; ++i) {
@@ -232,10 +232,10 @@ vector< Key<Quaternion> > NiBSplineTransformInterpolator::SampleQuatRotateKeys(i
vector< Key<Vector3> > NiBSplineTransformInterpolator::SampleTranslateKeys(int npoints, int degree) const
{
vector< Key<Vector3> > value;
- if ((translateOffset != USHRT_MAX) && splineData && basisData) { // has rotation data
+ if ((translationOffset != USHRT_MAX) && splineData && basisData) { // has rotation data
int nctrl = basisData->GetNumControlPt();
int npts = nctrl * SizeofTrans;
- vector<float> points = splineData->GetFloatControlPointRange(translateOffset, npts);
+ vector<float> points = splineData->GetFloatControlPointRange(translationOffset, npts);
vector<float> control(npts);
vector<float> output(npoints*SizeofTrans);
for (int i=0, j=0; i<nctrl; ++i) {