From 9dc7171f29599cdc0830ea5617f6ce1f4b31459a Mon Sep 17 00:00:00 2001
From: Amorilia <amorilia@users.sourceforge.net>
Date: Mon, 1 Sep 2008 18:46:55 +0000
Subject: [PATCH] nif.xml: Float/Short Count -> Num Float/Short Control Points
(syncing with pyffi)
---
include/obj/NiBSplineData.h | 4 ++--
src/obj/NiBSplineData.cpp | 26 +++++++++++++-------------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/include/obj/NiBSplineData.h b/include/obj/NiBSplineData.h
index 537adf35..690e9f58 100644
--- a/include/obj/NiBSplineData.h
+++ b/include/obj/NiBSplineData.h
@@ -85,11 +85,11 @@ public:
//--END CUSTOM CODE--//
protected:
/*! Number of Float Data Points */
- mutable unsigned int floatCount;
+ mutable unsigned int numFloatControlPoints;
/*! Float values representing the control data. */
vector<float > floatControlPoints;
/*! Number of Short Data Points */
- mutable unsigned int shortCount;
+ mutable unsigned int numShortControlPoints;
/*! Signed shorts representing the data from 0 to 1 (scaled by SHRT_MAX). */
vector<short > shortControlPoints;
public:
diff --git a/src/obj/NiBSplineData.cpp b/src/obj/NiBSplineData.cpp
index 133d6669..a1ad8ad5 100644
--- a/src/obj/NiBSplineData.cpp
+++ b/src/obj/NiBSplineData.cpp
@@ -19,7 +19,7 @@ using namespace Niflib;
//Definition of TYPE constant
const Type NiBSplineData::TYPE("NiBSplineData", &NiObject::TYPE );
-NiBSplineData::NiBSplineData() : floatCount((unsigned int)0), shortCount((unsigned int)0) {
+NiBSplineData::NiBSplineData() : numFloatControlPoints((unsigned int)0), numShortControlPoints((unsigned int)0) {
//--BEGIN CONSTRUCTOR CUSTOM CODE--//
//--END CUSTOM CODE--//
}
@@ -42,13 +42,13 @@ void NiBSplineData::Read( istream& in, list<unsigned int> & link_stack, const Ni
//--END CUSTOM CODE--//
NiObject::Read( in, link_stack, info );
- NifStream( floatCount, in, info );
- floatControlPoints.resize(floatCount);
+ NifStream( numFloatControlPoints, in, info );
+ floatControlPoints.resize(numFloatControlPoints);
for (unsigned int i1 = 0; i1 < floatControlPoints.size(); i1++) {
NifStream( floatControlPoints[i1], in, info );
};
- NifStream( shortCount, in, info );
- shortControlPoints.resize(shortCount);
+ NifStream( numShortControlPoints, in, info );
+ shortControlPoints.resize(numShortControlPoints);
for (unsigned int i1 = 0; i1 < shortControlPoints.size(); i1++) {
NifStream( shortControlPoints[i1], in, info );
};
@@ -62,13 +62,13 @@ void NiBSplineData::Write( ostream& out, const map<NiObjectRef,unsigned int> & l
//--END CUSTOM CODE--//
NiObject::Write( out, link_map, info );
- shortCount = (unsigned int)(shortControlPoints.size());
- floatCount = (unsigned int)(floatControlPoints.size());
- NifStream( floatCount, out, info );
+ numShortControlPoints = (unsigned int)(shortControlPoints.size());
+ numFloatControlPoints = (unsigned int)(floatControlPoints.size());
+ NifStream( numFloatControlPoints, out, info );
for (unsigned int i1 = 0; i1 < floatControlPoints.size(); i1++) {
NifStream( floatControlPoints[i1], out, info );
};
- NifStream( shortCount, out, info );
+ NifStream( numShortControlPoints, out, info );
for (unsigned int i1 = 0; i1 < shortControlPoints.size(); i1++) {
NifStream( shortControlPoints[i1], out, info );
};
@@ -84,9 +84,9 @@ std::string NiBSplineData::asString( bool verbose ) const {
stringstream out;
unsigned int array_output_count = 0;
out << NiObject::asString();
- shortCount = (unsigned int)(shortControlPoints.size());
- floatCount = (unsigned int)(floatControlPoints.size());
- out << " Float Count: " << floatCount << endl;
+ numShortControlPoints = (unsigned int)(shortControlPoints.size());
+ numFloatControlPoints = (unsigned int)(floatControlPoints.size());
+ out << " Num Float Control Points: " << numFloatControlPoints << endl;
array_output_count = 0;
for (unsigned int i1 = 0; i1 < floatControlPoints.size(); i1++) {
if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) {
@@ -99,7 +99,7 @@ std::string NiBSplineData::asString( bool verbose ) const {
out << " Float Control Points[" << i1 << "]: " << floatControlPoints[i1] << endl;
array_output_count++;
};
- out << " Short Count: " << shortCount << endl;
+ out << " Num Short Control Points: " << numShortControlPoints << endl;
array_output_count = 0;
for (unsigned int i1 = 0; i1 < shortControlPoints.size(); i1++) {
if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) {
--
GitLab