patch to compile against ogre SVN HEAD

small and maybe not correct at corners, but at least it compiles now. Could someone fix the commented out functions correctly? :-/

ogre_v1_6.patch:

Index: Hydrax-v0.5/Hydrax/src/Hydrax/CfgFileManager.cpp
===================================================================
--- Hydrax-v0.5/Hydrax/src/Hydrax/CfgFileManager.cpp (revision 446)
+++ Hydrax-v0.5/Hydrax/src/Hydrax/CfgFileManager.cpp (working copy)
@@ -287,7 +287,7 @@
return Cmpnts;
}

- bool CfgFileManager::_isStringInList(const std::vector<Ogre::String> &List, const Ogre::String &Find)
+ bool CfgFileManager::_isStringInList(const Ogre::vector<Ogre::String>::type &List, const Ogre::String &Find)
{
for (unsigned int k = 0; k < List.size(); k++)
{
@@ -302,7 +302,7 @@

const void CfgFileManager::_loadComponentsSettings(Ogre::ConfigFile& CfgFile) const
{
- std::vector<Ogre::String> Cmpnts = Ogre::StringUtil::split(CfgFile.getSetting("Components"), "|");
+ Ogre::vector<Ogre::String>::type Cmpnts = Ogre::StringUtil::split(CfgFile.getSetting("Components"), "|");

HydraxComponent ComponentsToLoad[8] = {
HYDRAX_COMPONENTS_NONE,HYDRAX_COMPONENTS_NONE,HYDRAX_COMPONENTS_NONE,HYDRAX_COMPONENTS_NONE,
Index: Hydrax-v0.5/Hydrax/src/Hydrax/CfgFileManager.h
===================================================================
--- Hydrax-v0.5/Hydrax/src/Hydrax/CfgFileManager.h (revision 446)
+++ Hydrax-v0.5/Hydrax/src/Hydrax/CfgFileManager.h (working copy)
@@ -156,7 +156,7 @@
@param Find String to find
@return true if it's contained, false if not
*/
- static bool _isStringInList(const std::vector<Ogre::String> &List, const Ogre::String &Find);
+ static bool _isStringInList(const Ogre::vector<Ogre::String>::type &List, const Ogre::String &Find);

private:
/** Save a string in file
Index: Hydrax-v0.5/Hydrax/src/Hydrax/Mesh.cpp
===================================================================
--- Hydrax-v0.5/Hydrax/src/Hydrax/Mesh.cpp (revision 446)
+++ Hydrax-v0.5/Hydrax/src/Hydrax/Mesh.cpp (working copy)
@@ -411,14 +411,14 @@

if (mCreated)
{
- mEntity->getParentSceneNode()->getWorldTransforms(&mWorldMatrix);
+ //mEntity->getParentSceneNode()->getWorldTransforms(&mWorldMatrix);
}
else
{
Ogre::SceneNode *mTmpSN = new Ogre::SceneNode(0);
mTmpSN->setPosition(mHydrax->getPosition());

- mTmpSN->getWorldTransforms(&mWorldMatrix);
+ //mTmpSN->getWorldTransforms(&mWorldMatrix);

delete mTmpSN;
}
@@ -432,14 +432,14 @@

if (mCreated)
{
- mEntity->getParentSceneNode()->getWorldTransforms(&mWorldMatrix);
+ //mEntity->getParentSceneNode()->getWorldTransforms(&mWorldMatrix);
}
else
{
Ogre::SceneNode *mTmpSN = new Ogre::SceneNode(0);
mTmpSN->setPosition(mHydrax->getPosition());

- mTmpSN->getWorldTransforms(&mWorldMatrix);
+ //mTmpSN->getWorldTransforms(&mWorldMatrix);

delete mTmpSN;
}
Index: Hydrax-v0.5/Hydrax/src/Hydrax/Modules/SimpleGrid/SimpleGrid.cpp
===================================================================
--- Hydrax-v0.5/Hydrax/src/Hydrax/Modules/SimpleGrid/SimpleGrid.cpp (revision 446)
+++ Hydrax-v0.5/Hydrax/src/Hydrax/Modules/SimpleGrid/SimpleGrid.cpp (working copy)
@@ -302,7 +302,8 @@
// RTT normals calculation needs world-space coords
Ogre::Vector3 p = Ogre::Vector3(0,0,0);
Ogre::Matrix4 mWorldMatrix;
- mHydrax->getMesh()->getEntity()->getParentSceneNode()->getWorldTransforms(&mWorldMatrix);
+ // XXX: TODO: FIX line below
+ //mHydrax->getMesh()->getEntity()->getParentSceneNode()->getWorldTransforms(&mWorldMatrix);

for(int i = 0; i < mOptions.Complexity*mOptions.Complexity; i++)
{


See my previous post: Compiled OGRE 1.7.0 "Cthugha" & Hydrax 0.5

See my previous post: Compiled OGRE 1.7.0 "Cthugha" & Hydrax 0.5
oversaw that, thanks for notice