From b34877b4714e7c4cac526a6762f2aee4b428a185 Mon Sep 17 00:00:00 2001
From: Tazpn <tazpn@users.sourceforge.net>
Date: Mon, 1 Sep 2008 21:22:00 +0000
Subject: [PATCH] niflib: Update with recent nif.xml changes. Fix Num Control
Points
---
src/obj/NiBSplineBasisData.cpp | 4 ++--
src/obj/NiBSplineCompTransformInterpolator.cpp | 16 ++++++++--------
src/obj/NiBSplineTransformInterpolator.cpp | 16 ++++++++--------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/obj/NiBSplineBasisData.cpp b/src/obj/NiBSplineBasisData.cpp
index 7a692bc3..231e9fa1 100644
--- a/src/obj/NiBSplineBasisData.cpp
+++ b/src/obj/NiBSplineBasisData.cpp
@@ -91,11 +91,11 @@ std::list<NiObjectRef> NiBSplineBasisData::GetRefs() const {
//--BEGIN MISC CUSTOM CODE--//
-unsigned int NiBSplineBasisData::GetNumControlPt() const {
+unsigned int NiBSplineBasisData::GetNumControlPoints() const {
return numControlPoints;
}
-void NiBSplineBasisData::SetNumControlPt( unsigned int value ) {
+void NiBSplineBasisData::SetNumControlPoints( unsigned int value ) {
numControlPoints = value;
}
diff --git a/src/obj/NiBSplineCompTransformInterpolator.cpp b/src/obj/NiBSplineCompTransformInterpolator.cpp
index a72299d0..9dcc2edc 100644
--- a/src/obj/NiBSplineCompTransformInterpolator.cpp
+++ b/src/obj/NiBSplineCompTransformInterpolator.cpp
@@ -165,7 +165,7 @@ vector< Quaternion > NiBSplineCompTransformInterpolator::GetQuatRotateControlDat
{
vector< Quaternion > value;
if ((rotationOffset != USHRT_MAX) && splineData && basisData) { // has rotation data
- int nctrl = basisData->GetNumControlPt();
+ int nctrl = basisData->GetNumControlPoints();
int npts = nctrl * SizeofQuat;
vector<short> points = splineData->GetShortControlPointRange(rotationOffset, npts);
value.reserve(nctrl);
@@ -185,7 +185,7 @@ vector< Vector3 > NiBSplineCompTransformInterpolator::GetTranslateControlData()
{
vector< Vector3 > value;
if ((translationOffset != USHRT_MAX) && splineData && basisData) { // has translation data
- int nctrl = basisData->GetNumControlPt();
+ int nctrl = basisData->GetNumControlPoints();
int npts = nctrl * SizeofTrans;
vector<short> points = splineData->GetShortControlPointRange(translationOffset, npts);
value.reserve(nctrl);
@@ -204,7 +204,7 @@ vector< float > NiBSplineCompTransformInterpolator::GetScaleControlData() const
{
vector< float > value;
if ((scaleOffset != USHRT_MAX) && splineData && basisData) { // has translation data
- int nctrl = basisData->GetNumControlPt();
+ int nctrl = basisData->GetNumControlPoints();
int npts = nctrl * SizeofScale;
vector<short> points = splineData->GetShortControlPointRange(scaleOffset, npts);
value.reserve(nctrl);
@@ -220,7 +220,7 @@ vector< Key<Quaternion> > NiBSplineCompTransformInterpolator::SampleQuatRotateKe
{
vector< Key<Quaternion> > value;
if ((rotationOffset != USHRT_MAX) && splineData && basisData) { // has rotation data
- int nctrl = basisData->GetNumControlPt();
+ int nctrl = basisData->GetNumControlPoints();
int npts = nctrl * SizeofQuat;
vector<short> points = splineData->GetShortControlPointRange(rotationOffset, npts);
vector<float> control(npts);
@@ -258,7 +258,7 @@ vector< Key<Vector3> > NiBSplineCompTransformInterpolator::SampleTranslateKeys(i
{
vector< Key<Vector3> > value;
if ((translationOffset != USHRT_MAX) && splineData && basisData) { // has rotation data
- int nctrl = basisData->GetNumControlPt();
+ int nctrl = basisData->GetNumControlPoints();
int npts = nctrl * SizeofTrans;
vector<short> points = splineData->GetShortControlPointRange(translationOffset, npts);
vector<float> control(npts);
@@ -294,7 +294,7 @@ vector< Key<float> > NiBSplineCompTransformInterpolator::SampleScaleKeys(int npo
vector< Key<float> > value;
if ((scaleOffset != USHRT_MAX) && splineData && basisData) // has rotation data
{
- int nctrl = basisData->GetNumControlPt();
+ int nctrl = basisData->GetNumControlPoints();
int npts = nctrl * SizeofScale;
vector<short> points = splineData->GetShortControlPointRange(scaleOffset, npts);
vector<float> control(npts);
@@ -322,11 +322,11 @@ vector< Key<float> > NiBSplineCompTransformInterpolator::SampleScaleKeys(int npo
return value;
}
-int NiBSplineCompTransformInterpolator::GetNumControlPt() const
+int NiBSplineCompTransformInterpolator::GetNumControlPoints() const
{
if (basisData)
{
- return basisData->GetNumControlPt();
+ return basisData->GetNumControlPoints();
}
return 0;
}
diff --git a/src/obj/NiBSplineTransformInterpolator.cpp b/src/obj/NiBSplineTransformInterpolator.cpp
index b1c72995..dbaad7f4 100644
--- a/src/obj/NiBSplineTransformInterpolator.cpp
+++ b/src/obj/NiBSplineTransformInterpolator.cpp
@@ -140,7 +140,7 @@ vector< Quaternion > NiBSplineTransformInterpolator::GetQuatRotateControlData()
{
vector< Quaternion > value;
if ((rotationOffset != USHRT_MAX) && splineData && basisData) { // has rotation data
- int nctrl = basisData->GetNumControlPt();
+ int nctrl = basisData->GetNumControlPoints();
int npts = nctrl * SizeofQuat;
vector<float> points = splineData->GetFloatControlPointRange(rotationOffset, npts);
value.reserve(nctrl);
@@ -160,7 +160,7 @@ vector< Vector3 > NiBSplineTransformInterpolator::GetTranslateControlData() cons
{
vector< Vector3 > value;
if ((translationOffset != USHRT_MAX) && splineData && basisData) { // has translation data
- int nctrl = basisData->GetNumControlPt();
+ int nctrl = basisData->GetNumControlPoints();
int npts = nctrl * SizeofTrans;
vector<float> points = splineData->GetFloatControlPointRange(translationOffset, npts);
value.reserve(nctrl);
@@ -179,7 +179,7 @@ vector< float > NiBSplineTransformInterpolator::GetScaleControlData() const
{
vector< float > value;
if ((scaleOffset != USHRT_MAX) && splineData && basisData) { // has translation data
- int nctrl = basisData->GetNumControlPt();
+ int nctrl = basisData->GetNumControlPoints();
int npts = nctrl * SizeofScale;
vector<float> points = splineData->GetFloatControlPointRange(scaleOffset, npts);
value.reserve(nctrl);
@@ -195,7 +195,7 @@ vector< Key<Quaternion> > NiBSplineTransformInterpolator::SampleQuatRotateKeys(i
{
vector< Key<Quaternion> > value;
if ((rotationOffset != USHRT_MAX) && splineData && basisData) { // has rotation data
- int nctrl = basisData->GetNumControlPt();
+ int nctrl = basisData->GetNumControlPoints();
int npts = nctrl * SizeofQuat;
vector<float> points = splineData->GetFloatControlPointRange(rotationOffset, npts);
vector<float> control(npts);
@@ -233,7 +233,7 @@ vector< Key<Vector3> > NiBSplineTransformInterpolator::SampleTranslateKeys(int n
{
vector< Key<Vector3> > value;
if ((translationOffset != USHRT_MAX) && splineData && basisData) { // has rotation data
- int nctrl = basisData->GetNumControlPt();
+ int nctrl = basisData->GetNumControlPoints();
int npts = nctrl * SizeofTrans;
vector<float> points = splineData->GetFloatControlPointRange(translationOffset, npts);
vector<float> control(npts);
@@ -269,7 +269,7 @@ vector< Key<float> > NiBSplineTransformInterpolator::SampleScaleKeys(int npoints
vector< Key<float> > value;
if ((scaleOffset != USHRT_MAX) && splineData && basisData) // has rotation data
{
- int nctrl = basisData->GetNumControlPt();
+ int nctrl = basisData->GetNumControlPoints();
int npts = nctrl * SizeofScale;
vector<float> points = splineData->GetFloatControlPointRange(scaleOffset, npts);
vector<float> control(npts);
@@ -297,11 +297,11 @@ vector< Key<float> > NiBSplineTransformInterpolator::SampleScaleKeys(int npoints
return value;
}
-int NiBSplineTransformInterpolator::GetNumControlPt() const
+int NiBSplineTransformInterpolator::GetNumControlPoints() const
{
if (basisData)
{
- return basisData->GetNumControlPt();
+ return basisData->GetNumControlPoints();
}
return 0;
}
--
GitLab