From f8235d0c4e59c39a29ad43a0715437c621ccd279 Mon Sep 17 00:00:00 2001
From: Amorilia <amorilia@users.sourceforge.net>
Date: Mon, 1 Sep 2008 11:25:31 +0000
Subject: [PATCH] nif.xml: Perp2AxleInXX -> Perp2 Axle In XX (syncing with
pyffi)
---
include/gen/LimitedHingeDescriptor.h | 6 +++---
include/obj/bhkHingeConstraint.h | 4 ++--
src/gen/LimitedHingeDescriptor.cpp | 6 +++---
src/obj/bhkHingeConstraint.cpp | 12 ++++++------
src/obj/bhkLimitedHingeConstraint.cpp | 18 +++++++++---------
src/obj/bhkMalleableConstraint.cpp | 18 +++++++++---------
6 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/include/gen/LimitedHingeDescriptor.h b/include/gen/LimitedHingeDescriptor.h
index cfd98f73..db07bada 100644
--- a/include/gen/LimitedHingeDescriptor.h
+++ b/include/gen/LimitedHingeDescriptor.h
@@ -28,19 +28,19 @@ struct LimitedHingeDescriptor {
/*! Axis of rotation. */
Vector4 axleA;
/*! Vector in the rotation plane which defines the zero angle. */
- Vector4 perp2axleina1;
+ Vector4 perp2AxleInA1;
/*!
* Vector in the rotation plane, orthogonal on the previous one, which defines the
* positive direction of rotation. This is always the vector product of Axle A and
* Perp2 Axle In A1.
*/
- Vector4 perp2axleina2;
+ Vector4 perp2AxleInA2;
/*! Pivot A in second entity coordinate system. */
Vector4 pivotB;
/*! Axle A in second entity coordinate system. */
Vector4 axleB;
/*! Perp2 Axle In A2 in second entity coordinate system. */
- Vector4 perp2axleinb2;
+ Vector4 perp2AxleInB2;
/*! Minimum rotation angle. */
float minAngle;
/*! Maximum rotation angle. */
diff --git a/include/obj/bhkHingeConstraint.h b/include/obj/bhkHingeConstraint.h
index 7965f719..1ce5ab3b 100644
--- a/include/obj/bhkHingeConstraint.h
+++ b/include/obj/bhkHingeConstraint.h
@@ -58,9 +58,9 @@ protected:
/*! Pivot A. */
Vector4 pivotA;
/*! Unknown. */
- Vector4 perp2axleina1;
+ Vector4 perp2AxleInA1;
/*! Unknown. */
- Vector4 perp2axleina2;
+ Vector4 perp2AxleInA2;
/*! Pivot B. */
Vector4 pivotB;
/*! Unknown. */
diff --git a/src/gen/LimitedHingeDescriptor.cpp b/src/gen/LimitedHingeDescriptor.cpp
index 749f853a..1081461e 100644
--- a/src/gen/LimitedHingeDescriptor.cpp
+++ b/src/gen/LimitedHingeDescriptor.cpp
@@ -20,11 +20,11 @@ LimitedHingeDescriptor::LimitedHingeDescriptor( const LimitedHingeDescriptor & s
LimitedHingeDescriptor & LimitedHingeDescriptor::operator=( const LimitedHingeDescriptor & src ) {
this->pivotA = src.pivotA;
this->axleA = src.axleA;
- this->perp2axleina1 = src.perp2axleina1;
- this->perp2axleina2 = src.perp2axleina2;
+ this->perp2AxleInA1 = src.perp2AxleInA1;
+ this->perp2AxleInA2 = src.perp2AxleInA2;
this->pivotB = src.pivotB;
this->axleB = src.axleB;
- this->perp2axleinb2 = src.perp2axleinb2;
+ this->perp2AxleInB2 = src.perp2AxleInB2;
this->minAngle = src.minAngle;
this->maxAngle = src.maxAngle;
this->maxFriction = src.maxFriction;
diff --git a/src/obj/bhkHingeConstraint.cpp b/src/obj/bhkHingeConstraint.cpp
index a2a09634..37e4695d 100644
--- a/src/obj/bhkHingeConstraint.cpp
+++ b/src/obj/bhkHingeConstraint.cpp
@@ -43,8 +43,8 @@ void bhkHingeConstraint::Read( istream& in, list<unsigned int> & link_stack, con
bhkConstraint::Read( in, link_stack, info );
NifStream( pivotA, in, info );
- NifStream( perp2axleina1, in, info );
- NifStream( perp2axleina2, in, info );
+ NifStream( perp2AxleInA1, in, info );
+ NifStream( perp2AxleInA2, in, info );
NifStream( pivotB, in, info );
NifStream( axleB, in, info );
@@ -58,8 +58,8 @@ void bhkHingeConstraint::Write( ostream& out, const map<NiObjectRef,unsigned int
bhkConstraint::Write( out, link_map, info );
NifStream( pivotA, out, info );
- NifStream( perp2axleina1, out, info );
- NifStream( perp2axleina2, out, info );
+ NifStream( perp2AxleInA1, out, info );
+ NifStream( perp2AxleInA2, out, info );
NifStream( pivotB, out, info );
NifStream( axleB, out, info );
@@ -75,8 +75,8 @@ std::string bhkHingeConstraint::asString( bool verbose ) const {
unsigned int array_output_count = 0;
out << bhkConstraint::asString();
out << " Pivot A: " << pivotA << endl;
- out << " Perp2AxleInA1: " << perp2axleina1 << endl;
- out << " Perp2AxleInA2: " << perp2axleina2 << endl;
+ out << " Perp2 Axle In A1: " << perp2AxleInA1 << endl;
+ out << " Perp2 Axle In A2: " << perp2AxleInA2 << endl;
out << " Pivot B: " << pivotB << endl;
out << " Axle B: " << axleB << endl;
return out.str();
diff --git a/src/obj/bhkLimitedHingeConstraint.cpp b/src/obj/bhkLimitedHingeConstraint.cpp
index 9445f544..cbb10617 100644
--- a/src/obj/bhkLimitedHingeConstraint.cpp
+++ b/src/obj/bhkLimitedHingeConstraint.cpp
@@ -45,11 +45,11 @@ void bhkLimitedHingeConstraint::Read( istream& in, list<unsigned int> & link_sta
bhkConstraint::Read( in, link_stack, info );
NifStream( limitedHinge.pivotA, in, info );
NifStream( limitedHinge.axleA, in, info );
- NifStream( limitedHinge.perp2axleina1, in, info );
- NifStream( limitedHinge.perp2axleina2, in, info );
+ NifStream( limitedHinge.perp2AxleInA1, in, info );
+ NifStream( limitedHinge.perp2AxleInA2, in, info );
NifStream( limitedHinge.pivotB, in, info );
NifStream( limitedHinge.axleB, in, info );
- NifStream( limitedHinge.perp2axleinb2, in, info );
+ NifStream( limitedHinge.perp2AxleInB2, in, info );
NifStream( limitedHinge.minAngle, in, info );
NifStream( limitedHinge.maxAngle, in, info );
NifStream( limitedHinge.maxFriction, in, info );
@@ -65,11 +65,11 @@ void bhkLimitedHingeConstraint::Write( ostream& out, const map<NiObjectRef,unsig
bhkConstraint::Write( out, link_map, info );
NifStream( limitedHinge.pivotA, out, info );
NifStream( limitedHinge.axleA, out, info );
- NifStream( limitedHinge.perp2axleina1, out, info );
- NifStream( limitedHinge.perp2axleina2, out, info );
+ NifStream( limitedHinge.perp2AxleInA1, out, info );
+ NifStream( limitedHinge.perp2AxleInA2, out, info );
NifStream( limitedHinge.pivotB, out, info );
NifStream( limitedHinge.axleB, out, info );
- NifStream( limitedHinge.perp2axleinb2, out, info );
+ NifStream( limitedHinge.perp2AxleInB2, out, info );
NifStream( limitedHinge.minAngle, out, info );
NifStream( limitedHinge.maxAngle, out, info );
NifStream( limitedHinge.maxFriction, out, info );
@@ -87,11 +87,11 @@ std::string bhkLimitedHingeConstraint::asString( bool verbose ) const {
out << bhkConstraint::asString();
out << " Pivot A: " << limitedHinge.pivotA << endl;
out << " Axle A: " << limitedHinge.axleA << endl;
- out << " Perp2AxleInA1: " << limitedHinge.perp2axleina1 << endl;
- out << " Perp2AxleInA2: " << limitedHinge.perp2axleina2 << endl;
+ out << " Perp2 Axle In A1: " << limitedHinge.perp2AxleInA1 << endl;
+ out << " Perp2 Axle In A2: " << limitedHinge.perp2AxleInA2 << endl;
out << " Pivot B: " << limitedHinge.pivotB << endl;
out << " Axle B: " << limitedHinge.axleB << endl;
- out << " Perp2AxleInB2: " << limitedHinge.perp2axleinb2 << endl;
+ out << " Perp2 Axle In B2: " << limitedHinge.perp2AxleInB2 << endl;
out << " Min Angle: " << limitedHinge.minAngle << endl;
out << " Max Angle: " << limitedHinge.maxAngle << endl;
out << " Max Friction: " << limitedHinge.maxFriction << endl;
diff --git a/src/obj/bhkMalleableConstraint.cpp b/src/obj/bhkMalleableConstraint.cpp
index 697b9397..407be4a6 100644
--- a/src/obj/bhkMalleableConstraint.cpp
+++ b/src/obj/bhkMalleableConstraint.cpp
@@ -70,11 +70,11 @@ void bhkMalleableConstraint::Read( istream& in, list<unsigned int> & link_stack,
if ( (type == 2) ) {
NifStream( limitedHinge.pivotA, in, info );
NifStream( limitedHinge.axleA, in, info );
- NifStream( limitedHinge.perp2axleina1, in, info );
- NifStream( limitedHinge.perp2axleina2, in, info );
+ NifStream( limitedHinge.perp2AxleInA1, in, info );
+ NifStream( limitedHinge.perp2AxleInA2, in, info );
NifStream( limitedHinge.pivotB, in, info );
NifStream( limitedHinge.axleB, in, info );
- NifStream( limitedHinge.perp2axleinb2, in, info );
+ NifStream( limitedHinge.perp2AxleInB2, in, info );
NifStream( limitedHinge.minAngle, in, info );
NifStream( limitedHinge.maxAngle, in, info );
NifStream( limitedHinge.maxFriction, in, info );
@@ -129,11 +129,11 @@ void bhkMalleableConstraint::Write( ostream& out, const map<NiObjectRef,unsigned
if ( (type == 2) ) {
NifStream( limitedHinge.pivotA, out, info );
NifStream( limitedHinge.axleA, out, info );
- NifStream( limitedHinge.perp2axleina1, out, info );
- NifStream( limitedHinge.perp2axleina2, out, info );
+ NifStream( limitedHinge.perp2AxleInA1, out, info );
+ NifStream( limitedHinge.perp2AxleInA2, out, info );
NifStream( limitedHinge.pivotB, out, info );
NifStream( limitedHinge.axleB, out, info );
- NifStream( limitedHinge.perp2axleinb2, out, info );
+ NifStream( limitedHinge.perp2AxleInB2, out, info );
NifStream( limitedHinge.minAngle, out, info );
NifStream( limitedHinge.maxAngle, out, info );
NifStream( limitedHinge.maxFriction, out, info );
@@ -174,11 +174,11 @@ std::string bhkMalleableConstraint::asString( bool verbose ) const {
if ( (type == 2) ) {
out << " Pivot A: " << limitedHinge.pivotA << endl;
out << " Axle A: " << limitedHinge.axleA << endl;
- out << " Perp2AxleInA1: " << limitedHinge.perp2axleina1 << endl;
- out << " Perp2AxleInA2: " << limitedHinge.perp2axleina2 << endl;
+ out << " Perp2 Axle In A1: " << limitedHinge.perp2AxleInA1 << endl;
+ out << " Perp2 Axle In A2: " << limitedHinge.perp2AxleInA2 << endl;
out << " Pivot B: " << limitedHinge.pivotB << endl;
out << " Axle B: " << limitedHinge.axleB << endl;
- out << " Perp2AxleInB2: " << limitedHinge.perp2axleinb2 << endl;
+ out << " Perp2 Axle In B2: " << limitedHinge.perp2AxleInB2 << endl;
out << " Min Angle: " << limitedHinge.minAngle << endl;
out << " Max Angle: " << limitedHinge.maxAngle << endl;
out << " Max Friction: " << limitedHinge.maxFriction << endl;
--
GitLab