Revision: 553
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=553&view=rev
Author: andy_miller
Date: 2008-01-16 05:00:40 -0800 (Wed, 16 Jan 2008)
Log Message:
-----------
NxOgre Updates
Modified Paths:
--------------
trunk/python-ogre/ThirdParty/nxogre/NxOgreHelpers.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreHelpers.h
trunk/python-ogre/ThirdParty/nxogre/NxOgrePose.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreResourceStreamPtr.h
Modified: trunk/python-ogre/ThirdParty/nxogre/NxOgreHelpers.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/nxogre/NxOgreHelpers.cpp 2008-01-16 05:43:04 UTC (rev 552)
+++ trunk/python-ogre/ThirdParty/nxogre/NxOgreHelpers.cpp 2008-01-16 13:00:40 UTC (rev 553)
@@ -30,14 +30,14 @@
//////////////////////////////////////////////////////////////////////////////////
-inline NxExtendedVec3 toNxExtendedVec3(const Ogre::Vector3& v) {
+NxExtendedVec3 toNxExtendedVec3(const Ogre::Vector3& v) {
return NxExtendedVec3(v.x,v.y,v.z);
}
//////////////////////////////////////////////////////////////////////////////////
// Generates a 8 digit ID, based on groupCount and type of object (typeHash)
-inline NxString NxCreateID(unsigned int groupCount, NxString typeHash) {
+NxString NxCreateID(unsigned int groupCount, NxString typeHash) {
std::stringstream ss;
ss << typeHash << "-" << std::hex << (rand() % 1024) << "-" << groupCount;
return ss.str();
@@ -45,7 +45,7 @@
//////////////////////////////////////////////////////////////////////////////////
-inline NxMat33 toNxMat33(const Ogre::Matrix3& matrix) {
+NxMat33 toNxMat33(const Ogre::Matrix3& matrix) {
NxReal* c = new NxReal[9];
c[0] = matrix[0][0]; c[1] = matrix[1][0]; c[2] = matrix[2][0];
@@ -63,7 +63,7 @@
//////////////////////////////////////////////////////////////////////////////////
-inline NxMat34 toNxMat34(const Ogre::Matrix4& matrix) {
+NxMat34 toNxMat34(const Ogre::Matrix4& matrix) {
NxUnderConstruction;
@@ -156,10 +156,10 @@
std::stringstream stream;
stream << quat.w << " " << quat.x << " " << quat.y << " " << quat.z;
return stream.str();
-}
+}
////////////////////////////////////////////////////////////////
-
+
template <typename Type>
Type NxFromString(const NxString& string)
{
@@ -167,8 +167,8 @@
Type val = 0;
str >> val;
return val;
-}
-
+}
+
////////////////////////////////////////////////////////////////
template <>
@@ -206,7 +206,7 @@
return quaternion;
-}
+}
////////////////////////////////////////////////////////////////
@@ -273,9 +273,9 @@
}
////////////////////////////////////////////////////////////////
-
-inline Pose NxInterpolate(Pose First, Pose Second, NxReal c) {
+Pose NxInterpolate(Pose First, Pose Second, NxReal c) {
+
Pose r;
r.v.x = First.v.x * (1 - c) + Second.v.x * c;
@@ -287,5 +287,5 @@
}
////////////////////////////////////////////////////////////////
-
-}; //End of NxOgre namespace.
+
+}; //End of NxOgre namespace.
Modified: trunk/python-ogre/ThirdParty/nxogre/NxOgreHelpers.h
===================================================================
--- trunk/python-ogre/ThirdParty/nxogre/NxOgreHelpers.h 2008-01-16 05:43:04 UTC (rev 552)
+++ trunk/python-ogre/ThirdParty/nxogre/NxOgreHelpers.h 2008-01-16 13:00:40 UTC (rev 553)
@@ -87,18 +87,18 @@
@result The rotated vector
*/
NxVec3 NxExport operator* (const NxQuat&, const NxVec3&);
-
-
- // To Strings
-
- /** @brief Generic class/integral to String.
- @note Uses STL stringstream for conversion.
- @example
- <code>
- NxString str = NxToString<float>(1.2345f);
- </code>
- @result The converted string
- */
+
+
+ // To Strings
+
+ /** @brief Generic class/integral to String.
+ @note Uses STL stringstream for conversion.
+ @example
+ <code>
+ NxString str = NxToString<float>(1.2345f);
+ </code>
+ @result The converted string
+ */
template <typename Type> NxString NxExport NxToString(const Type& type);
@@ -281,8 +281,8 @@
/** @brief Interpolates
*/
- inline Pose NxExport NxInterpolate(Pose First, Pose Second, NxReal c = 0.5f);
+ Pose NxExport NxInterpolate(Pose First, Pose Second, NxReal c = 0.5f);
};
-#endif
+#endif
Modified: trunk/python-ogre/ThirdParty/nxogre/NxOgrePose.h
===================================================================
--- trunk/python-ogre/ThirdParty/nxogre/NxOgrePose.h 2008-01-16 05:43:04 UTC (rev 552)
+++ trunk/python-ogre/ThirdParty/nxogre/NxOgrePose.h 2008-01-16 13:00:40 UTC (rev 553)
@@ -52,12 +52,12 @@
void fromMat33(const NxMat33&);
NxMat33 toMat33() const;
- inline Ogre::Vector3 getVector3() const;
- inline NxVec3 getVec3() const;
- inline Ogre::Quaternion getQuaternion() const;
- inline NxQuat getQuat() const;
+ Ogre::Vector3 getVector3() const;
+ NxVec3 getVec3() const;
+ Ogre::Quaternion getQuaternion() const;
+ NxQuat getQuat() const;
- inline NxString toString() const;
+ NxString toString() const;
////////////////////////////////////////////////////////////////////////////////
@@ -100,4 +100,4 @@
};
-#endif
+#endif
Modified: trunk/python-ogre/ThirdParty/nxogre/NxOgreResourceStreamPtr.h
===================================================================
--- trunk/python-ogre/ThirdParty/nxogre/NxOgreResourceStreamPtr.h 2008-01-16 05:43:04 UTC (rev 552)
+++ trunk/python-ogre/ThirdParty/nxogre/NxOgreResourceStreamPtr.h 2008-01-16 13:00:40 UTC (rev 553)
@@ -50,7 +50,7 @@
ResourceStreamPtr();
ResourceStreamPtr(ResourceIdentifier);
- ResourceStreamPtr(ResourceIdentifier, void*);
+ //ResourceStreamPtr(ResourceIdentifier, void*);
ResourceStreamPtr(const ResourceStreamPtr& r)
: pStream(0), pUseCount(0)
@@ -172,4 +172,4 @@
}; // End of namespace
-#endif
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|