Changeset 6501 for code/trunk

Timestamp:

Mar 11, 2010, 11:32:01 AM (15 years ago)

Author:

rgrieder

Message:

Ensured OGRE v1.7 "Cthugha" code compatibility. Does not yet seem to run run though.

Location:

code/trunk/src

Files:

• libraries/core/Resource.cc (modified) (1 diff)
• modules/objects/Planet.cc (modified) (1 diff)
• modules/objects/Planet.h (modified) (1 diff)
• orxonox/LevelManager.cc (modified) (1 diff)
• orxonox/controllers/NewHumanController.cc (modified) (1 diff)
• orxonox/graphics/Camera.cc (modified) (1 diff)
• orxonox/worldentities/WorldEntity.cc (modified) (2 diffs)
• orxonox/worldentities/WorldEntity.h (modified) (2 diffs)

code/trunk/src/libraries/core/Resource.cc

@@ -79 +79 @@
         }
         Ogre::FileInfoListPtr infos = Ogre::ResourceGroupManager::getSingleton().findResourceFileInfo(group, name);
-        for (std::vector<Ogre::FileInfo>::const_iterator it = infos->begin(); it != infos->end(); ++it)
+        for (Ogre::FileInfoList::const_iterator it = infos->begin(); it != infos->end(); ++it)
         {
             if (it->filename == name)

code/trunk/src/modules/objects/Planet.cc

@@ -91 +91 @@
         float scaleFactor = this->getScale();
 
-        this->distList.push_back(10.0f*scaleFactor);
-        this->distList.push_back(19.0f*scaleFactor);
-        this->distList.push_back(27.0f*scaleFactor);
-        this->distList.push_back(34.0f*scaleFactor);
-        this->distList.push_back(40.0f*scaleFactor);
-        this->distList.push_back(45.0f*scaleFactor);
-        this->distList.push_back(49.0f*scaleFactor);
-        this->distList.push_back(52.0f*scaleFactor);
-        this->distList.push_back(54.0f*scaleFactor);
-        this->distList.push_back(55.0f*scaleFactor);
+#if OGRE_VERSION >= 0x010700
+        Ogre::Mesh::LodValueList distList;
+#else
+        Ogre::Mesh::LodDistanceList distList;
+#endif
+
+        distList.push_back(10.0f*scaleFactor);
+        distList.push_back(19.0f*scaleFactor);
+        distList.push_back(27.0f*scaleFactor);
+        distList.push_back(34.0f*scaleFactor);
+        distList.push_back(40.0f*scaleFactor);
+        distList.push_back(45.0f*scaleFactor);
+        distList.push_back(49.0f*scaleFactor);
+        distList.push_back(52.0f*scaleFactor);
+        distList.push_back(54.0f*scaleFactor);
+        distList.push_back(55.0f*scaleFactor);
 
         float reductionValue = 0.2f;

code/trunk/src/modules/objects/Planet.h

@@ -106 +106 @@
             float atmosphereSize;
             float imageSize;
-            std::vector<float> distList;
             BillboardSet billboard_;
             bool bCastShadows_;

code/trunk/src/orxonox/LevelManager.cc

@@ -132 +132 @@
     void LevelManager::compileAvailableLevelList()
     {
-        availableLevels_ = *Resource::findResourceNames("*.oxw");
-        for (std::vector<std::string>::iterator it = availableLevels_.begin(); it != availableLevels_.end();)
-            if (it->find("old/") == 0)
-                it = availableLevels_.erase(it);
-            else
+        this->availableLevels_.clear();
+        Ogre::StringVectorPtr levels = Resource::findResourceNames("*.oxw");
+        for (Ogre::StringVector::const_iterator it = levels->begin(); it != levels->end(); ++it)
+        {
+            if (it->find("old/") != 0)
             {
                 size_t pos = it->find(".oxw");
-                *it = it->substr(0, pos);
-                ++it;
+                this->availableLevels_.push_back(it->substr(0, pos));
             }
+        }
     }
 }

code/trunk/src/orxonox/controllers/NewHumanController.cc

@@ -366 +366 @@
             {
                 // Try to cast the user pointer
-                WorldEntity* wePtr = dynamic_cast<WorldEntity*>(itr->movable->getUserObject());
+                WorldEntity* wePtr = dynamic_cast<WorldEntity*>(Ogre::any_cast<OrxonoxClass*>(itr->movable->getUserAny()));
                 if (wePtr)
                 {

code/trunk/src/orxonox/graphics/Camera.cc

@@ -62 +62 @@
 
         this->camera_ = this->getScene()->getSceneManager()->createCamera(getUniqueNumberString());
-        this->camera_->setUserObject(this);
+        static_cast<Ogre::MovableObject*>(this->camera_)->setUserAny(Ogre::Any(static_cast<OrxonoxClass*>(this)));
         this->cameraNode_ = this->getScene()->getRootSceneNode()->createChildSceneNode();
         this->attachNode(this->cameraNode_);

code/trunk/src/orxonox/worldentities/WorldEntity.cc

@@ -474 +474 @@
     {
         this->node_->attachObject(object);
-        object->setUserObject(this);
+        object->setUserAny(Ogre::Any(static_cast<OrxonoxClass*>(this)));
     }
 
@@ -489 +489 @@
     void WorldEntity::detachOgreObject(Ogre::MovableObject* object)
     {
-        object->setUserObject(NULL);
+        object->setUserAny(Ogre::Any(static_cast<OrxonoxClass*>(NULL)));
         this->node_->detachObject(object);
     }

code/trunk/src/orxonox/worldentities/WorldEntity.h

@@ -33 +33 @@
 #include "OrxonoxPrereqs.h"
 
-#include <OgreUserDefinedObject.h>
 #ifdef ORXONOX_RELEASE
 #  include <OgreSceneNode.h>
@@ -70 +69 @@
         Collision shapes: These are controlled by the internal WorldEntityCollisionShape. @see WorldEntityCollisionShape.
     */
-    class _OrxonoxExport WorldEntity : public BaseObject, public Synchronisable, public btMotionState, public Ogre::UserDefinedObject
+    class _OrxonoxExport WorldEntity : public BaseObject, public Synchronisable, public btMotionState
     {
         friend class Scene;