diff --git a/Sources/Plasma/FeatureLib/pfPython/Pch.h b/Sources/Plasma/FeatureLib/pfPython/Pch.h index eac6647c..4a41f08b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Pch.h +++ b/Sources/Plasma/FeatureLib/pfPython/Pch.h @@ -83,7 +83,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pfPython Components // Be very careful to include only isolated components here +#include "pyGeometry3.h" #include "pyGlueHelpers.h" #include "pyKey.h" +#include "pyMatrix44.h" #endif diff --git a/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp b/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp index f55303fb..c77a8d0e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp @@ -41,6 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include +#include "pyGeometry3.h" #include "pyKey.h" #include "plPipeline.h" #pragma hdrstop @@ -49,7 +50,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyGlueHelpers.h" #include "pySceneObject.h" #include "pyAgeInfoStruct.h" -#include "pyGeometry3.h" #include "pnNetBase/pnNetBase.h" #include "pnUtils/pnUtils.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/cyPhysics.cpp b/Sources/Plasma/FeatureLib/pfPython/cyPhysics.cpp index c35fb464..3790570c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyPhysics.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyPhysics.cpp @@ -42,9 +42,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include "plgDispatch.h" +#include "pyGeometry3.h" #include "pnKeyedObject/plKey.h" #include "pyKey.h" #include "hsQuat.h" +#include "pyMatrix44.h" #pragma hdrstop #include "cyPhysics.h" @@ -56,8 +58,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plMessage/plLinearVelocityMsg.h" #include "plMessage/plAngularVelocityMsg.h" -#include "pyGeometry3.h" -#include "pyMatrix44.h" #include "pnSceneObject/plSceneObject.h" #include "pnSceneObject/plCoordinateInterface.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/cyPhysicsGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/cyPhysicsGlue.cpp index 7ab5d765..b4b18117 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyPhysicsGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyPhysicsGlue.cpp @@ -41,12 +41,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include +#include "pyGeometry3.h" #include "pyKey.h" +#include "pyMatrix44.h" #pragma hdrstop #include "cyPhysics.h" -#include "pyGeometry3.h" -#include "pyMatrix44.h" // glue functions PYTHON_CLASS_DEFINITION(ptPhysics, cyPhysics); diff --git a/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.cpp b/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.cpp index 93e5569a..1aba52bf 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.cpp @@ -49,7 +49,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include +#include "pyGeometry3.h" #include "pyKey.h" +#include "pyMatrix44.h" #pragma hdrstop #include "cyPythonInterface.h" @@ -64,8 +66,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "cyCamera.h" #include "pyNotify.h" #include "cyAvatar.h" -#include "pyGeometry3.h" -#include "pyMatrix44.h" #include "pyColor.h" #include "pyDynamicText.h" #include "cyAnimation.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp b/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp index 188c1a9d..cf299dd0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp @@ -51,6 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include "HeadSpin.h" #include "plgDispatch.h" +#include "pyGeometry3.h" #include "pyKey.h" #include "hsResMgr.h" #include "hsStream.h" @@ -113,7 +114,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "cyCamera.h" #include "pyNotify.h" #include "cyAvatar.h" -#include "pyGeometry3.h" #include "pyVault.h" #include "pyVaultNode.h" #include "pyVaultNodeRef.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyCritterBrain.cpp b/Sources/Plasma/FeatureLib/pfPython/pyCritterBrain.cpp index 77bb692c..9f6103b2 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyCritterBrain.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyCritterBrain.cpp @@ -41,11 +41,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include +#include "pyGeometry3.h" #include "pyKey.h" #pragma hdrstop #include "pyCritterBrain.h" -#include "pyGeometry3.h" #include "pySceneObject.h" #include "plAvatar/plAvBrainCritter.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyCritterBrainGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyCritterBrainGlue.cpp index d594c4f7..d18eabcc 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyCritterBrainGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyCritterBrainGlue.cpp @@ -41,12 +41,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include +#include "pyGeometry3.h" #include "pyKey.h" #pragma hdrstop #include "pyCritterBrain.h" #include "pyEnum.h" -#include "pyGeometry3.h" #include "plMessage/plAIMsg.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinatesGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinatesGlue.cpp index 50a847c3..2ebdb7a5 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinatesGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinatesGlue.cpp @@ -41,10 +41,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include +#include "pyGeometry3.h" #pragma hdrstop #include "pyDniCoordinates.h" -#include "pyGeometry3.h" #include "plVault/plDniCoordinateInfo.h" // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.h index 1e05d21c..6cf52cd8 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.h @@ -49,7 +49,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "pyGeometry3.h" #include "pyGlueHelpers.h" #include "pnKeyedObject/plKey.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGeometry3.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGeometry3.cpp index 2a4b1fd9..e9353705 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGeometry3.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGeometry3.cpp @@ -40,5 +40,5 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#pragma hdrstop #include "pyGeometry3.h" +#pragma hdrstop diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGeometry3.h b/Sources/Plasma/FeatureLib/pfPython/pyGeometry3.h index 209382dd..0b3f32be 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGeometry3.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGeometry3.h @@ -57,7 +57,7 @@ class pyPoint3 protected: pyPoint3() : fPoint(0,0,0) {} pyPoint3(float x, float y, float z) : fPoint(x,y,z) {} - pyPoint3(hsPoint3 pt) : fPoint(pt.fX,pt.fY,pt.fZ) {} + pyPoint3(const hsPoint3& pt) : fPoint(pt) {} public: // required functions for PyObject interoperability @@ -72,9 +72,9 @@ public: hsPoint3 fPoint; // python get attributes helpers - float getX() { return fPoint.fX; } - float getY() { return fPoint.fY; } - float getZ() { return fPoint.fZ; } + float getX() const { return fPoint.fX; } + float getY() const { return fPoint.fY; } + float getZ() const { return fPoint.fZ; } // python set attributes helpers void setX(float x) { fPoint.fX = x; } @@ -83,9 +83,9 @@ public: // methods to manipulate point3's void Zero() { fPoint.fX=0; fPoint.fY=0; fPoint.fZ=0; } - PyObject* Copy() { return pyPoint3::New(fPoint); } - float Distance(pyPoint3 other) { return hsVector3(&fPoint,&other.fPoint).Magnitude(); } - float DistanceSquared(pyPoint3 other) { return hsVector3(&fPoint,&other.fPoint).MagnitudeSquared(); } + PyObject* Copy() const { return pyPoint3::New(fPoint); } + float Distance(const pyPoint3& other) const { return hsVector3(&fPoint, &other.fPoint).Magnitude(); } + float DistanceSquared(const pyPoint3& other) const { return hsVector3(&fPoint, &other.fPoint).MagnitudeSquared(); } }; @@ -94,7 +94,7 @@ class pyVector3 protected: pyVector3() : fVector(0,0,0) {} pyVector3(float x, float y, float z) : fVector(x,y,z) {} - pyVector3(hsVector3 v) : fVector(v.fX,v.fY,v.fZ) {} + pyVector3(const hsVector3& v) : fVector(v) {} public: // required functions for PyObject interoperability @@ -109,9 +109,9 @@ public: hsVector3 fVector; // python get attributes helpers - float getX() { return fVector.fX; } - float getY() { return fVector.fY; } - float getZ() { return fVector.fZ; } + float getX() const { return fVector.fX; } + float getY() const { return fVector.fY; } + float getZ() const { return fVector.fZ; } // python set attributes helpers void setX(float x) { fVector.fX = x; } @@ -124,15 +124,15 @@ public: // methods to manipulate vectors void Normalize() { fVector.Normalize(); } - float Dot(pyVector3 other) { return fVector*other.fVector;} - PyObject* Cross(pyVector3 other) {return pyVector3::New(fVector%other.fVector); } - float Magnitude() { return fVector.Magnitude(); } - float MagnitudeSquared() { return fVector.MagnitudeSquared(); } + float Dot(const pyVector3& other) { return fVector * other.fVector;} + PyObject* Cross(const pyVector3& other) const { return pyVector3::New(fVector % other.fVector); } + float Magnitude() const { return fVector.Magnitude(); } + float MagnitudeSquared() const { return fVector.MagnitudeSquared(); } void Zero() { fVector.fX=0; fVector.fY=0; fVector.fZ=0; } - PyObject* Scale(float scale) { return pyVector3::New(fVector * scale); } - PyObject* Add(pyVector3& other) { return pyVector3::New(fVector + other.fVector); } - PyObject* Subtract(pyVector3& other) { return pyVector3::New(fVector - other.fVector); } - PyObject* Copy() { return pyVector3::New(fVector); } + PyObject* Scale(float scale) const { return pyVector3::New(fVector * scale); } + PyObject* Add(const pyVector3& other) const { return pyVector3::New(fVector + other.fVector); } + PyObject* Subtract(const pyVector3& other) const { return pyVector3::New(fVector - other.fVector); } + PyObject* Copy() const { return pyVector3::New(fVector); } }; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGeometry3Glue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGeometry3Glue.cpp index d01011fb..04af5873 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGeometry3Glue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGeometry3Glue.cpp @@ -41,9 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include -#pragma hdrstop - #include "pyGeometry3.h" +#pragma hdrstop // glue functions PYTHON_CLASS_DEFINITION(ptPoint3, pyPoint3); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyImage.h b/Sources/Plasma/FeatureLib/pfPython/pyImage.h index ff8d3640..3d0fc09a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyImage.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyImage.h @@ -56,7 +56,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyColor.h" #ifndef BUILDING_PYPLASMA -# include "pyGeometry3.h" # include "plGImage/plMipmap.h" #endif diff --git a/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.h b/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.h index 2534d6d2..1535172a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.h @@ -48,7 +48,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "pyGeometry3.h" #include "pyGlueHelpers.h" #include diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMatrix44.cpp b/Sources/Plasma/FeatureLib/pfPython/pyMatrix44.cpp index ecb50ba8..dd78ae65 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMatrix44.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyMatrix44.cpp @@ -41,21 +41,51 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include +#include "pyGeometry3.h" +#include "pyMatrix44.h" #pragma hdrstop -#include "pyMatrix44.h" +PyObject* pyMatrix44::operator*(const pyVector3& p) const +{ + return pyVector3::New(fMatrix * p.fVector); +} + +PyObject* pyMatrix44::operator*(const pyPoint3& p) const +{ + return pyPoint3::New(fMatrix * p.fPoint); +} + +void pyMatrix44::Translate(const pyVector3& v) +{ + fMatrix.Translate(&v.fVector); +} + +void pyMatrix44::Scale(const pyVector3& v) +{ + fMatrix.Scale(&v.fVector); +} + +void pyMatrix44::MakeTranslateMat(const pyVector3& trans) +{ + fMatrix.MakeTranslateMat(&trans.fVector); +} -pyMatrix44::pyMatrix44() { fMatrix.Reset(); } -pyMatrix44::pyMatrix44(hsMatrix44 other) -{ // copy the other matrix to this one - int i,j; - for ( i=0;i<4;i++) - for ( j=0;j<4;j++) - fMatrix.fMap[i][j] = other.fMap[i][j]; - fMatrix.fFlags = other.fFlags; +void pyMatrix44::MakeScaleMat(const pyVector3& scale) +{ + fMatrix.MakeScaleMat(&scale.fVector); +} + +void pyMatrix44::Make(const pyPoint3& from, const pyPoint3& at, const pyVector3& up) +{ + fMatrix.Make(&from.fPoint, &at.fPoint, &up.fVector); } -PyObject* pyMatrix44::GetInverse(PyObject* inverse) +void pyMatrix44::MakeUpPreserving(const pyPoint3& from, const pyPoint3& at, const pyVector3& up) +{ + fMatrix.MakeUpPreserving(&from.fPoint, &at.fPoint, &up.fVector); +} + +PyObject* pyMatrix44::GetInverse(PyObject* inverse) const { pyMatrix44 *obj = pyMatrix44::ConvertFrom(inverse); fMatrix.GetInverse(&(obj->fMatrix)); @@ -63,7 +93,7 @@ PyObject* pyMatrix44::GetInverse(PyObject* inverse) return inverse; } -PyObject* pyMatrix44::GetTranspose(PyObject* transpose) +PyObject* pyMatrix44::GetTranspose(PyObject* transpose) const { pyMatrix44 *obj = pyMatrix44::ConvertFrom(transpose); fMatrix.GetTranspose(&(obj->fMatrix)); @@ -71,7 +101,7 @@ PyObject* pyMatrix44::GetTranspose(PyObject* transpose) return transpose; } -PyObject* pyMatrix44::GetAdjoint(PyObject* adjoint) +PyObject* pyMatrix44::GetAdjoint(PyObject* adjoint) const { pyMatrix44 *obj = pyMatrix44::ConvertFrom(adjoint); fMatrix.GetAdjoint(&(obj->fMatrix)); @@ -79,7 +109,7 @@ PyObject* pyMatrix44::GetAdjoint(PyObject* adjoint) return adjoint; } -PyObject* pyMatrix44::GetTranslate(PyObject* pt) +PyObject* pyMatrix44::GetTranslate(PyObject* pt) const { pyVector3 *obj = pyVector3::ConvertFrom(pt); fMatrix.GetTranslate(&(obj->fVector)); @@ -87,7 +117,22 @@ PyObject* pyMatrix44::GetTranslate(PyObject* pt) return pt; } -float* pyMatrix44::GetData() +PyObject* pyMatrix44::GetViewAxis() const +{ + return pyVector3::New(fMatrix.GetAxis(hsMatrix44::kView)); +} + +PyObject* pyMatrix44::GetUpAxis() const +{ + return pyVector3::New(fMatrix.GetAxis(hsMatrix44::kUp)); +} + +PyObject* pyMatrix44::GetRightAxis() const +{ + return pyVector3::New(fMatrix.GetAxis(hsMatrix44::kRight)); +} + +float* pyMatrix44::GetData() const { float *res = new float[4*4]; res[0] = fMatrix.fMap[0][0]; res[1] = fMatrix.fMap[0][1]; res[2] = fMatrix.fMap[0][2]; res[3] = fMatrix.fMap[0][3]; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMatrix44.h b/Sources/Plasma/FeatureLib/pfPython/pyMatrix44.h index a48f2994..891b569d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMatrix44.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyMatrix44.h @@ -43,16 +43,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define pyMatrix44_h_inc #include "hsMatrix44.h" -#include "pyGeometry3.h" - #include "pyGlueHelpers.h" +class pyPoint3; +class pyVector3; + class pyMatrix44 { protected: - pyMatrix44(); - pyMatrix44(hsMatrix44 other); + pyMatrix44() { fMatrix.Reset(); } + pyMatrix44(const hsMatrix44& other) : fMatrix(other) { } public: // required functions for PyObject interoperability @@ -68,31 +69,31 @@ public: // operator methods PyObject* operator*(const pyMatrix44& b) const { return pyMatrix44::New(fMatrix * b.fMatrix); } // returns pyMatrix44 - PyObject* operator*(const pyVector3& p) const { return pyVector3::New(fMatrix * p.fVector); } // returns pyVector3 - PyObject* operator*(const pyPoint3& p) const { return pyPoint3::New(fMatrix * p.fPoint); } // returns pyPoint3 + PyObject* operator*(const pyVector3& p) const; + PyObject* operator*(const pyPoint3& p) const; // other methods - PyObject* Copy() { return pyMatrix44::New(fMatrix); } // returns pyMatrix44 - void Translate(pyVector3 v) { fMatrix.Translate(&v.fVector); } - void Scale(pyVector3 v) { fMatrix.Scale(&v.fVector); } - void Rotate(int axis, float radians) { fMatrix.Rotate(axis,radians); } + PyObject* Copy() const { return pyMatrix44::New(fMatrix); } // returns pyMatrix44 + void Translate(const pyVector3& v); + void Scale(const pyVector3& v); + void Rotate(int axis, float radians) { fMatrix.Rotate(axis, radians); } void Reset() { fMatrix.Reset(); } - void MakeTranslateMat(pyVector3 trans) { fMatrix.MakeTranslateMat(&trans.fVector); } - void MakeScaleMat(pyVector3 scale) { fMatrix.MakeScaleMat(&scale.fVector); } - void MakeRotateMat(int axis, float radians) { fMatrix.MakeRotateMat(axis,radians); } - void Make(pyPoint3 from,pyPoint3 at,pyVector3 up) { fMatrix.Make(&from.fPoint,&at.fPoint,&up.fVector); } - void MakeUpPreserving(pyPoint3 from,pyPoint3 at,pyVector3 up) { fMatrix.MakeUpPreserving(&from.fPoint,&at.fPoint,&up.fVector); } - hsBool GetParity() { return fMatrix.GetParity(); } - float GetDeterminant() { return fMatrix.GetDeterminant(); } - PyObject* GetInverse(PyObject* inverse); // returns (and accepts) pyMatrix44 - PyObject* GetTranspose(PyObject* inverse); // returns (and accepts) pyMatrix44 - PyObject* GetAdjoint(PyObject* adjoint); // returns (and accepts) pyMatrix44 - PyObject* GetTranslate(PyObject* pt); // returns (and accepts) pyVector3 - PyObject* GetViewAxis() { return pyVector3::New(fMatrix.GetAxis(hsMatrix44::kView)); } // returns pyVector3 - PyObject* GetUpAxis() { return pyVector3::New(fMatrix.GetAxis(hsMatrix44::kUp)); } // returns pyVector3 - PyObject* GetRightAxis() { return pyVector3::New(fMatrix.GetAxis(hsMatrix44::kRight)); } // returns pyVector3 - - float* GetData(); + void MakeTranslateMat(const pyVector3& trans); + void MakeScaleMat(const pyVector3& scale); + void MakeRotateMat(int axis, float radians) { fMatrix.MakeRotateMat(axis, radians); } + void Make(const pyPoint3& from, const pyPoint3& at, const pyVector3& up); + void MakeUpPreserving(const pyPoint3& from, const pyPoint3& at, const pyVector3& up); + hsBool GetParity() const { return fMatrix.GetParity(); } + float GetDeterminant() const { return fMatrix.GetDeterminant(); } + PyObject* GetInverse(PyObject* inverse) const; // returns (and accepts) pyMatrix44 + PyObject* GetTranspose(PyObject* inverse) const; // returns (and accepts) pyMatrix44 + PyObject* GetAdjoint(PyObject* adjoint) const; // returns (and accepts) pyMatrix44 + PyObject* GetTranslate(PyObject* pt) const; // returns (and accepts) pyVector3 + PyObject* GetViewAxis() const; // returns pyVector3 + PyObject* GetUpAxis() const; // returns pyVector3 + PyObject* GetRightAxis() const; // returns pyVector3 + + float* GetData() const; void SetData(const float mat[]); }; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMatrix44Glue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyMatrix44Glue.cpp index 1c205cef..b003b812 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMatrix44Glue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyMatrix44Glue.cpp @@ -41,9 +41,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include -#pragma hdrstop - +#include "pyGeometry3.h" #include "pyMatrix44.h" +#pragma hdrstop // glue functions PYTHON_CLASS_DEFINITION(ptMatrix44, pyMatrix44); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp b/Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp index 551900ec..31b32e22 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp @@ -46,11 +46,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////// #include "plgDispatch.h" +#include "pyGeometry3.h" #include "pyKey.h" #pragma hdrstop #include "pyNotify.h" -#include "pyGeometry3.h" pyNotify::pyNotify() diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNotifyGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyNotifyGlue.cpp index df41693c..1cbe3340 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNotifyGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyNotifyGlue.cpp @@ -41,12 +41,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include +#include "pyGeometry3.h" #include "pyKey.h" #pragma hdrstop #include "pyNotify.h" #include "pyEnum.h" -#include "pyGeometry3.h" // glue functions PYTHON_CLASS_DEFINITION(ptNotify, pyNotify); diff --git a/Sources/Plasma/FeatureLib/pfPython/pySceneObject.cpp b/Sources/Plasma/FeatureLib/pfPython/pySceneObject.cpp index 2b95102f..55c2bae2 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySceneObject.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pySceneObject.cpp @@ -43,11 +43,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include "plAudible.h" #include "plgDispatch.h" +#include "pyGeometry3.h" #include "pyKey.h" +#include "pyMatrix44.h" #include "plPhysical.h" #pragma hdrstop -#include "pyMatrix44.h" #include "pySceneObject.h" #include "plResMgr/plResManager.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pySceneObjectGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pySceneObjectGlue.cpp index e4929c16..b3e448c7 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySceneObjectGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pySceneObjectGlue.cpp @@ -41,12 +41,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include +#include "pyGeometry3.h" #include "pyKey.h" +#include "pyMatrix44.h" #pragma hdrstop #include "pySceneObject.h" -#include "pyMatrix44.h" -#include "pyGeometry3.h" // glue functions PYTHON_CLASS_DEFINITION(ptSceneobject, pySceneObject); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyWaveSetGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyWaveSetGlue.cpp index 110d8912..dac9ed5f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyWaveSetGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyWaveSetGlue.cpp @@ -41,11 +41,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include +#include "pyGeometry3.h" #include "pyKey.h" #pragma hdrstop #include "pyColor.h" -#include "pyGeometry3.h" #include "pyWaveSet.h" // glue functions